Do not do single includes in src/bookmarks/, bug #536090

svn path=/trunk/; revision=8270

26 files changed, 22 insertions, 88 deletions

diff --git a/src/bookmarks/ephy-bookmark-action-group.c b/src/bookmarks/ephy-bookmark-action-group.c
index 1d889d86a..184fe542b 100644
--- a/src/bookmarks/ephy-bookmark-action-group.c
+++ b/src/bookmarks/ephy-bookmark-action-group.c
@@ -30,8 +30,7 @@
 #include "ephy-node-common.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 static void
diff --git a/src/bookmarks/ephy-bookmark-action-group.h b/src/bookmarks/ephy-bookmark-action-group.h
index f62cb65a1..769d17212 100644
--- a/src/bookmarks/ephy-bookmark-action-group.h
+++ b/src/bookmarks/ephy-bookmark-action-group.h
@@ -28,7 +28,7 @@
 #include "ephy-link-action.h"
 #include "ephy-node.h"
 
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index d035964b5..b7a493d2e 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -35,18 +35,7 @@
 #include "ephy-string.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index 1e46832ed..a5978bf90 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -30,7 +30,7 @@
 #include "ephy-link-action.h"
 #include "ephy-node.h"
 
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bookmarks/ephy-bookmark-factory-action.c b/src/bookmarks/ephy-bookmark-factory-action.c
index 350311ce8..01cf8c0f9 100644
--- a/src/bookmarks/ephy-bookmark-factory-action.c
+++ b/src/bookmarks/ephy-bookmark-factory-action.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "ephy-bookmark-factory-action.h"
diff --git a/src/bookmarks/ephy-bookmark-factory-action.h b/src/bookmarks/ephy-bookmark-factory-action.h
index 106231798..76406a9b4 100644
--- a/src/bookmarks/ephy-bookmark-factory-action.h
+++ b/src/bookmarks/ephy-bookmark-factory-action.h
@@ -29,8 +29,6 @@
 #include "ephy-window.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
 
 #define EPHY_TYPE_BOOKMARK_FACTORY_ACTION            (ephy_bookmark_factory_action_get_type ())
 #define EPHY_BOOKMARK_FACTORY_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_BOOKMARK_FACTORY_ACTION, EphyBookmarkFactoryAction))
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index dd61e0d93..6f9754577 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -38,18 +38,8 @@
 
 #include "eel-gconf-extensions.h"
 
-
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkscrolledwindow.h>
 
 #include <string.h>
 
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 62d54a0c7..8d5fab812 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -29,7 +29,7 @@
 
 #include "ephy-bookmarks.h"
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index f506a9a52..8f6a5cc27 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -20,26 +20,7 @@
 
 #include "config.h"
 
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h
index 00dd7eeed..210245916 100644
--- a/src/bookmarks/ephy-bookmarks-editor.h
+++ b/src/bookmarks/ephy-bookmarks-editor.h
@@ -25,7 +25,7 @@
 #ifndef EPHY_BOOKMARKS_EDITOR_H
 #define EPHY_BOOKMARKS_EDITOR_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include "ephy-node-view.h"
 #include "ephy-bookmarks.h"
diff --git a/src/bookmarks/ephy-bookmarks-ui.c b/src/bookmarks/ephy-bookmarks-ui.c
index dd8531eab..809bc6f5d 100644
--- a/src/bookmarks/ephy-bookmarks-ui.c
+++ b/src/bookmarks/ephy-bookmarks-ui.c
@@ -49,8 +49,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-
+#include <gtk/gtk.h>
 
 #define BM_WINDOW_DATA_KEY "bookmarks-window-data"
 
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 52db4c516..7cfd86e7d 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -44,8 +44,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #ifdef ENABLE_ZEROCONF
 #include <avahi-common/error.h>
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index ee3bff26c..6e384b9de 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -27,7 +27,7 @@
 #define EPHY_BOOKMARKS_H
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "ephy-node.h"
 
diff --git a/src/bookmarks/ephy-open-tabs-action.c b/src/bookmarks/ephy-open-tabs-action.c
index 3355b18e4..f3ea35830 100644
--- a/src/bookmarks/ephy-open-tabs-action.c
+++ b/src/bookmarks/ephy-open-tabs-action.c
@@ -29,7 +29,7 @@
 #include "ephy-link.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
 
 #include <libgnomevfs/gnome-vfs-uri.h>
 
