9 files changed, 10 insertions, 27 deletions
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 656a81203..a5e59eed9 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -32,22 +32,7 @@
 #include "eel-gconf-extensions.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrendererprogress.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkstatusicon.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-icon-lookup.h>
 
 
diff --git a/embed/ephy-embed-dialog.h b/embed/ephy-embed-dialog.h
index 2efb2be15..8624c2357 100644
--- a/embed/ephy-embed-dialog.h
+++ b/embed/ephy-embed-dialog.h
@@ -30,7 +30,7 @@
 
 #include <glib-object.h>
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c
index f7a0543fa..59aa1f62e 100644
--- a/embed/ephy-embed-event.c
+++ b/embed/ephy-embed-event.c
@@ -23,8 +23,8 @@
 #include "ephy-embed-event.h"
 #include "ephy-embed-type-builtins.h"
 
-#include <glib/ghash.h>
-#include <gtk/gtktypeutils.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 static void ephy_embed_event_base_init (gpointer g_class);
 
diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
index 950ad7abb..2f694240f 100644
--- a/embed/ephy-embed-persist.c
+++ b/embed/ephy-embed-persist.c
@@ -25,7 +25,7 @@
 #include "ephy-embed-type-builtins.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 enum
 {
diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h
index a5f7a82f3..b06b04618 100644
--- a/embed/ephy-embed-persist.h
+++ b/embed/ephy-embed-persist.h
@@ -31,7 +31,7 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 067f7ae1b..d13ad9886 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -21,10 +21,9 @@
 #include <config.h>
 
 #include <glib.h>
-#include <glib/gstdio.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #include "downloader-view.h"
 #include "ephy-adblock-manager.h"
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 116116e4c..17df203b9 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -27,8 +27,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkpagesetup.h>
-#include <gtk/gtkprintsettings.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 55bf0821f..b6adab1ed 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -30,7 +30,7 @@
 
 #include <glib-object.h>
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index 708423652..3087aef4d 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -38,7 +38,7 @@
 #include "ephy-debug.h"
 #include "ephy-glib-compat.h"
 
-#include <glib/gstdio.h>
+#include <glib.h>
 #include <gio/gio.h>
 
 #define EPHY_FAVICON_CACHE_XML_ROOT    (const xmlChar *)"ephy_favicons_cache"