From 686cc5bb979b1af5cd25a8ca367de71c717f2ff8 Mon Sep 17 00:00:00 2001
From: Diego Escalante Urrelo <diegoe@src.gnome.org>
Date: Tue, 22 Jul 2008 03:33:42 +0000
Subject: Do not do single includes for GTK+, bug #536090

svn path=/branches/gnome-2-24/; revision=8351
---
 src/ephy-action-helper.h     |  2 +-
 src/ephy-completion-model.h  |  2 +-
 src/ephy-encoding-dialog.c   |  7 +------
 src/ephy-encoding-menu.c     |  5 +----
 src/ephy-find-toolbar.c      | 11 -----------
 src/ephy-find-toolbar.h      |  2 +-
 src/ephy-fullscreen-popup.c  | 10 +---------
 src/ephy-fullscreen-popup.h  |  2 +-
 src/ephy-go-action.c         |  3 +--
 src/ephy-history-window.c    | 22 +---------------------
 src/ephy-history-window.h    |  2 +-
 src/ephy-home-action.c       |  3 +--
 src/ephy-link-action.c       |  5 +----
 src/ephy-link-action.h       |  3 +--
 src/ephy-location-action.c   |  8 +-------
 src/ephy-lockdown.c          |  3 +--
 src/ephy-main.c              |  4 +---
 src/ephy-navigation-action.c | 10 +---------
 src/ephy-notebook.c          | 10 +---------
 src/ephy-notebook.h          |  2 +-
 src/ephy-session.c           | 10 +---------
 src/ephy-session.h           |  2 +-
 src/ephy-shell.c             |  2 +-
 src/ephy-statusbar.c         |  8 +-------
 src/ephy-statusbar.h         |  2 +-
 src/ephy-tabs-menu.c         |  8 +-------
 src/ephy-toolbar-editor.c    | 10 +---------
 src/ephy-toolbar-editor.h    |  2 +-
 src/ephy-toolbar.c           |  7 +------
 src/ephy-window.c            |  6 ------
 src/ephy-window.h            |  2 +-
 src/pdm-dialog.c             | 16 +---------------
 src/popup-commands.c         |  3 +--
 src/popup-commands.h         |  2 +-
 src/ppview-toolbar.c         |  6 +-----
 src/ppview-toolbar.h         |  2 +-
 src/prefs-dialog.c           | 19 +------------------
 src/window-commands.c        |  7 +------
 src/window-commands.h        |  2 +-
 39 files changed, 37 insertions(+), 195 deletions(-)

diff --git a/src/ephy-action-helper.h b/src/ephy-action-helper.h
index fc5e31cd0..d15ed618a 100644
--- a/src/ephy-action-helper.h
+++ b/src/ephy-action-helper.h
@@ -21,7 +21,7 @@
 #ifndef EPHY_ACTION_HELPER_H
 #define EPHY_ACTION_HELPER_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h
index 6df64d288..60996313c 100644
--- a/src/ephy-completion-model.h
+++ b/src/ephy-completion-model.h
@@ -21,7 +21,7 @@
 #ifndef EPHY_COMPLETION_MODEL_H
 #define EPHY_COMPLETION_MODEL_H
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 98cedcd1c..bf029dd6b 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -34,12 +34,7 @@
 #include "ephy-debug.h"
 #include "ephy-gui.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 59ba9ee32..d767c45d0 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -32,10 +32,7 @@
 #include "ephy-shell.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index a6b59ff31..d2dd68fb4 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -29,17 +29,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkmain.h>
 #include <string.h>
 
 #define EPHY_FIND_TOOLBAR_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbarPrivate))
diff --git a/src/ephy-find-toolbar.h b/src/ephy-find-toolbar.h
index c94e877f9..6183c594a 100644
--- a/src/ephy-find-toolbar.h
+++ b/src/ephy-find-toolbar.h
@@ -22,7 +22,7 @@
 #ifndef EPHY_FIND_TOOLBAR_H
 #define EPHY_FIND_TOOLBAR_H
 
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>
 
 #include "ephy-window.h"
 
diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c
index 90018c205..58766865e 100644
--- a/src/ephy-fullscreen-popup.c
+++ b/src/ephy-fullscreen-popup.c
@@ -26,15 +26,7 @@
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #define EPHY_FULLSCREEN_POPUP_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_FULLSCREEN_POPUP, EphyFullscreenPopupPrivate))
diff --git a/src/ephy-fullscreen-popup.h b/src/ephy-fullscreen-popup.h
index 3ee1279b7..c5d8e1863 100644
--- a/src/ephy-fullscreen-popup.h
+++ b/src/ephy-fullscreen-popup.h
@@ -22,7 +22,7 @@
 #ifndef EPHY_FULLSCREEN_POPUP_H
 #define EPHY_FULLSCREEN_POPUP_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "ephy-window.h"
 
 G_BEGIN_DECLS
diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c
index d67ad962d..64ca21e8a 100644
--- a/src/ephy-go-action.c
+++ b/src/ephy-go-action.c
@@ -25,8 +25,7 @@
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 static void ephy_go_action_class_init (EphyGoActionClass *class);
 
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 9cbe36621..46ed4cd9f 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -21,27 +21,7 @@
 
 #include "config.h"
 
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkuimanager.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <string.h>
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 65d8133a3..52a67916d 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -21,7 +21,7 @@
 #ifndef EPHY_HISTORY_WINDOW_H
 #define EPHY_HISTORY_WINDOW_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "ephy-node-view.h"
 #include "ephy-history.h"
diff --git a/src/ephy-home-action.c b/src/ephy-home-action.c
index 72b73292e..1b912bcbb 100644
--- a/src/ephy-home-action.c
+++ b/src/ephy-home-action.c
@@ -29,8 +29,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
 
 #define INSANE_NUMBER_OF_URLS 20
 
