GNOME Goal: Clean up GLib and GTK+ includes (Closes: #563865)

* src/gtkentryaction.c:
* src/gtkentryaction.h:
* src/yelp-bookmarks.c:
* src/yelp-bookmarks.h:
* src/yelp-main.c:
* src/yelp-print.h:
* src/yelp-settings.h:
* src/yelp-window.h:
GNOME Goal: Clean up GLib and GTK+ includes (Closes: #563865)

svn path=/trunk/; revision=3244

9 files changed, 19 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 207f54da..a212a22a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-08  Pedro Fragoso  <ember@ubuntu.com>
+
+	* src/gtkentryaction.c:
+	* src/gtkentryaction.h:
+	* src/yelp-bookmarks.c:
+	* src/yelp-bookmarks.h:
+	* src/yelp-main.c:
+	* src/yelp-print.h:
+	* src/yelp-settings.h:
+	* src/yelp-window.h:
+	GNOME Goal: Clean up GLib and GTK+ includes (Closes: #563865)
+
 2009-03-16  Shaun McCance  <shaunm@gnome.org>
 
 	* configure.in:
diff --git a/src/gtkentryaction.c b/src/gtkentryaction.c
index cfb8b692..25378762 100644
--- a/src/gtkentryaction.c
+++ b/src/gtkentryaction.c
@@ -23,10 +23,7 @@
 
 #include "gtkentryaction.h"
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #define GTK_ENTRY_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_TYPE_ENTRY_ACTION, GtkEntryActionPrivate))
 
diff --git a/src/gtkentryaction.h b/src/gtkentryaction.h
index 05e5d083..413fea60 100644
--- a/src/gtkentryaction.h
+++ b/src/gtkentryaction.h
@@ -21,7 +21,7 @@
 #ifndef GTK_ENTRY_ACTION_H
 #define GTK_ENTRY_ACTION_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/yelp-bookmarks.c b/src/yelp-bookmarks.c
index aec00d6b..b492faf8 100644
--- a/src/yelp-bookmarks.c
+++ b/src/yelp-bookmarks.c
@@ -30,9 +30,7 @@
 #include "yelp-debug.h"
 
 #include <string.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glade/glade.h>
 #include <libxml/parser.h>
diff --git a/src/yelp-bookmarks.h b/src/yelp-bookmarks.h
index a2437d9b..e3d73b7f 100644
--- a/src/yelp-bookmarks.h
+++ b/src/yelp-bookmarks.h
@@ -24,7 +24,7 @@
 #define __YELP_BOOKMARKS_H__
 
 #include <glib.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "yelp-window.h"
 
diff --git a/src/yelp-main.c b/src/yelp-main.c
index 05b998d1..88cae7d4 100644
--- a/src/yelp-main.c
+++ b/src/yelp-main.c
@@ -25,8 +25,7 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
diff --git a/src/yelp-print.h b/src/yelp-print.h
index 914c43e5..c85848c0 100644
--- a/src/yelp-print.h
+++ b/src/yelp-print.h
@@ -27,7 +27,7 @@
 
 /* Needed to fill the struct */
 #include <gtk/gtkprinter.h>
-#include <gtk/gtkprintsettings.h>
+#include <gtk/gtk.h>
 
 #include "yelp-window.h"
 
diff --git a/src/yelp-settings.h b/src/yelp-settings.h
index 9c9cb508..f4ab97af 100644
--- a/src/yelp-settings.h
+++ b/src/yelp-settings.h
@@ -24,7 +24,7 @@
 #define __YELP_SETTINGS_H__
 
 #include <glib.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/yelp-window.h b/src/yelp-window.h
index 5725d482..dc4929d6 100644
--- a/src/yelp-window.h
+++ b/src/yelp-window.h
@@ -23,8 +23,6 @@
 #ifndef __YELP_WINDOW_H__
 #define __YELP_WINDOW_H__
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkwindow.h>
 #include <gtk/gtk.h>
 
 #include "yelp-base.h"