15 files changed, 32 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 159afb90..75285b9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-12-15  Przemysław Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+	* src/glade-window.c:
+	* src/glade-window.h:
+	* gladeui/glade-palette-box.h:
+	* gladeui/glade-design-view.h:
+	* gladeui/glade-design-layout.h:
+	* gladeui/glade-palette-expander.c:
+	* gladeui/glade-palette-expander.h:
+	* gladeui/glade-widget-adaptor.c:
+	* gladeui/glade-palette-item.c:
+	* gladeui/glade-palette-item.h:
+	* gladeui/glade-palette.h:
+	* gladeui/glade-named-icon-chooser-dialog.h:
+	* gladeui/glade-app.c:
+	* gladeui/glade-property-class.h: Cleaned up gtk and glib includes
+	to use only toplevel headers. Patch from Maxim Ermilov. Bug #561260.
+
 2008-12-13  Tristan Van Berkom <tvb@gnome.org>
 
 	* gladeui/glade-inspector.c: Removed old search code.
diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c
index 3ed92ba7..56b39132 100644
--- a/gladeui/glade-app.c
+++ b/gladeui/glade-app.c
@@ -47,7 +47,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #define GLADE_CONFIG_FILENAME "glade-3.conf"
 
diff --git a/gladeui/glade-design-layout.h b/gladeui/glade-design-layout.h
index e966db30..157be417 100644
--- a/gladeui/glade-design-layout.h
+++ b/gladeui/glade-design-layout.h
@@ -25,7 +25,7 @@
 #ifndef __GLADE_DESIGN_LAYOUT_H__
 #define __GLADE_DESIGN_LAYOUT_H__
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gladeui/glade-design-view.h b/gladeui/glade-design-view.h
index fbba1ee2..fb1d1d71 100644
--- a/gladeui/glade-design-view.h
+++ b/gladeui/glade-design-view.h
@@ -29,7 +29,7 @@
 #include <gladeui/glade-project.h>
 #include <gladeui/glade-design-layout.h>
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gladeui/glade-named-icon-chooser-dialog.h b/gladeui/glade-named-icon-chooser-dialog.h
index 937242ce..dd42b4ef 100644
--- a/gladeui/glade-named-icon-chooser-dialog.h
+++ b/gladeui/glade-named-icon-chooser-dialog.h
@@ -23,7 +23,7 @@
 #ifndef __GLADE_NAMED_ICON_CHOOSER_DIALOG_H__
 #define __GLADE_NAMED_ICON_CHOOSER_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gladeui/glade-palette-box.h b/gladeui/glade-palette-box.h
index 687a4cdc..8ed2d46d 100644
--- a/gladeui/glade-palette-box.h
+++ b/gladeui/glade-palette-box.h
@@ -26,7 +26,7 @@
 #ifndef __GLADE_PALETTE_BOX_H__
 #define __GLADE_PALETTE_BOX_H__
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gladeui/glade-palette-expander.c b/gladeui/glade-palette-expander.c
index c1f86603..70a0e191 100644
--- a/gladeui/glade-palette-expander.c
+++ b/gladeui/glade-palette-expander.c
@@ -25,13 +25,7 @@
 
 #include "glade-palette-expander.h"
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 #define GLADE_PALETTE_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
 					       GLADE_TYPE_PALETTE_EXPANDER,      \
diff --git a/gladeui/glade-palette-expander.h b/gladeui/glade-palette-expander.h
index f080b4c7..9d26e09d 100644
--- a/gladeui/glade-palette-expander.h
+++ b/gladeui/glade-palette-expander.h
@@ -24,7 +24,7 @@
 #ifndef __GLADE_PALETTE_EXPANDER_H__
 #define __GLADE_PALETTE_EXPANDER_H__
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gladeui/glade-palette-item.c b/gladeui/glade-palette-item.c
index 90389818..fa74c92a 100644
--- a/gladeui/glade-palette-item.c
+++ b/gladeui/glade-palette-item.c
@@ -25,10 +25,7 @@
 
 #include "config.h"
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #include "glade.h"
 #include "glade-palette-item.h"
diff --git a/gladeui/glade-palette-item.h b/gladeui/glade-palette-item.h
index 76a6760c..5d06057b 100644
--- a/gladeui/glade-palette-item.h
+++ b/gladeui/glade-palette-item.h
@@ -31,7 +31,7 @@
 #include <gladeui/glade-palette.h>
 #include <gladeui/glade-widget-adaptor.h>
 
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gladeui/glade-palette.h b/gladeui/glade-palette.h
index 3a877d41..c625e26c 100644
--- a/gladeui/glade-palette.h
+++ b/gladeui/glade-palette.h
@@ -31,7 +31,7 @@
 
 #include <gladeui/glade.h>
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gladeui/glade-property-class.h b/gladeui/glade-property-class.h
index 1af397e9..acbae3e7 100644
--- a/gladeui/glade-property-class.h
+++ b/gladeui/glade-property-class.h
@@ -4,7 +4,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkadjustment.h>
+#include <gtk/gtk.h>
 
 #include <gladeui/glade-xml-utils.h>
 
diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c
index a51f7343..840d18de 100644
--- a/gladeui/glade-widget-adaptor.c
+++ b/gladeui/glade-widget-adaptor.c
@@ -47,7 +47,7 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include <glib/gdir.h>
+#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <gmodule.h>
 #include <ctype.h>
diff --git a/src/glade-window.c b/src/glade-window.c
index c92b449c..890d4b43 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -36,7 +36,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #define ACTION_GROUP_STATIC             "GladeStatic"
 #define ACTION_GROUP_PROJECT            "GladeProject"
diff --git a/src/glade-window.h b/src/glade-window.h
index 96028c62..5194f952 100644
--- a/src/glade-window.h
+++ b/src/glade-window.h
@@ -21,7 +21,7 @@
 #ifndef __GLADE_WINDOW_H__
 #define __GLADE_WINDOW_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS