epiphany-extensions r1781 - in branches/gnome-2-24: . extensions/adblock extensions/auto-scroller extensions/certificates extensions/error-viewer extensions/extensions-manager-ui extensions/gestures extensions/page-info extensions/push-scroller extensions/select-stylesheet extensions/sidebar extensions/smart-bookmarks extensions/tab-groups extensions/tab-states include

[cosimoc svn gnome org]

Author: cosimoc
Date: Sat Oct 18 12:27:13 2008
New Revision: 1781
URL: http://svn.gnome.org/viewvc/epiphany-extensions?rev=1781&view=rev

Log:
Use and enforce single header includes for GTK+ and GLib.


Modified:
   branches/gnome-2-24/configure.ac
   branches/gnome-2-24/extensions/adblock/adblock-ui.c
   branches/gnome-2-24/extensions/adblock/ephy-adblock-extension.c
   branches/gnome-2-24/extensions/auto-scroller/ephy-auto-scroller.c
   branches/gnome-2-24/extensions/auto-scroller/ephy-auto-scroller.h
   branches/gnome-2-24/extensions/certificates/ephy-certificates-extension.c
   branches/gnome-2-24/extensions/error-viewer/ephy-error-viewer-extension.c
   branches/gnome-2-24/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c
   branches/gnome-2-24/extensions/extensions-manager-ui/extensions-manager-ui.c
   branches/gnome-2-24/extensions/gestures/ephy-gesture.c
   branches/gnome-2-24/extensions/gestures/ephy-gesture.h
   branches/gnome-2-24/extensions/page-info/ephy-page-info-extension.c
   branches/gnome-2-24/extensions/page-info/page-info-dialog.c
   branches/gnome-2-24/extensions/push-scroller/ephy-push-scroller.c
   branches/gnome-2-24/extensions/push-scroller/ephy-push-scroller.h
   branches/gnome-2-24/extensions/select-stylesheet/ephy-css-menu.c
   branches/gnome-2-24/extensions/sidebar/ephy-sidebar-embed.c
   branches/gnome-2-24/extensions/sidebar/ephy-sidebar-embed.h
   branches/gnome-2-24/extensions/sidebar/ephy-sidebar-extension.c
   branches/gnome-2-24/extensions/sidebar/ephy-sidebar.c
   branches/gnome-2-24/extensions/sidebar/ephy-sidebar.h
   branches/gnome-2-24/extensions/sidebar/sidebar-commands.c
   branches/gnome-2-24/extensions/sidebar/sidebar-commands.h
   branches/gnome-2-24/extensions/smart-bookmarks/smart-bookmarks-extension.c
   branches/gnome-2-24/extensions/tab-groups/ephy-tab-grouper.h
   branches/gnome-2-24/extensions/tab-states/ephy-tab-states-extension.c
   branches/gnome-2-24/include/EphyUtils.h
   branches/gnome-2-24/include/ephy-dnd.h
   branches/gnome-2-24/include/ephy-file-chooser.h
   branches/gnome-2-24/include/ephy-file-helpers.h
   branches/gnome-2-24/include/ephy-gui.h

Modified: branches/gnome-2-24/configure.ac
==============================================================================
--- branches/gnome-2-24/configure.ac	(original)
+++ branches/gnome-2-24/configure.ac	Sat Oct 18 12:27:13 2008
@@ -77,7 +77,7 @@
 if test "x$enable_maintainer_mode" = "xyes"; then
 	AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
 	enable_debug=yes
-        DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
+        DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
 	MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $MOZILLA_WARN_CXXFLAGS"
 fi
 

Modified: branches/gnome-2-24/extensions/adblock/adblock-ui.c
==============================================================================
--- branches/gnome-2-24/extensions/adblock/adblock-ui.c	(original)
+++ branches/gnome-2-24/extensions/adblock/adblock-ui.c	Sat Oct 18 12:27:13 2008
@@ -30,18 +30,7 @@
 #include <epiphany/ephy-embed-shell.h>
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 

Modified: branches/gnome-2-24/extensions/adblock/ephy-adblock-extension.c
==============================================================================
--- branches/gnome-2-24/extensions/adblock/ephy-adblock-extension.c	(original)
+++ branches/gnome-2-24/extensions/adblock/ephy-adblock-extension.c	Sat Oct 18 12:27:13 2008
@@ -37,14 +37,7 @@
 #include "ad-uri-tester.h"
 #include "adblock-ui.h"
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <gmodule.h>
 

Modified: branches/gnome-2-24/extensions/auto-scroller/ephy-auto-scroller.c
==============================================================================
--- branches/gnome-2-24/extensions/auto-scroller/ephy-auto-scroller.c	(original)
+++ branches/gnome-2-24/extensions/auto-scroller/ephy-auto-scroller.c	Sat Oct 18 12:27:13 2008
@@ -28,9 +28,7 @@
 #include "autoscroll.xpm.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include <math.h>
 #include <sys/time.h>

Modified: branches/gnome-2-24/extensions/auto-scroller/ephy-auto-scroller.h
==============================================================================
--- branches/gnome-2-24/extensions/auto-scroller/ephy-auto-scroller.h	(original)
+++ branches/gnome-2-24/extensions/auto-scroller/ephy-auto-scroller.h	Sat Oct 18 12:27:13 2008
@@ -24,7 +24,7 @@
 #define EPHY_AUTO_SCROLLER_H
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <epiphany/ephy-embed.h>
 #include <epiphany/ephy-window.h>
 

Modified: branches/gnome-2-24/extensions/certificates/ephy-certificates-extension.c
==============================================================================
--- branches/gnome-2-24/extensions/certificates/ephy-certificates-extension.c	(original)
+++ branches/gnome-2-24/extensions/certificates/ephy-certificates-extension.c	Sat Oct 18 12:27:13 2008
@@ -32,15 +32,7 @@
 #include <epiphany/ephy-embed-shell.h>
 #include <epiphany/ephy-statusbar.h>
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkrc.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gmodule.h>
 #include <glib/gi18n-lib.h>
 

Modified: branches/gnome-2-24/extensions/error-viewer/ephy-error-viewer-extension.c
==============================================================================
--- branches/gnome-2-24/extensions/error-viewer/ephy-error-viewer-extension.c	(original)
+++ branches/gnome-2-24/extensions/error-viewer/ephy-error-viewer-extension.c	Sat Oct 18 12:27:13 2008
@@ -35,11 +35,7 @@
 #include <epiphany/ephy-embed-container.h>
 #include <epiphany/ephy-embed-shell.h>
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: branches/gnome-2-24/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c
==============================================================================
--- branches/gnome-2-24/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c	(original)
+++ branches/gnome-2-24/extensions/extensions-manager-ui/ephy-extensions-manager-ui-extension.c	Sat Oct 18 12:27:13 2008
@@ -31,9 +31,7 @@
 
 #include <gmodule.h>
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: branches/gnome-2-24/extensions/extensions-manager-ui/extensions-manager-ui.c
==============================================================================
--- branches/gnome-2-24/extensions/extensions-manager-ui/extensions-manager-ui.c	(original)
+++ branches/gnome-2-24/extensions/extensions-manager-ui/extensions-manager-ui.c	Sat Oct 18 12:27:13 2008
@@ -28,19 +28,11 @@
 #include "ephy-gui.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkversion.h>
 
 #define IGNORE_SELF /* Don't display *this* extension in the list */
 #define GROUP	"Epiphany Extension"

Modified: branches/gnome-2-24/extensions/gestures/ephy-gesture.c
==============================================================================
--- branches/gnome-2-24/extensions/gestures/ephy-gesture.c	(original)
+++ branches/gnome-2-24/extensions/gestures/ephy-gesture.c	Sat Oct 18 12:27:13 2008
@@ -29,13 +29,7 @@
 #include "stroke.h"
 
 #include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 #include <epiphany/ephy-embed-container.h>
 #include <epiphany/ephy-window.h>

Modified: branches/gnome-2-24/extensions/gestures/ephy-gesture.h
==============================================================================
--- branches/gnome-2-24/extensions/gestures/ephy-gesture.h	(original)
+++ branches/gnome-2-24/extensions/gestures/ephy-gesture.h	Sat Oct 18 12:27:13 2008
@@ -23,7 +23,7 @@
 #define EPHY_GESTURE_H
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gmodule.h>
 
 #include <epiphany/ephy-embed-event.h>

Modified: branches/gnome-2-24/extensions/page-info/ephy-page-info-extension.c
==============================================================================
--- branches/gnome-2-24/extensions/page-info/ephy-page-info-extension.c	(original)
+++ branches/gnome-2-24/extensions/page-info/ephy-page-info-extension.c	Sat Oct 18 12:27:13 2008
@@ -30,10 +30,7 @@
 #include <epiphany/ephy-embed-container.h>
 #include <epiphany/ephy-notebook.h>
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: branches/gnome-2-24/extensions/page-info/page-info-dialog.c
==============================================================================
--- branches/gnome-2-24/extensions/page-info/page-info-dialog.c	(original)
+++ branches/gnome-2-24/extensions/page-info/page-info-dialog.c	Sat Oct 18 12:27:13 2008
@@ -45,24 +45,12 @@
 #include "ephy-file-helpers.h"
 #include "ephy-file-chooser.h"
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include "mozilla/mozilla-helpers.h"
 
 #include <glib/gi18n-lib.h>
-#include <glib/gconvert.h>
+#include <glib.h>
 #include <gio/gio.h>
 
 #include <time.h>

Modified: branches/gnome-2-24/extensions/push-scroller/ephy-push-scroller.c
==============================================================================
--- branches/gnome-2-24/extensions/push-scroller/ephy-push-scroller.c	(original)
+++ branches/gnome-2-24/extensions/push-scroller/ephy-push-scroller.c	Sat Oct 18 12:27:13 2008
@@ -28,9 +28,7 @@
 #include "ephy-push-scroller.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include <math.h>
 #include <sys/time.h>

Modified: branches/gnome-2-24/extensions/push-scroller/ephy-push-scroller.h
==============================================================================
--- branches/gnome-2-24/extensions/push-scroller/ephy-push-scroller.h	(original)
+++ branches/gnome-2-24/extensions/push-scroller/ephy-push-scroller.h	Sat Oct 18 12:27:13 2008
@@ -24,7 +24,7 @@
 #define EPHY_PUSH_SCROLLER_H
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <epiphany/ephy-embed.h>
 #include <epiphany/ephy-window.h>
 

Modified: branches/gnome-2-24/extensions/select-stylesheet/ephy-css-menu.c
==============================================================================
--- branches/gnome-2-24/extensions/select-stylesheet/ephy-css-menu.c	(original)
+++ branches/gnome-2-24/extensions/select-stylesheet/ephy-css-menu.c	Sat Oct 18 12:27:13 2008
@@ -33,11 +33,7 @@
 
 #include "mozilla/mozilla-helpers.h"
 
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: branches/gnome-2-24/extensions/sidebar/ephy-sidebar-embed.c
==============================================================================
--- branches/gnome-2-24/extensions/sidebar/ephy-sidebar-embed.c	(original)
+++ branches/gnome-2-24/extensions/sidebar/ephy-sidebar-embed.c	Sat Oct 18 12:27:13 2008
@@ -33,11 +33,7 @@
 #include "ephy-prefs.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 /* NOTE: we include gi18n.h instead of gi18n-lib.h since all string here
  * are the same as in epiphany. If that ever changes, fix this include!

Modified: branches/gnome-2-24/extensions/sidebar/ephy-sidebar-embed.h
==============================================================================
--- branches/gnome-2-24/extensions/sidebar/ephy-sidebar-embed.h	(original)
+++ branches/gnome-2-24/extensions/sidebar/ephy-sidebar-embed.h	Sat Oct 18 12:27:13 2008
@@ -22,7 +22,7 @@
 #define EPHY_SIDEBAR_EMBED_H
 
 #include <glib-object.h>
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 #include <epiphany/ephy-embed.h>
 #include <epiphany/ephy-window.h>

Modified: branches/gnome-2-24/extensions/sidebar/ephy-sidebar-extension.c
==============================================================================
--- branches/gnome-2-24/extensions/sidebar/ephy-sidebar-extension.c	(original)
+++ branches/gnome-2-24/extensions/sidebar/ephy-sidebar-extension.c	Sat Oct 18 12:27:13 2008
@@ -39,17 +39,7 @@
 #include "ephy-gui.h"
 #include "ephy-debug.h"
 
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: branches/gnome-2-24/extensions/sidebar/ephy-sidebar.c
==============================================================================
--- branches/gnome-2-24/extensions/sidebar/ephy-sidebar.c	(original)
+++ branches/gnome-2-24/extensions/sidebar/ephy-sidebar.c	Sat Oct 18 12:27:13 2008
@@ -22,16 +22,7 @@
 
 #include "ephy-sidebar.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkpaned.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmarshal.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 #include <glib/gi18n-lib.h>

Modified: branches/gnome-2-24/extensions/sidebar/ephy-sidebar.h
==============================================================================
--- branches/gnome-2-24/extensions/sidebar/ephy-sidebar.h	(original)
+++ branches/gnome-2-24/extensions/sidebar/ephy-sidebar.h	Sat Oct 18 12:27:13 2008
@@ -22,7 +22,7 @@
 #define EPHY_SIDEBAR_H
 
 #include <glib-object.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 	
 G_BEGIN_DECLS
 

