diff --git a/ChangeLog b/ChangeLog
index 744641394..17a53ac76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-11-11  Maxim Ermilov  <zaspire@rambler.ru>
+
+        Clean up #includes according to the GNOME Goal.
+	Closes #560449.  Patch is 122467.
+
+	* src/core/place.c:
+	* src/ui/draw-workspace.h:
+	* src/ui/gradient.h:
+	* src/ui/metaaccellabel.c:
+	* src/ui/metaaccellabel.h:
+	* src/ui/preview-widget.c:
+	* src/ui/preview-widget.h:
+	* src/ui/resizepopup.c:
+	* src/ui/theme.c:
+	* src/ui/theme.h:
+	* src/ui/themewidget.h:
+
 2008-11-10  Elijah Newren  <newren gmail com> 
 
 	* src/metacity.schemas.in.in: updated description of
diff --git a/src/core/place.c b/src/core/place.c
index 1e5e6c150..901335c9a 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -29,7 +29,7 @@
 #include "place.h"
 #include "workspace.h"
 #include "prefs.h"
-#include <gdk/gdkregion.h>
+#include <gdk/gdk.h>
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/ui/draw-workspace.h b/src/ui/draw-workspace.h
index de60550dc..10018aa88 100644
--- a/src/ui/draw-workspace.h
+++ b/src/ui/draw-workspace.h
@@ -28,9 +28,9 @@
 #ifndef WNCK_DRAW_WORKSPACE_H
 #define WNCK_DRAW_WORKSPACE_H
 
-#include <gdk/gdkdrawable.h>
+#include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef struct
 {
diff --git a/src/ui/gradient.h b/src/ui/gradient.h
index 58d6d40e3..16b3985d2 100644
--- a/src/ui/gradient.h
+++ b/src/ui/gradient.h
@@ -25,7 +25,7 @@
 #define META_GRADIENT_H
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 typedef enum
 {
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
index cdc86369c..d52330424 100644
--- a/src/ui/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
@@ -33,8 +33,7 @@
 
 #include <config.h>
 #include "metaaccellabel.h"
-#include <gtk/gtkmain.h>
-#include <gtk/gtkaccelmap.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include "util.h"
 
diff --git a/src/ui/metaaccellabel.h b/src/ui/metaaccellabel.h
index 228232761..4fb8ed5d6 100644
--- a/src/ui/metaaccellabel.h
+++ b/src/ui/metaaccellabel.h
@@ -34,7 +34,7 @@
 #ifndef __META_ACCEL_LABEL_H__
 #define __META_ACCEL_LABEL_H__
 
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include "common.h"
 
 #ifdef __cplusplus
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index 23504f9bf..e098baace 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -25,7 +25,7 @@
 #define _XOPEN_SOURCE 600 /* for the maths routines over floats */
 
 #include <math.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include "preview-widget.h"
 
 static void     meta_preview_class_init    (MetaPreviewClass *klass);
diff --git a/src/ui/preview-widget.h b/src/ui/preview-widget.h
index 32b3c4875..ab6a8f9ec 100644
--- a/src/ui/preview-widget.h
+++ b/src/ui/preview-widget.h
@@ -22,7 +22,7 @@
  */
 
 #include "theme.h"
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 #ifndef META_PREVIEW_WIDGET_H
 #define META_PREVIEW_WIDGET_H
diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
index 79736fa67..cca470873 100644
--- a/src/ui/resizepopup.c
+++ b/src/ui/resizepopup.c
@@ -24,11 +24,7 @@
 #include <config.h>
 #include "resizepopup.h"
 #include "util.h"
-#include <gtk/gtkwindow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkmain.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 struct _MetaResizePopup
 {
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 85d20e512..6343fd414 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -57,9 +57,7 @@
 #include "theme-parser.h"
 #include "util.h"
 #include "gradient.h"
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 2d48b08c2..2fc1283fa 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -27,7 +27,7 @@
 #include "boxes.h"
 #include "gradient.h"
 #include "common.h"
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
 
 typedef struct _MetaFrameStyle MetaFrameStyle;
 typedef struct _MetaFrameStyleSet MetaFrameStyleSet;
diff --git a/src/ui/themewidget.h b/src/ui/themewidget.h
index 5f044ce25..1568aa86f 100644
--- a/src/ui/themewidget.h
+++ b/src/ui/themewidget.h
@@ -22,7 +22,7 @@
  */
 
 #include "theme.h"
-#include <gtk/gtkmisc.h>
+#include <gtk/gtk.h>
 
 #ifndef META_THEME_WIDGET_H
 #define META_THEME_WIDGET_H