16 files changed, 18 insertions, 47 deletions
diff --git a/lib/ephy-debug.c b/lib/ephy-debug.c
index 42f704b6f..46b13f395 100644
--- a/lib/ephy-debug.c
+++ b/lib/ephy-debug.c
@@ -29,7 +29,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib/gbacktrace.h>
+#include <glib.h>
 
 static const char *ephy_debug_break = NULL;
 
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index a94a312fc..07ada45d5 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -29,15 +29,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkdialog.h>
-#include <glade/glade-xml.h>
+#include <gtk/gtk.h>
+#include <glade/glade.h>
 
 enum
 {
diff --git a/lib/ephy-dialog.h b/lib/ephy-dialog.h
index 8abc6bb33..e97439a83 100644
--- a/lib/ephy-dialog.h
+++ b/lib/ephy-dialog.h
@@ -28,7 +28,7 @@
 
 #include <glib-object.h>
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index 47d3937cf..5b2ad446c 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -23,8 +23,7 @@
 #include "ephy-dnd.h"
 #include "ephy-node.h"
 
-#include <gtk/gtkselection.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 /* Encode a "_NETSCAPE_URL_" selection.
diff --git a/lib/ephy-dnd.h b/lib/ephy-dnd.h
index 62e79823e..f97ecce25 100644
--- a/lib/ephy-dnd.h
+++ b/lib/ephy-dnd.h
@@ -26,8 +26,7 @@
 #define EPHY_DND_H
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 9b3fa7d38..6f6e8cf31 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -30,8 +30,7 @@
 #include "ephy-stock-icons.h"
 #include "ephy-string.h"
 
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #define EPHY_FILE_CHOOSER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_FILE_CHOOSER, EphyFileChooserPrivate))
diff --git a/lib/ephy-file-chooser.h b/lib/ephy-file-chooser.h
index e50f0817b..ea013ff5a 100644
--- a/lib/ephy-file-chooser.h
+++ b/lib/ephy-file-chooser.h
@@ -27,9 +27,7 @@
 
 #include <glib-object.h>
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkfilefilter.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index a2853fb7d..ad7f65c39 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -43,7 +43,7 @@
 #include <libgnome/gnome-desktop-item.h>
 
 #include <gdk/gdk.h>
-#include <gtk/gtkrecentmanager.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h
index 362d232c2..ae9a880b1 100644
--- a/lib/ephy-file-helpers.h
+++ b/lib/ephy-file-helpers.h
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 extern GQuark ephy_file_helpers_error_quark;
 #define EPHY_FILE_HELPERS_ERROR_QUARK	(ephy_file_helpers_error_quark)
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 2ef1941da..0e63c7d99 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -28,18 +28,9 @@
 #include <ctype.h>
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-help.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktogglebutton.h>
 
 #include <unistd.h>
 
diff --git a/lib/ephy-gui.h b/lib/ephy-gui.h
index cd33d1cd6..c733ef4b8 100644
--- a/lib/ephy-gui.h
+++ b/lib/ephy-gui.h
@@ -27,11 +27,7 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/ephy-password-dialog.h b/lib/ephy-password-dialog.h
index c69778d07..62788769c 100644
--- a/lib/ephy-password-dialog.h
+++ b/lib/ephy-password-dialog.h
@@ -25,7 +25,7 @@
 #ifndef EPHY_PASSWORD_DIALOG_H
 #define EPHY_PASSWORD_DIALOG_H
 
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-password-dialog.h>
 
 G_BEGIN_DECLS
diff --git a/lib/ephy-print-utils.c b/lib/ephy-print-utils.c
index 1376604c0..3e61bb404 100644
--- a/lib/ephy-print-utils.c
+++ b/lib/ephy-print-utils.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include <glib.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtk.h>
 
 #include "ephy-debug.h"
 #include "ephy-string.h"
diff --git a/lib/ephy-print-utils.h b/lib/ephy-print-utils.h
index 2e21268f1..1f8aef856 100644
--- a/lib/ephy-print-utils.h
+++ b/lib/ephy-print-utils.h
@@ -26,8 +26,7 @@
 #define EPHY_PRINT_UTILS_H
 
 #include <glib.h>
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtkpagesetup.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/ephy-state.c b/lib/ephy-state.c
index 2f0b2f8e5..ba9eee4b3 100644
--- a/lib/ephy-state.c
+++ b/lib/ephy-state.c
@@ -30,10 +30,7 @@
 #include "ephy-node-common.h"
 
 #include <string.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkpaned.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 #define EPHY_STATES_XML_FILE	"states.xml"
 #define EPHY_STATES_XML_ROOT    (const xmlChar *)"ephy_states"
diff --git a/lib/ephy-state.h b/lib/ephy-state.h
index 26155ad9a..8438b362e 100644
--- a/lib/ephy-state.h
+++ b/lib/ephy-state.h
@@ -27,7 +27,7 @@
 #ifndef EPHY_STATE_H
 #define EPHY_STATE_H
 
-#include "gtk/gtkwidget.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS