Index: ChangeLog
===================================================================
--- ChangeLog	(revision 6600)
+++ ChangeLog	(working copy)
@@ -1,3 +1,32 @@
+2008-11-04  Joe M Smith    <yasumoto7@gmail.com>
+
+	* gedit/gedit-plugin-info.c:
+	* gedit/gedit-utils.c:
+	* gedit/gedit.c:
+	* gedit/gedit-utils.h:
+	* gedit/dialogs/gedit-encodings-dialog.c:
+	* gedit/dialogs/gedit-encodings-dialog.h:
+	* gedit/dialogs/gedit-close-confirmation-dialog.h:
+	* gedit/gedit-gio-document-saver.c:
+	* gedit/gedit-notebook.c:
+	* gedit/gedit-file-chooser-dialog.h:
+	* gedit/gedit-notebook.h:
+	* gedit/sexy-icon-entry.h:
+	* gedit/gedit-spinner.c:
+	* gedit/gedit-print-preview.h:
+	* gedit/gedit-spinner.h:
+	* gedit/gedit-encodings-option-menu.h:
+	* gedit/gedit-help.c:
+	* gedit/gedit-prefs-manager.h:
+	* gedit/gedit-help.h:
+	* gedit/gedit-message-area.h:
+	* gedit/gedit-commands.h:
+	* gedit/gedittextregion.h:
+
+	Comply with the GTK Includes GNOME Goal to only have the toplevel
+	includes for GLib, GDK, GDK Pixbuf, and GTK. Bug #559233.
+
+
 2008-11-03  Paolo Borelli  <pborelli@katamail.com>
 
 	* gedit/gedit-print-job.c: also get the adjustement from the gtkbuilder
Index: gedit/gedit-statusbar.h
===================================================================
--- gedit/gedit-statusbar.h	(revision 6600)
+++ gedit/gedit-statusbar.h	(working copy)
@@ -29,7 +29,7 @@
 #ifndef GEDIT_STATUSBAR_H
 #define GEDIT_STATUSBAR_H
 
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 #include <gedit/gedit-window.h>
 
 G_BEGIN_DECLS
Index: gedit/gedit-plugin-info.c
===================================================================
--- gedit/gedit-plugin-info.c	(revision 6600)
+++ gedit/gedit-plugin-info.c	(working copy)
@@ -35,7 +35,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <glib/gkeyfile.h>
+#include <glib.h>
 
 #include "gedit-plugin-info.h"
 #include "gedit-plugin-info-priv.h"
Index: gedit/gedit-utils.c
===================================================================
--- gedit/gedit-utils.c	(revision 6600)
+++ gedit/gedit-utils.c	(working copy)
@@ -41,7 +41,7 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include <glib/gunicode.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
Index: gedit/gedit.c
===================================================================
--- gedit/gedit.c	(revision 6600)
+++ gedit/gedit.c	(working copy)
@@ -38,7 +38,7 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <glib/goption.h>
+#include <glib.h>
 #include <gdk/gdkx.h>
 
 #include "gedit-app.h"
Index: gedit/gedit-utils.h
===================================================================
--- gedit/gedit-utils.h	(revision 6600)
+++ gedit/gedit-utils.h	(working copy)
@@ -34,11 +34,7 @@
 #define __GEDIT_UTILS_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktextiter.h>
+#include <gtk/gtk.h>
 #include <atk/atk.h>
 #include <gedit/gedit-encodings.h>
 
Index: gedit/dialogs/gedit-encodings-dialog.c
===================================================================
--- gedit/dialogs/gedit-encodings-dialog.c	(revision 6600)
+++ gedit/dialogs/gedit-encodings-dialog.c	(working copy)
@@ -34,7 +34,7 @@
 
 #include <string.h>
 
-#include <glib/gslist.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
Index: gedit/dialogs/gedit-encodings-dialog.h
===================================================================
--- gedit/dialogs/gedit-encodings-dialog.h	(revision 6600)
+++ gedit/dialogs/gedit-encodings-dialog.h	(working copy)
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_ENCODINGS_DIALOG_H__
 #define __GEDIT_ENCODINGS_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gedit/dialogs/gedit-close-confirmation-dialog.h
===================================================================
--- gedit/dialogs/gedit-close-confirmation-dialog.h	(revision 6600)
+++ gedit/dialogs/gedit-close-confirmation-dialog.h	(working copy)
@@ -30,8 +30,7 @@
 #define __GEDIT_CLOSE_CONFIRMATION_DIALOG_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include <gedit/gedit-document.h>
 
Index: gedit/gedit-gio-document-saver.c
===================================================================
--- gedit/gedit-gio-document-saver.c	(revision 6600)
+++ gedit/gedit-gio-document-saver.c	(working copy)
@@ -33,7 +33,7 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <glib/gfileutils.h>
+#include <glib.h>
 #include <gio/gio.h>
 #include <string.h>
 