diff --git a/src/bookmarks/ephy-open-tabs-action.h b/src/bookmarks/ephy-open-tabs-action.h
index d7d63efc9..f058daad8 100644
--- a/src/bookmarks/ephy-open-tabs-action.h
+++ b/src/bookmarks/ephy-open-tabs-action.h
@@ -25,7 +25,7 @@
 #ifndef EPHY_OPEN_TABS_ACTION_H
 #define EPHY_OPEN_TABS_ACTION_H
 
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "ephy-node.h"
 
diff --git a/src/bookmarks/ephy-related-action.c b/src/bookmarks/ephy-related-action.c
index 5f3ee9959..53d9a5cd0 100644
--- a/src/bookmarks/ephy-related-action.c
+++ b/src/bookmarks/ephy-related-action.c
@@ -29,8 +29,6 @@
 #include "ephy-stock-icons.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
 #include <glib/gi18n.h>
 
 static void
diff --git a/src/bookmarks/ephy-related-action.h b/src/bookmarks/ephy-related-action.h
index 724f25c64..fd0fee421 100644
--- a/src/bookmarks/ephy-related-action.h
+++ b/src/bookmarks/ephy-related-action.h
@@ -29,8 +29,7 @@
 #include "ephy-link.h"
 #include "ephy-topic-action.h"
 
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bookmarks/ephy-topic-action-group.c b/src/bookmarks/ephy-topic-action-group.c
index 7ea88b438..8731577bc 100644
--- a/src/bookmarks/ephy-topic-action-group.c
+++ b/src/bookmarks/ephy-topic-action-group.c
@@ -28,8 +28,7 @@
 #include "ephy-bookmarks-ui.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 static void
 node_changed_cb (EphyNode *parent, 
diff --git a/src/bookmarks/ephy-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h
index 34e370068..01e537492 100644
--- a/src/bookmarks/ephy-topic-action-group.h
+++ b/src/bookmarks/ephy-topic-action-group.h
@@ -28,8 +28,7 @@
 #include "ephy-link-action.h"
 #include "ephy-node.h"
 
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 5a10c021c..78f322bb4 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -34,18 +34,7 @@
 #include "ephy-dnd.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 static const GtkTargetEntry dest_drag_types[] = {
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
index 01c1f311f..5a53386e8 100644
--- a/src/bookmarks/ephy-topic-action.h
+++ b/src/bookmarks/ephy-topic-action.h
@@ -29,8 +29,7 @@
 #include "ephy-link-action.h"
 #include "ephy-node.h"
 
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bookmarks/ephy-topic-factory-action.c b/src/bookmarks/ephy-topic-factory-action.c
index 1322b9926..f875b5eab 100644
--- a/src/bookmarks/ephy-topic-factory-action.c
+++ b/src/bookmarks/ephy-topic-factory-action.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "ephy-topic-factory-action.h"
diff --git a/src/bookmarks/ephy-topic-factory-action.h b/src/bookmarks/ephy-topic-factory-action.h
index 213bd906d..c490bd5d0 100644
--- a/src/bookmarks/ephy-topic-factory-action.h
+++ b/src/bookmarks/ephy-topic-factory-action.h
@@ -29,8 +29,6 @@
 #include "ephy-window.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
 
 #define EPHY_TYPE_TOPIC_FACTORY_ACTION            (ephy_topic_factory_action_get_type ())
 #define EPHY_TOPIC_FACTORY_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_TOPIC_FACTORY_ACTION, EphyTopicFactoryAction))
diff --git a/src/bookmarks/ephy-topics-entry.c b/src/bookmarks/ephy-topics-entry.c
index a7cbed62c..385fe2eea 100644
--- a/src/bookmarks/ephy-topics-entry.c
+++ b/src/bookmarks/ephy-topics-entry.c
@@ -26,9 +26,7 @@
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 static void ephy_topics_entry_class_init (EphyTopicsEntryClass *klass);
diff --git a/src/bookmarks/ephy-topics-entry.h b/src/bookmarks/ephy-topics-entry.h
index bf98577ee..a229efb6d 100644
--- a/src/bookmarks/ephy-topics-entry.h
+++ b/src/bookmarks/ephy-topics-entry.h
@@ -27,7 +27,7 @@
 
 #include "ephy-bookmarks.h"
 
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/bookmarks/ephy-topics-palette.c b/src/bookmarks/ephy-topics-palette.c
index 4c8b3837e..86315c62b 100644
--- a/src/bookmarks/ephy-topics-palette.c
+++ b/src/bookmarks/ephy-topics-palette.c
@@ -28,7 +28,7 @@
 #include "ephy-debug.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtktreeselection.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 static void ephy_topics_palette_class_init (EphyTopicsPaletteClass *klass);