Index: doc/libgnomeprintui.prerequisites
===================================================================
--- doc/libgnomeprintui.prerequisites	(revision 2702)
+++ doc/libgnomeprintui.prerequisites	(working copy)
@@ -0,0 +1 @@
+GIcon GObject
Index: libgnomeprintui/gnome-font-dialog.h
===================================================================
--- libgnomeprintui/gnome-font-dialog.h	(revision 2702)
+++ libgnomeprintui/gnome-font-dialog.h	(working copy)
@@ -63,7 +63,7 @@
 typedef struct _GnomeFontDialog      GnomeFontDialog;
 typedef struct _GnomeFontDialogClass GnomeFontDialogClass;
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libgnomeprint/gnome-font.h>
 
 /*
Index: libgnomeprintui/gnome-print-content-selector.c
===================================================================
--- libgnomeprintui/gnome-print-content-selector.c	(revision 2702)
+++ libgnomeprintui/gnome-print-content-selector.c	(working copy)
@@ -30,15 +30,6 @@
 #include <libgnomeprint/gnome-print-config.h>
 #include <libgnomeprint/gnome-print-filter.h>
 
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcheckbutton.h>
-
 #include <gdk/gdkkeysyms.h>
 
 #include <string.h>
Index: libgnomeprintui/gnome-print-job-preview.c
===================================================================
--- libgnomeprintui/gnome-print-job-preview.c	(revision 2702)
+++ libgnomeprintui/gnome-print-job-preview.c	(working copy)
@@ -34,7 +34,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkaction.h>
 
 #include <libgnomeprint/private/gnome-print-private.h>
 #include <libgnomeprint/gnome-print-meta.h>
Index: libgnomeprintui/gnome-print-page-selector.c
===================================================================
--- libgnomeprintui/gnome-print-page-selector.c	(revision 2702)
+++ libgnomeprintui/gnome-print-page-selector.c	(working copy)
@@ -35,14 +35,7 @@
 #include <libgnomeprint/private/gnome-print-private.h>
 #include <libgnomeprint/private/gnome-print-config-private.h>
 
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 
 #include <gdk/gdkkeysyms.h>
 
Index: libgnomeprintui/gnome-print-layout-selector.c
===================================================================
--- libgnomeprintui/gnome-print-layout-selector.c	(revision 2702)
+++ libgnomeprintui/gnome-print-layout-selector.c	(working copy)
@@ -33,12 +33,7 @@
 
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include <string.h>
 #include <math.h>
Index: libgnomeprintui/gnome-print-content-selector.h
===================================================================
--- libgnomeprintui/gnome-print-content-selector.h	(revision 2702)
+++ libgnomeprintui/gnome-print-content-selector.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef __GNOME_PRINT_CONTENT_SELECTOR_H__
 #define __GNOME_PRINT_CONTENT_SELECTOR_H__
 
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: libgnomeprintui/gnome-print-job-preview.h
===================================================================
--- libgnomeprintui/gnome-print-job-preview.h	(revision 2702)
+++ libgnomeprintui/gnome-print-job-preview.h	(working copy)
@@ -40,7 +40,7 @@
 typedef struct _GnomePrintJobPreview      GnomePrintJobPreview;
 typedef struct _GnomePrintJobPreviewClass GnomePrintJobPreviewClass;
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnomeprint/gnome-print-job.h>
 #include <libgnomeprintui/gnome-print-preview.h>
 
Index: libgnomeprintui/gpaui/gpa-widget.h
===================================================================
--- libgnomeprintui/gpaui/gpa-widget.h	(revision 2702)
+++ libgnomeprintui/gpaui/gpa-widget.h	(working copy)
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 #include <libgnomeprint/gnome-print-config.h>
 #include <libgnomeprint/private/gpa-node.h>
 
Index: libgnomeprintui/gnome-print-copies.h
===================================================================
--- libgnomeprintui/gnome-print-copies.h	(revision 2702)
+++ libgnomeprintui/gnome-print-copies.h	(working copy)
@@ -42,7 +42,7 @@
 typedef struct _GnomePrintCopiesSelector      GnomePrintCopiesSelector;
 typedef struct _GnomePrintCopiesSelectorClass GnomePrintCopiesSelectorClass;
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 /*
  * We implement a single signal at moment:
Index: libgnomeprintui/gnome-print-widget.h
===================================================================
--- libgnomeprintui/gnome-print-widget.h	(revision 2702)
+++ libgnomeprintui/gnome-print-widget.h	(working copy)
@@ -31,7 +31,7 @@
 G_BEGIN_DECLS
 
 #include <libgnomeprint/gnome-print-config.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef enum {
 	   GNOME_PRINT_WIDGET_CHECKBUTTON
