Index: gnome-cups-manager/gnome-printer-list.c
===================================================================
--- gnome-cups-manager/gnome-printer-list.c	(revision 582)
+++ gnome-cups-manager/gnome-printer-list.c	(working copy)
@@ -29,11 +29,7 @@
 #include "printer-properties.h"
 #include "view-queue.h"
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
Index: gnome-cups-manager/gnome-cups-icon.c
===================================================================
--- gnome-cups-manager/gnome-cups-icon.c	(revision 582)
+++ gnome-cups-manager/gnome-cups-icon.c	(working copy)
@@ -7,8 +7,7 @@
 #include <bonobo/bonobo-listener.h>
 #include <bonobo/bonobo-main.h>
 #include <glade/glade.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-client.h>
 #include <libgnomeui/gnome-ui-init.h>
Index: gnome-cups-manager/eggiconlist.c
===================================================================
--- gnome-cups-manager/eggiconlist.c	(revision 582)
+++ gnome-cups-manager/eggiconlist.c	(working copy)
@@ -21,10 +21,6 @@
 
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
 
 #include "eggintl.h"
 #include "eggmarshalers.h"
Index: gnome-cups-manager/eggiconlist.h
===================================================================
--- gnome-cups-manager/eggiconlist.h	(revision 582)
+++ gnome-cups-manager/eggiconlist.h	(working copy)
@@ -19,7 +19,7 @@
 #ifndef __EGG_ICON_LIST_H__
 #define __EGG_ICON_LIST_H__
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gnome-cups-manager/printer-properties.c
===================================================================
--- gnome-cups-manager/printer-properties.c	(revision 582)
+++ gnome-cups-manager/printer-properties.c	(working copy)
@@ -7,24 +7,7 @@
 #include <cups/http.h>
 #include <cups/ipp.h>
 
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-icon-theme.h>
@@ -39,7 +22,6 @@
 #include <libgnomecups/gnome-cups-ui-connection.h>
 #include <libgnomecups/gnome-cups-permission.h>
 
-#include <gtk/gtkaccessible.h>
 #include <cups/cups.h>
 
 static void
Index: gnome-cups-manager/view-printers.c
===================================================================
--- gnome-cups-manager/view-printers.c	(revision 582)
+++ gnome-cups-manager/view-printers.c	(working copy)
@@ -28,8 +28,7 @@
 #include "printer-properties.h"
 
 #include <glade/glade.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <libgnomecups/gnome-cups-util.h>
 #include <libgnomecups/gnome-cups-ui-init.h>
 #include <libgnomecups/gnome-cups-printer.h>
Index: gnome-cups-manager/tray.c
===================================================================
--- gnome-cups-manager/tray.c	(revision 582)
+++ gnome-cups-manager/tray.c	(working copy)
@@ -8,15 +8,7 @@
 
 #include "eggtrayicon.h"
 
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <libgnomecups/gnome-cups-printer.h>
Index: gnome-cups-manager/eggtrayicon.h
===================================================================
--- gnome-cups-manager/eggtrayicon.h	(revision 582)
+++ gnome-cups-manager/eggtrayicon.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef __EGG_TRAY_ICON_H__
 #define __EGG_TRAY_ICON_H__
 
-#include <gtk/gtkplug.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 G_BEGIN_DECLS
Index: gnome-cups-manager/gnome-cups-manager.c
===================================================================
--- gnome-cups-manager/gnome-cups-manager.c	(revision 582)
+++ gnome-cups-manager/gnome-cups-manager.c	(working copy)
@@ -35,8 +35,7 @@
 #include <bonobo/bonobo-listener.h>
 #include <bonobo/bonobo-main.h>
 #include <glade/glade.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-client.h>
 #include <libgnomeui/gnome-ui-init.h>
Index: gnome-cups-manager/view-queue.c
===================================================================
--- gnome-cups-manager/view-queue.c	(revision 582)
+++ gnome-cups-manager/view-queue.c	(working copy)
@@ -6,18 +6,7 @@
 #include <cups/http.h>
 #include <cups/ipp.h>
 
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <libgnome/gnome-i18n.h>
 
Index: libgnomecups/gnome-cups-ui-init.h
===================================================================
--- libgnomecups/gnome-cups-ui-init.h	(revision 582)
+++ libgnomecups/gnome-cups-ui-init.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef GNOME_CUPS_UI_INIT
 #define GNOME_CUPS_UI_INIT
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libgnomecups/gnome-cups-permission.c
===================================================================
--- libgnomecups/gnome-cups-permission.c	(revision 582)
+++ libgnomecups/gnome-cups-permission.c	(working copy)
@@ -23,7 +23,6 @@
 #include <config.h>
 
 #include "gnome-cups-permission.h"
-#include <gtk/gtkmessagedialog.h>
 #include <glib/gi18n.h>
 #include <unistd.h>
 #include <sys/types.h>
Index: libgnomecups/gnome-cups-ui-util.c
===================================================================
--- libgnomecups/gnome-cups-ui-util.c	(revision 582)
+++ libgnomecups/gnome-cups-ui-util.c	(working copy)
@@ -9,11 +9,6 @@
 #include <libgnomecups/gnome-cups-ui-print.h>
 
 #include <glade/glade.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcombobox.h>
 
 #include <glib/gi18n.h>
 #include <cups/cups.h>
Index: libgnomecups/gnome-cups-ui-util.h
===================================================================
--- libgnomecups/gnome-cups-ui-util.h	(revision 582)
+++ libgnomecups/gnome-cups-ui-util.h	(working copy)
@@ -4,7 +4,7 @@
 #include <glib.h>
 #include <glade/glade.h>
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnomecups/gnome-cups-printer.h>
 
 void gnome_cups_error_dialog (GtkWindow *window, 
Index: libgnomecups/gnome-cups-permission.h
===================================================================
--- libgnomecups/gnome-cups-permission.h	(revision 582)
+++ libgnomecups/gnome-cups-permission.h	(working copy)
@@ -2,7 +2,7 @@
 #ifndef GNOME_CUPS_PERMISSION_H
 #define GNOME_CUPS_PERMISSION_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: libgnomecups/gnome-cups-ui-driver.c
===================================================================
--- libgnomecups/gnome-cups-ui-driver.c	(revision 582)
+++ libgnomecups/gnome-cups-ui-driver.c	(working copy)
@@ -27,25 +27,8 @@
 #include "gnome-cups-ui-driver.h"
 #include "gnome-cups-ui-util.h"
 #include <libgnomecups/gnome-cups-request.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkfilefilter.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtklabel.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
-#include <glib/gstrfuncs.h>
 #include <stdio.h>
 #include <errno.h>
 
Index: libgnomecups/gnome-cups-ui-print.c
===================================================================
--- libgnomecups/gnome-cups-ui-print.c	(revision 582)
+++ libgnomecups/gnome-cups-ui-print.c	(working copy)
@@ -1,5 +1,5 @@
 #include "config.h"
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #include <libgnomecups/gnome-cups-init.h>
 #include <libgnomecups/gnome-cups-printer.h>
Index: libgnomecups/gnome-cups-ui-connection.c
===================================================================
--- libgnomecups/gnome-cups-ui-connection.c	(revision 582)
+++ libgnomecups/gnome-cups-ui-connection.c	(working copy)
@@ -26,16 +26,6 @@
 #include "gnome-cups-ui-util.h"
 #include <libgnomecups/gnome-cups-request.h>
 #include <libgnomecups/gnome-cups-util.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktogglebutton.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 #include <ctype.h>
Index: libgnomecups/gnome-cups-ui-driver.h
===================================================================
--- libgnomecups/gnome-cups-ui-driver.h	(revision 582)
+++ libgnomecups/gnome-cups-ui-driver.h	(working copy)
@@ -2,7 +2,7 @@
 #ifndef GNOME_CUPS_UI_DRIVER_H
 #define GNOME_CUPS_UI_DRIVER_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: libgnomecups/gnome-cups-ui-print.h
===================================================================
--- libgnomecups/gnome-cups-ui-print.h	(revision 582)
+++ libgnomecups/gnome-cups-ui-print.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef GNOME_CUPS_UI_PRINT
 #define GNOME_CUPS_UI_PRINT
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgnomecups/gnome-cups-printer.h>
 
 G_BEGIN_DECLS
Index: libgnomecups/gnome-cups-ui-init.c
===================================================================
--- libgnomecups/gnome-cups-ui-init.c	(revision 582)
+++ libgnomecups/gnome-cups-ui-init.c	(working copy)
@@ -5,12 +5,7 @@
 #include "gnome-cups-permission.h"
 #include "gnome-cups-i18n.h"
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksizegroup.h>
+#include <gtk/gtk.h>
 
 static gboolean initialized = FALSE;
 
Index: libgnomecups/gnome-cups-ui-connection.h
===================================================================
--- libgnomecups/gnome-cups-ui-connection.h	(revision 582)
+++ libgnomecups/gnome-cups-ui-connection.h	(working copy)
@@ -2,7 +2,7 @@
 #ifndef GNOME_CUPS_UI_CONNECTION_H
 #define GNOME_CUPS_UI_CONNECTION_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: libgnomecups/gnome-cups-i18n.c
===================================================================
--- libgnomecups/gnome-cups-i18n.c	(revision 582)
+++ libgnomecups/gnome-cups-i18n.c	(working copy)
@@ -1,5 +1,4 @@
 #include <config.h>
-#include <glib/gmacros.h>
 #include "gnome-cups-i18n.h"
 
 #ifdef ENABLE_NLS
Index: gnome-cups-add/druid-helper.c
===================================================================
--- gnome-cups-add/druid-helper.c	(revision 582)
+++ gnome-cups-add/druid-helper.c	(working copy)
@@ -4,11 +4,7 @@
 #include <string.h>
 #include <libgnomecups/gnome-cups-ui-driver.h>
 
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-druid.h>
Index: gnome-cups-add/add-printer.c
===================================================================
--- gnome-cups-add/add-printer.c	(revision 582)
+++ gnome-cups-add/add-printer.c	(working copy)
@@ -8,10 +8,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-druid.h>