Index: gedit/gedit-notebook.c
===================================================================
--- gedit/gedit-notebook.c	(revision 6600)
+++ gedit/gedit-notebook.c	(working copy)
@@ -41,16 +41,7 @@
 
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include "gedit-notebook.h"
 #include "gedit-marshal.h"
Index: gedit/gedit-file-chooser-dialog.h
===================================================================
--- gedit/gedit-file-chooser-dialog.h	(revision 6600)
+++ gedit/gedit-file-chooser-dialog.h	(working copy)
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_FILE_CHOOSER_DIALOG_H__
 #define __GEDIT_FILE_CHOOSER_DIALOG_H__
 
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 
 #include <gedit/gedit-encodings.h>
 
Index: gedit/gedit-notebook.h
===================================================================
--- gedit/gedit-notebook.h	(revision 6600)
+++ gedit/gedit-notebook.h	(working copy)
@@ -41,7 +41,7 @@
 #include <gedit/gedit-tab.h>
 
 #include <glib.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gedit/sexy-icon-entry.h
===================================================================
--- gedit/sexy-icon-entry.h	(revision 6600)
+++ gedit/sexy-icon-entry.h	(working copy)
@@ -25,8 +25,7 @@
 typedef struct _SexyIconEntryClass SexyIconEntryClass;
 typedef struct _SexyIconEntryPriv  SexyIconEntryPriv;
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type())
 #define SEXY_ICON_ENTRY(obj) \
Index: gedit/gedit-spinner.c
===================================================================
--- gedit/gedit-spinner.c	(revision 6600)
+++ gedit/gedit-spinner.c	(working copy)
@@ -42,9 +42,7 @@
 #include "gedit-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 */
 
Index: gedit/gedit-print-preview.h
===================================================================
--- gedit/gedit-print-preview.h	(revision 6600)
+++ gedit/gedit-print-preview.h	(working copy)
@@ -31,8 +31,7 @@
 #ifndef __GEDIT_PRINT_PREVIEW_H__
 #define __GEDIT_PRINT_PREVIEW_H__
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gedit/gedit-spinner.h
===================================================================
--- gedit/gedit-spinner.h	(revision 6600)
+++ gedit/gedit-spinner.h	(working copy)
@@ -35,8 +35,7 @@
 #ifndef __GEDIT_SPINNER_H__
 #define __GEDIT_SPINNER_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gedit/gedit-encodings-option-menu.h
===================================================================
--- gedit/gedit-encodings-option-menu.h	(revision 6600)
+++ gedit/gedit-encodings-option-menu.h	(working copy)
@@ -32,7 +32,7 @@
 #ifndef __GEDIT_ENCODINGS_OPTION_MENU_H__
 #define __GEDIT_ENCODINGS_OPTION_MENU_H__
 
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
 #include <gedit/gedit-encodings.h>
 
 G_BEGIN_DECLS
Index: gedit/gedit-help.c
===================================================================
--- gedit/gedit-help.c	(revision 6600)
+++ gedit/gedit-help.c	(working copy)
@@ -35,7 +35,6 @@
 #include "gedit-help.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkmessagedialog.h>
 #include <string.h>
 #include <gtk/gtk.h>
 
Index: gedit/gedit-prefs-manager.h
===================================================================
--- gedit/gedit-prefs-manager.h	(revision 6600)
+++ gedit/gedit-prefs-manager.h	(working copy)
@@ -30,8 +30,8 @@
 #ifndef __GEDIT_PREFS_MANAGER_H__
 #define __GEDIT_PREFS_MANAGER_H__
 
-#include <gtk/gtkenums.h>
-#include <glib/gslist.h>
+#include <gtk/gtk.h>
+#include <glib.h>
 #include <gtksourceview/gtksourceview.h>
 #include "gedit-app.h"
 
Index: gedit/gedit-help.h
===================================================================
--- gedit/gedit-help.h	(revision 6600)
+++ gedit/gedit-help.h	(working copy)
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_HELP_H__
 #define __GEDIT_HELP_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gedit/gedit-message-area.h
===================================================================
--- gedit/gedit-message-area.h	(revision 6600)
+++ gedit/gedit-message-area.h	(working copy)
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_MESSAGE_AREA_H__
 #define __GEDIT_MESSAGE_AREA_H__
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gedit/gedit-commands.h
===================================================================
--- gedit/gedit-commands.h	(revision 6600)
+++ gedit/gedit-commands.h	(working copy)
@@ -34,7 +34,7 @@
 #ifndef __GEDIT_COMMANDS_H__
 #define __GEDIT_COMMANDS_H__
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 #include <gedit/gedit-window.h>
 
 G_BEGIN_DECLS
Index: gedit/gedittextregion.h
===================================================================
--- gedit/gedittextregion.h	(revision 6600)
+++ gedit/gedittextregion.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef __GEDIT_TEXT_REGION_H__
 #define __GEDIT_TEXT_REGION_H__
 
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
