Do not do single includes in lib/widgets/, bug #536090

svn path=/trunk/; revision=8268

17 files changed, 15 insertions, 55 deletions

diff --git a/lib/widgets/ephy-icon-entry.c b/lib/widgets/ephy-icon-entry.c
index a84c40a45..0cb159689 100644
--- a/lib/widgets/ephy-icon-entry.c
+++ b/lib/widgets/ephy-icon-entry.c
@@ -31,9 +31,7 @@
 
 #include "ephy-icon-entry.h"
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #define EPHY_ICON_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ICON_ENTRY, EphyIconEntryPrivate))
 
diff --git a/lib/widgets/ephy-icon-entry.h b/lib/widgets/ephy-icon-entry.h
index 5e8008b76..f14cf306a 100644
--- a/lib/widgets/ephy-icon-entry.h
+++ b/lib/widgets/ephy-icon-entry.h
@@ -34,7 +34,7 @@
 #ifndef EPHY_ICON_ENTRY_H
 #define EPHY_ICON_ENTRY_H
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index b66be340e..9b2ff7838 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -36,24 +36,7 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 
diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index 73b7b8498..6a6693159 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -29,10 +29,7 @@
 
 #include "ephy-node.h"
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkentrycompletion.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index 3ef405619..61f7fb6a4 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -21,14 +21,7 @@
 
 #include "config.h"
 
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtktreemodelfilter.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "ephy-node-view.h"
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 5a5453890..a42d0d42a 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -21,8 +21,7 @@
 #ifndef __EPHY_NODE_VIEW_H
 #define __EPHY_NODE_VIEW_H
 
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 #include "ephy-tree-model-node.h"
 #include "ephy-node-filter.h"
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c
index efb7a15e3..80bd3af0c 100644
--- a/lib/widgets/ephy-search-entry.c
+++ b/lib/widgets/ephy-search-entry.c
@@ -20,8 +20,7 @@
 
 #include "config.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index d41da4960..ec61dfae5 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -32,9 +32,7 @@
 #include "ephy-spinner.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtksettings.h>
+#include <gtk/gtk.h>
 
 /* Spinner cache implementation */
 
diff --git a/lib/widgets/ephy-spinner.h b/lib/widgets/ephy-spinner.h
index d04e00d85..dbedc4ab5 100644
--- a/lib/widgets/ephy-spinner.h
+++ b/lib/widgets/ephy-spinner.h
@@ -29,8 +29,7 @@
 #ifndef EPHY_SPINNER_H
 #define EPHY_SPINNER_H
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h
index a2567a3ef..7b3eaf38b 100644
--- a/lib/widgets/ephy-tree-model-node.h
+++ b/lib/widgets/ephy-tree-model-node.h
@@ -21,7 +21,7 @@
 #ifndef __EPHY_TREE_MODEL_NODE_H
 #define __EPHY_TREE_MODEL_NODE_H
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 #include "ephy-node.h"
 
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index ac597c77b..c49c02a4d 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -20,8 +20,7 @@
 
 #include "config.h"
 
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #include "ephy-node.h"
diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h
index 5260d9f87..544d071c6 100644
--- a/lib/widgets/ephy-tree-model-sort.h
+++ b/lib/widgets/ephy-tree-model-sort.h
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 
-#include <gtk/gtktreemodelsort.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index 9845c2695..6f60b29ad 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -27,10 +27,7 @@
 
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
+#include <gtk/gtk.h>
 
 #define EPHY_ZOOM_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionPrivate))
 
diff --git a/lib/widgets/ephy-zoom-action.h b/lib/widgets/ephy-zoom-action.h
index 2c91c7c59..b468a6770 100644
--- a/lib/widgets/ephy-zoom-action.h
+++ b/lib/widgets/ephy-zoom-action.h
@@ -26,7 +26,7 @@
 #ifndef EPHY_ZOOM_ACTION_H
 #define EPHY_ZOOM_ACTION_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c
index 90e30281a..210f2b34a 100644
--- a/lib/widgets/ephy-zoom-control.c
+++ b/lib/widgets/ephy-zoom-control.c
@@ -26,7 +26,6 @@
 #include "ephy-debug.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkcombobox.h>
 #include <glib/gi18n.h>
 
 #define EPHY_ZOOM_CONTROL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlPrivate))
diff --git a/lib/widgets/ephy-zoom-control.h b/lib/widgets/ephy-zoom-control.h
index 381d8a7aa..e97860427 100644
--- a/lib/widgets/ephy-zoom-control.h
+++ b/lib/widgets/ephy-zoom-control.h
@@ -25,7 +25,7 @@
 #ifndef EPHY_ZOOM_CONTROL_H
 #define EPHY_ZOOM_CONTROL_H
 
-#include <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/widgets/testiconentry.c b/lib/widgets/testiconentry.c
index bd71113ad..92a8cdd76 100644
--- a/lib/widgets/testiconentry.c
+++ b/lib/widgets/testiconentry.c
@@ -20,7 +20,6 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkstock.h>
 
 #include "ephy-icon-entry.h"
 #include "ephy-icon-entry.c"