Index: gui/user-switch-applet/gdm-entry-menu-item.h
===================================================================
--- gui/user-switch-applet/gdm-entry-menu-item.h	(revision 6598)
+++ gui/user-switch-applet/gdm-entry-menu-item.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __GDM_ENTRY_MENU_ITEM__
 #define __GDM_ENTRY_MENU_ITEM__
 
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gui/simple-greeter/gdm-option-widget.h
===================================================================
--- gui/simple-greeter/gdm-option-widget.h	(revision 6598)
+++ gui/simple-greeter/gdm-option-widget.h	(working copy)
@@ -25,7 +25,7 @@
 #define __GDM_OPTION_WIDGET_H
 
 #include <glib-object.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gui/simple-greeter/gdm-cell-renderer-timer.h
===================================================================
--- gui/simple-greeter/gdm-cell-renderer-timer.h	(revision 6598)
+++ gui/simple-greeter/gdm-cell-renderer-timer.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef __GDM_CELL_RENDERER_TIMER_H
 #define __GDM_CELL_RENDERER_TIMER_H
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gui/simple-greeter/gdm-layout-chooser-dialog.h
===================================================================
--- gui/simple-greeter/gdm-layout-chooser-dialog.h	(revision 6598)
+++ gui/simple-greeter/gdm-layout-chooser-dialog.h	(working copy)
@@ -22,7 +22,7 @@
 #define __GDM_LAYOUT_CHOOSER_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gui/simple-greeter/gdm-user-chooser-dialog.h
===================================================================
--- gui/simple-greeter/gdm-user-chooser-dialog.h	(revision 6598)
+++ gui/simple-greeter/gdm-user-chooser-dialog.h	(working copy)
@@ -22,7 +22,7 @@
 #define __GDM_USER_CHOOSER_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gui/simple-greeter/libnotificationarea/na-tray.h
===================================================================
--- gui/simple-greeter/libnotificationarea/na-tray.h	(revision 6598)
+++ gui/simple-greeter/libnotificationarea/na-tray.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef __NA_TRAY_H__
 #define __NA_TRAY_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
Index: gui/simple-greeter/libnotificationarea/na-tray-manager.c
===================================================================
--- gui/simple-greeter/libnotificationarea/na-tray-manager.c	(revision 6598)
+++ gui/simple-greeter/libnotificationarea/na-tray-manager.c	(working copy)
@@ -34,9 +34,7 @@
 #elif defined (GDK_WINDOWING_WIN32)
 #include <gdk/gdkwin32.h>
 #endif
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include "na-marshal.h"
 
Index: gui/simple-greeter/libnotificationarea/obox.c
===================================================================
--- gui/simple-greeter/libnotificationarea/obox.c	(revision 6598)
+++ gui/simple-greeter/libnotificationarea/obox.c	(working copy)
@@ -27,8 +27,7 @@
 
 #include "obox.h"
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 static void na_obox_size_request  (GtkWidget       *widget,
 				   GtkRequisition  *requisition);
Index: gui/simple-greeter/libnotificationarea/na-tray-manager.h
===================================================================
--- gui/simple-greeter/libnotificationarea/na-tray-manager.h	(revision 6598)
+++ gui/simple-greeter/libnotificationarea/na-tray-manager.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef __NA_TRAY_MANAGER_H__
 #define __NA_TRAY_MANAGER_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
Index: gui/simple-greeter/libnotificationarea/obox.h
===================================================================
--- gui/simple-greeter/libnotificationarea/obox.h	(revision 6598)
+++ gui/simple-greeter/libnotificationarea/obox.h	(working copy)
@@ -28,7 +28,7 @@
 #ifndef __NA_OBOX_H__
 #define __NA_OBOX_H__
 
-#include <gtk/gtkbox.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
Index: gui/simple-greeter/gdm-user.h
===================================================================
--- gui/simple-greeter/gdm-user.h	(revision 6598)
+++ gui/simple-greeter/gdm-user.h	(working copy)
@@ -26,7 +26,7 @@
 #define __GDM_USER__ 1
 
 #include <sys/types.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS
Index: gui/simple-greeter/gdm-language-chooser-dialog.h
===================================================================
--- gui/simple-greeter/gdm-language-chooser-dialog.h	(revision 6598)
+++ gui/simple-greeter/gdm-language-chooser-dialog.h	(working copy)
@@ -22,7 +22,7 @@
 #define __GDM_LANGUAGE_CHOOSER_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gui/simple-greeter/gdm-chooser-widget.h
===================================================================
--- gui/simple-greeter/gdm-chooser-widget.h	(revision 6598)
+++ gui/simple-greeter/gdm-chooser-widget.h	(working copy)
@@ -23,7 +23,7 @@
 #define __GDM_CHOOSER_WIDGET_H
 
 #include <glib-object.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gui/simple-chooser/gdm-host-chooser-dialog.h
===================================================================
--- gui/simple-chooser/gdm-host-chooser-dialog.h	(revision 6598)
+++ gui/simple-chooser/gdm-host-chooser-dialog.h	(working copy)
@@ -22,7 +22,7 @@
 #define __GDM_HOST_CHOOSER_DIALOG_H
 
 #include <glib-object.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "gdm-chooser-host.h"
 
 G_BEGIN_DECLS
Index: gui/simple-chooser/gdm-host-chooser-widget.h
===================================================================
--- gui/simple-chooser/gdm-host-chooser-widget.h	(revision 6598)
+++ gui/simple-chooser/gdm-host-chooser-widget.h	(working copy)
@@ -22,7 +22,7 @@
 #define __GDM_HOST_CHOOSER_WIDGET_H
 
 #include <glib-object.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "gdm-chooser-host.h"
 
 G_BEGIN_DECLS
