Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2250)
+++ ChangeLog	(working copy)
@@ -1,3 +1,16 @@
+2008-12-12  Przemysław Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+	* Tomboy/Addins/PrintNotes/gtksourceprintjob.h:
+	* Tomboy/Addins/PrintNotes/gtksourceprintjob.c:
+	* Tomboy/Addins/PrintNotes/gedit-print.h:
+	* Tomboy/Addins/PrintNotes/gedit-print.c:
+	* libtomboy/tomboyutil.h:
+	* libtomboy/tomboyutil.c:
+	* libtomboy/tomboykeybinder.h:
+	* libtomboy/tomboykeybinder.c:
+	* libtomboy/eggaccelerators.h: Cleaned up gtk and glib includes
+	to use only toplevel headers. Bug #564235
+
 2008-12-01  Sandy Armstrong  <sanfordarmstrong@gmail.com>
 
 	* configure.in:
Index: libtomboy/eggaccelerators.h
===================================================================
--- libtomboy/eggaccelerators.h	(revision 2250)
+++ libtomboy/eggaccelerators.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __EGG_ACCELERATORS_H__
 #define __EGG_ACCELERATORS_H__
 
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
Index: libtomboy/tomboykeybinder.c
===================================================================
--- libtomboy/tomboykeybinder.c	(revision 2250)
+++ libtomboy/tomboykeybinder.c	(working copy)
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include <gdk/gdk.h>
-#include <gdk/gdkwindow.h>
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 
Index: libtomboy/tomboyutil.c
===================================================================
--- libtomboy/tomboyutil.c	(revision 2250)
+++ libtomboy/tomboyutil.c	(working copy)
@@ -22,7 +22,6 @@
  */
 
 #include <gdk/gdk.h>
-#include <gdk/gdkwindow.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <X11/Xlib.h>
Index: libtomboy/tomboykeybinder.h
===================================================================
--- libtomboy/tomboykeybinder.h	(revision 2250)
+++ libtomboy/tomboykeybinder.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef __TOMBOY_KEY_BINDER_H__
 #define __TOMBOY_KEY_BINDER_H__
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libtomboy/tomboyutil.h
===================================================================
--- libtomboy/tomboyutil.h	(revision 2250)
+++ libtomboy/tomboyutil.h	(working copy)
@@ -23,9 +23,8 @@
 #ifndef __TOMBOY_UTIL_H__
 #define __TOMBOY_UTIL_H__
 
-#include <gdk/gdkpixmap.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: Tomboy/Addins/PrintNotes/gtksourceprintjob.c
===================================================================
--- Tomboy/Addins/PrintNotes/gtksourceprintjob.c	(revision 2250)
+++ Tomboy/Addins/PrintNotes/gtksourceprintjob.c	(working copy)
@@ -36,8 +36,6 @@
 #include "gtksourceprintjob.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktextview.h>
 #include <libgnomeprint/gnome-print-pango.h>
 
 #ifdef ENABLE_PROFILE
Index: Tomboy/Addins/PrintNotes/gtksourceprintjob.h
===================================================================
--- Tomboy/Addins/PrintNotes/gtksourceprintjob.h	(revision 2250)
+++ Tomboy/Addins/PrintNotes/gtksourceprintjob.h	(working copy)
@@ -26,7 +26,7 @@
 
 #include <libgnomeprint/gnome-print-config.h>
 #include <libgnomeprint/gnome-print-job.h>
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 //#include <gtksourceview/gtksourceview.h>
 
 G_BEGIN_DECLS
Index: Tomboy/Addins/PrintNotes/gedit-print.c
===================================================================
--- Tomboy/Addins/PrintNotes/gedit-print.c	(revision 2250)
+++ Tomboy/Addins/PrintNotes/gedit-print.c	(working copy)
@@ -39,14 +39,6 @@
 #include <string.h>	/* For strlen */
 
 #include <glib/gi18n.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwindow.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-job-preview.h>
 
Index: Tomboy/Addins/PrintNotes/gedit-print.h
===================================================================
--- Tomboy/Addins/PrintNotes/gedit-print.h	(revision 2250)
+++ Tomboy/Addins/PrintNotes/gedit-print.h	(working copy)
@@ -30,7 +30,7 @@
 #ifndef __GEDIT_PRINT_H__
 #define __GEDIT_PRINT_H__
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 void gedit_print 		(GtkTextView* view);
 void gedit_print_preview	(GtkTextView* view);