diff --git a/src/ephy-link-action.c b/src/ephy-link-action.c
index 8ac930759..f5d9fe7e9 100644
--- a/src/ephy-link-action.c
+++ b/src/ephy-link-action.c
@@ -27,10 +27,7 @@
 #include "ephy-debug.h"
 #include "ephy-gui.h"
 
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenutoolbutton.h>
+#include <gtk/gtk.h>
 
 G_DEFINE_TYPE_WITH_CODE (EphyLinkAction, ephy_link_action, GTK_TYPE_ACTION,
                          G_IMPLEMENT_INTERFACE (EPHY_TYPE_LINK,
diff --git a/src/ephy-link-action.h b/src/ephy-link-action.h
index 1aa6d2224..189da2a8a 100644
--- a/src/ephy-link-action.h
+++ b/src/ephy-link-action.h
@@ -21,8 +21,7 @@
 #ifndef EPHY_LINK_ACTION_H
 #define EPHY_LINK_ACTION_H
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index 99373f301..ed9eae8c7 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -32,13 +32,7 @@
 #include "ephy-debug.h"
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktreemodelsort.h>
-
+#include <gtk/gtk.h>
 
 #include <string.h>
 #define EPHY_LOCATION_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_LOCATION_ACTION, EphyLocationActionPrivate))
diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index ba09a6dc0..62f840b20 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -31,8 +31,7 @@
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 855f93f92..c092e71de 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -40,9 +40,7 @@
 #include <glib/gi18n.h>
 
 #include <gdk/gdkx.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index 64cecb870..e76ac9e2e 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -34,15 +34,7 @@
 #include "ephy-gui.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenutoolbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 
 #define HISTORY_ITEM_DATA_KEY	"HistoryItem"
 #define URL_DATA_KEY	        "GoURL"
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index b01062981..091c83ff9 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -36,15 +36,7 @@
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #define TAB_WIDTH_N_CHARS 15
 
diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h
index e0663103c..cc89e594c 100644
--- a/src/ephy-notebook.h
+++ b/src/ephy-notebook.h
@@ -24,7 +24,7 @@
 #define EPHY_NOTEBOOK_H
 
 #include <glib.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
 #include "ephy-embed.h"
 
diff --git a/src/ephy-session.c b/src/ephy-session.c
index cf7d24abc..1a3ffa2e8 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -41,15 +41,7 @@
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #include <libgnomeui/gnome-client.h>
 
diff --git a/src/ephy-session.h b/src/ephy-session.h
index e2b01b0da..f21837f82 100644
--- a/src/ephy-session.h
+++ b/src/ephy-session.h
@@ -27,7 +27,7 @@
 
 #include "ephy-window.h"
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 27687f515..371cdeabd 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 #include <dirent.h>
 #include <unistd.h>
 
diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c
index 6f532f638..a052b628b 100644
--- a/src/ephy-statusbar.c
+++ b/src/ephy-statusbar.c
@@ -27,13 +27,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gtk/gtklabel.h>	
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvseparator.h>
+#include <gtk/gtk.h>	
 
 static void ephy_statusbar_class_init	(EphyStatusbarClass *klass);
 static void ephy_statusbar_init		(EphyStatusbar *t);
diff --git a/src/ephy-statusbar.h b/src/ephy-statusbar.h
index 16d88377e..4a6fa422e 100644
--- a/src/ephy-statusbar.h
+++ b/src/ephy-statusbar.h
@@ -23,7 +23,7 @@
 #ifndef EPHY_STATUSBAR_H
 #define EPHY_STATUSBAR_H
 
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index 66e555a94..ba11bac87 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -31,13 +31,7 @@
 #include "ephy-embed-utils.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/ephy-toolbar-editor.c b/src/ephy-toolbar-editor.c
index 043aa3e53..3efa14ea2 100644
--- a/src/ephy-toolbar-editor.c
+++ b/src/ephy-toolbar-editor.c
@@ -36,15 +36,7 @@
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #define DATA_KEY		"EphyToolbarEditor"
diff --git a/src/ephy-toolbar-editor.h b/src/ephy-toolbar-editor.h
index 2b9de0621..861aacca3 100644
--- a/src/ephy-toolbar-editor.h
+++ b/src/ephy-toolbar-editor.h
@@ -22,7 +22,7 @@
 #ifndef EPHY_TOOLBAR_EDITOR_H
 #define EPHY_TOOLBAR_EDITOR_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "ephy-window.h"
 
 G_BEGIN_DECLS
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index dbb5f5a64..8c34aee6b 100644
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -41,12 +41,7 @@
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 enum
diff --git a/src/ephy-window.c b/src/ephy-window.c
index cfb3027d8..2fb97369f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -65,12 +65,6 @@
 #include <libgnomeui/gnome-stock-icons.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkmessagedialog.h>
 
 #ifdef HAVE_X11_XF86KEYSYM_H
 #include <X11/XF86keysym.h>
diff --git a/src/ephy-window.h b/src/ephy-window.h
index f55f4c99d..b4f0b5f7e 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -25,7 +25,7 @@
 
 #include <glib-object.h>
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index a3b494298..fafa54fe7 100644
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -37,21 +37,7 @@
 #include "ephy-favicon-cache.h"
 #include "ephy-history.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkhseparator.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include <string.h>
diff --git a/src/popup-commands.c b/src/popup-commands.c
index dbd9baf10..58c6c3a61 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -33,8 +33,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 void
 popup_cmd_link_in_new_window (GtkAction *action,
diff --git a/src/popup-commands.h b/src/popup-commands.h
index c770692bd..9301f4798 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.h
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #include "ephy-window.h"
 
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index f501946c3..4de13beb9 100644
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -27,11 +27,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 static void ppview_toolbar_class_init (PPViewToolbarClass *klass);
 static void ppview_toolbar_init (PPViewToolbar *t);
diff --git a/src/ppview-toolbar.h b/src/ppview-toolbar.h
index 18ca91ac2..44ad58840 100644
--- a/src/ppview-toolbar.h
+++ b/src/ppview-toolbar.h
@@ -24,7 +24,7 @@
 #include "ephy-window.h"
 #include <glib-object.h>
 #include <glib.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 4a21c4815..b6c69355b 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -44,24 +44,7 @@
 #include "pdm-dialog.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #define CONF_FONTS_FOR_LANGUAGE	"/apps/epiphany/dialogs/preferences_font_language"
diff --git a/src/window-commands.c b/src/window-commands.c
index ec5bfe50c..e2f31f00f 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -56,12 +56,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gio/gio.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 static void
diff --git a/src/window-commands.h b/src/window-commands.h
index 3f193d005..5a70b2fef 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -18,7 +18,7 @@
  *  $Id$
  */
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #include "ephy-window.h"
 
-- 
cgit v1.2.3