Modified: branches/gnome-2-24/extensions/sidebar/sidebar-commands.c
==============================================================================
--- branches/gnome-2-24/extensions/sidebar/sidebar-commands.c	(original)
+++ branches/gnome-2-24/extensions/sidebar/sidebar-commands.c	Sat Oct 18 12:27:13 2008
@@ -29,7 +29,7 @@
 
 #include "ephy-prefs.h"
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 /* NOTE: we include gi18n.h instead of gi18n-lib.h since all string here
  * are the same as in epiphany. If that ever changes, fix this include!

Modified: branches/gnome-2-24/extensions/sidebar/sidebar-commands.h
==============================================================================
--- branches/gnome-2-24/extensions/sidebar/sidebar-commands.h	(original)
+++ branches/gnome-2-24/extensions/sidebar/sidebar-commands.h	Sat Oct 18 12:27:13 2008
@@ -21,7 +21,7 @@
 #ifndef SIDEBAR_COMMANDS_H
 #define SIDEBAR_COMMANDS_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #include "ephy-sidebar-embed.h"
 

Modified: branches/gnome-2-24/extensions/smart-bookmarks/smart-bookmarks-extension.c
==============================================================================
--- branches/gnome-2-24/extensions/smart-bookmarks/smart-bookmarks-extension.c	(original)
+++ branches/gnome-2-24/extensions/smart-bookmarks/smart-bookmarks-extension.c	Sat Oct 18 12:27:13 2008
@@ -36,11 +36,7 @@
 #include "ephy-debug.h"
 
 #include <gmodule.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: branches/gnome-2-24/extensions/tab-groups/ephy-tab-grouper.h
==============================================================================
--- branches/gnome-2-24/extensions/tab-groups/ephy-tab-grouper.h	(original)
+++ branches/gnome-2-24/extensions/tab-groups/ephy-tab-grouper.h	Sat Oct 18 12:27:13 2008
@@ -24,7 +24,7 @@
 #define EPHY_TAB_GROUPER_H
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gmodule.h>
 
 G_BEGIN_DECLS

Modified: branches/gnome-2-24/extensions/tab-states/ephy-tab-states-extension.c
==============================================================================
--- branches/gnome-2-24/extensions/tab-states/ephy-tab-states-extension.c	(original)
+++ branches/gnome-2-24/extensions/tab-states/ephy-tab-states-extension.c	Sat Oct 18 12:27:13 2008
@@ -29,9 +29,7 @@
 #include "ephy-debug.h"
 
 #include <gmodule.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
 #define EPHY_TAB_STATES_EXTENSION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TAB_STATES_EXTENSION, EphyTabStatesExtensionPrivate))

Modified: branches/gnome-2-24/include/EphyUtils.h
==============================================================================
--- branches/gnome-2-24/include/EphyUtils.h	(original)
+++ branches/gnome-2-24/include/EphyUtils.h	Sat Oct 18 12:27:13 2008
@@ -28,7 +28,7 @@
 
 #include <nscore.h>
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 class nsACString;
 class nsAString;

Modified: branches/gnome-2-24/include/ephy-dnd.h
==============================================================================
--- branches/gnome-2-24/include/ephy-dnd.h	(original)
+++ branches/gnome-2-24/include/ephy-dnd.h	Sat Oct 18 12:27:13 2008
@@ -22,8 +22,7 @@
 #define EPHY_DND_H
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: branches/gnome-2-24/include/ephy-file-chooser.h
==============================================================================
--- branches/gnome-2-24/include/ephy-file-chooser.h	(original)
+++ branches/gnome-2-24/include/ephy-file-chooser.h	Sat Oct 18 12:27:13 2008
@@ -23,9 +23,7 @@
 
 #include <glib-object.h>
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkfilefilter.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: branches/gnome-2-24/include/ephy-file-helpers.h
==============================================================================
--- branches/gnome-2-24/include/ephy-file-helpers.h	(original)
+++ branches/gnome-2-24/include/ephy-file-helpers.h	Sat Oct 18 12:27:13 2008
@@ -25,7 +25,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)

Modified: branches/gnome-2-24/include/ephy-gui.h
==============================================================================
--- branches/gnome-2-24/include/ephy-gui.h	(original)
+++ branches/gnome-2-24/include/ephy-gui.h	Sat Oct 18 12:27:13 2008
@@ -21,10 +21,7 @@
 #ifndef EPHY_GUI_H
 #define EPHY_GUI_H
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkkeysyms.h>