Index: gnome-panel/panel-menu-bar.h
===================================================================
--- gnome-panel/panel-menu-bar.h	(revision 11356)
+++ gnome-panel/panel-menu-bar.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef __PANEL_MENU_BAR_H__
 #define __PANEL_MENU_BAR_H__
 
-#include <gtk/gtkmenubar.h>
+#include <gtk/gtk.h>
 #include "panel-widget.h"
 
 G_BEGIN_DECLS
Index: gnome-panel/panel-compatibility.h
===================================================================
--- gnome-panel/panel-compatibility.h	(revision 11356)
+++ gnome-panel/panel-compatibility.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef __PANEL_COMPATIBILITY_H__
 #define __PANEL_COMPATIBILITY_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gconf/gconf-client.h>
 
 G_BEGIN_DECLS
Index: gnome-panel/panel-applet-frame.h
===================================================================
--- gnome-panel/panel-applet-frame.h	(revision 11356)
+++ gnome-panel/panel-applet-frame.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef __PANEL_APPLET_FRAME_H__
 #define __PANEL_APPLET_FRAME_H__
 
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
 
 #include "panel-widget.h"
 #include "applet.h"
Index: gnome-panel/applet.h
===================================================================
--- gnome-panel/applet.h	(revision 11356)
+++ gnome-panel/applet.h	(working copy)
@@ -2,7 +2,7 @@
 #define APPLET_H
 
 #include <glib.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include "panel-widget.h"
 #include "panel-gconf.h"
 #include "panel-enums.h"
Index: gnome-panel/panel-bindings.h
===================================================================
--- gnome-panel/panel-bindings.h	(revision 11356)
+++ gnome-panel/panel-bindings.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef __PANEL_BINDINGS_H__
 #define __PANEL_BINDINGS_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
Index: gnome-panel/panel-profile.h
===================================================================
--- gnome-panel/panel-profile.h	(revision 11356)
+++ gnome-panel/panel-profile.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef __PANEL_PROFILE_H__
 #define __PANEL_PROFILE_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gdk/gdk.h>
 #include <gconf/gconf-client.h>
 
Index: gnome-panel/panel-action-protocol.h
===================================================================
--- gnome-panel/panel-action-protocol.h	(revision 11356)
+++ gnome-panel/panel-action-protocol.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef __PANEL_ACTION_PROTOCOL_H__
 #define __PANEL_ACTION_PROTOCOL_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: gnome-panel/panel-menu-items.h
===================================================================
--- gnome-panel/panel-menu-items.h	(revision 11356)
+++ gnome-panel/panel-menu-items.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef __PANEL_MENU_ITEMS_H__
 #define __PANEL_MENU_ITEMS_H__
 
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 #include "panel-widget.h"
 
 G_BEGIN_DECLS
Index: gnome-panel/panel-stock-icons.c
===================================================================
--- gnome-panel/panel-stock-icons.c	(revision 11356)
+++ gnome-panel/panel-stock-icons.c	(working copy)
@@ -26,8 +26,7 @@
 
 #include "panel-stock-icons.h"
 
-#include <gtk/gtkstock.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "panel-icon-names.h"
Index: gnome-panel/panel-enums.h
===================================================================
--- gnome-panel/panel-enums.h	(revision 11356)
+++ gnome-panel/panel-enums.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef __PANEL_ENUMS_H__
 #define __PANEL_ENUMS_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: gnome-panel/panel-xutils.h
===================================================================
--- gnome-panel/panel-xutils.h	(revision 11356)
+++ gnome-panel/panel-xutils.h	(working copy)
@@ -25,8 +25,7 @@
 #ifndef __PANEL_XUTILS_H__
 #define __PANEL_XUTILS_H__
 
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
Index: gnome-panel/panel-stock-icons.h
===================================================================
--- gnome-panel/panel-stock-icons.h	(revision 11356)
+++ gnome-panel/panel-stock-icons.h	(working copy)
@@ -25,8 +25,8 @@
 #ifndef __PANEL_STOCK_ICONS_H__
 #define __PANEL_STOCK_ICONS_H__
 
-#include <glib/gmacros.h>
-#include <gtk/gtkenums.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gnome-panel/panel-action-button.h
===================================================================
--- gnome-panel/panel-action-button.h	(revision 11356)
+++ gnome-panel/panel-action-button.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef __PANEL_ACTION_BUTTON_H__
 #define __PANEL_ACTION_BUTTON_H__
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include "button-widget.h"
 #include "panel-widget.h"
 #include "panel-enums.h"
Index: gnome-panel/panel-struts.h
===================================================================
--- gnome-panel/panel-struts.h	(revision 11356)
+++ gnome-panel/panel-struts.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef __PANEL_STRUTS_H__
 #define __PANEL_STRUTS_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include "panel-toplevel.h"
 
 G_BEGIN_DECLS
Index: gnome-panel/panel-types.h
===================================================================
--- gnome-panel/panel-types.h	(revision 11356)
+++ gnome-panel/panel-types.h	(working copy)
@@ -2,8 +2,7 @@
 #ifndef PANEL_TYPES_H
 #define PANEL_TYPES_H
 
-#include <gdk/gdkcolor.h>
-#include <gtk/gtktypeutils.h>
+#include <gdk/gdk.h>
 #include "GNOME_Panel.h"
 
 typedef enum {
Index: gnome-panel/xstuff.h
===================================================================
--- gnome-panel/xstuff.h	(revision 11356)
+++ gnome-panel/xstuff.h	(working copy)
@@ -2,7 +2,7 @@
 #define __XSTUFF_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 void xstuff_delete_property		(GdkWindow *window,
 					 const char *name);
Index: applets/wncklet/wncklet.c
===================================================================
--- applets/wncklet/wncklet.c	(revision 11356)
+++ applets/wncklet/wncklet.c	(working copy)
@@ -28,8 +28,7 @@
 #include <string.h>
 #include <panel-applet.h>
 #include <libgnomeui/gnome-help.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <libwnck/screen.h>
 #include <libwnck/util.h>
 
Index: applets/wncklet/showdesktop.c
===================================================================
--- applets/wncklet/showdesktop.c	(revision 11356)
+++ applets/wncklet/showdesktop.c	(working copy)
@@ -27,12 +27,7 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <libwnck/screen.h>
Index: applets/wncklet/wncklet.h
===================================================================
--- applets/wncklet/wncklet.h	(revision 11356)
+++ applets/wncklet/wncklet.h	(working copy)
@@ -28,7 +28,7 @@
 #include <libwnck/screen.h>
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
 
 G_BEGIN_DECLS
Index: applets/wncklet/window-menu.h
===================================================================
--- applets/wncklet/window-menu.h	(revision 11356)
+++ applets/wncklet/window-menu.h	(working copy)
@@ -29,7 +29,7 @@
 #ifndef __WINDOW_MENU_H__
 #define __WINDOW_MENU_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <panel-applet.h>
 
 G_BEGIN_DECLS
Index: applets/wncklet/showdesktop.h
===================================================================
--- applets/wncklet/showdesktop.h	(revision 11356)
+++ applets/wncklet/showdesktop.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef _SHOWDESKTOP_H_
 #define _SHOWDESKTOP_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <panel-applet.h>
 
 G_BEGIN_DECLS
Index: applets/wncklet/window-list.c
===================================================================
--- applets/wncklet/window-list.c	(revision 11356)
+++ applets/wncklet/window-list.c	(working copy)
@@ -19,7 +19,7 @@
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-help.h>
 #include <glade/glade-xml.h>
 #include <libwnck/libwnck.h>
Index: applets/wncklet/workspace-switcher.c
===================================================================
--- applets/wncklet/workspace-switcher.c	(revision 11356)
+++ applets/wncklet/workspace-switcher.c	(working copy)
@@ -21,7 +21,7 @@
 
 #include <stdlib.h>
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 #include <libwnck/libwnck.h>
 #include <gconf/gconf-client.h>
Index: applets/wncklet/window-list.h
===================================================================
--- applets/wncklet/window-list.h	(revision 11356)
+++ applets/wncklet/window-list.h	(working copy)
@@ -9,7 +9,7 @@
 #ifndef __WINDOW_LIST_H__
 #define __WINDOW_LIST_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <panel-applet.h>
 
 G_BEGIN_DECLS
Index: applets/wncklet/workspace-switcher.h
===================================================================
--- applets/wncklet/workspace-switcher.h	(revision 11356)
+++ applets/wncklet/workspace-switcher.h	(working copy)
@@ -9,7 +9,7 @@
 #ifndef __WORKSPACE_SWITCHER_APPLET_H__
 #define __WORKSPACE_SWITCHER_APPLET_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <panel-applet.h>
 
 G_BEGIN_DECLS
Index: applets/clock/clock-utils.h
===================================================================
--- applets/clock/clock-utils.h	(revision 11356)
+++ applets/clock/clock-utils.h	(working copy)
@@ -27,7 +27,7 @@
 #ifndef __CLOCK_UTILS_H__
 #define __CLOCK_UTILS_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: applets/clock/obox.c
===================================================================
--- applets/clock/obox.c	(revision 11356)
+++ applets/clock/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 clock_obox_size_request  (GtkWidget       *widget,
 				      GtkRequisition  *requisition);
Index: applets/clock/obox.h
===================================================================
--- applets/clock/obox.h	(revision 11356)
+++ applets/clock/obox.h	(working copy)
@@ -28,7 +28,7 @@
 #ifndef __CLOCK_OBOX_H__
 #define __CLOCK_OBOX_H__
 
-#include <gtk/gtkbox.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
Index: applets/clock/clock-location-tile.h
===================================================================
--- applets/clock/clock-location-tile.h	(revision 11356)
+++ applets/clock/clock-location-tile.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef __CLOCK_LOCATION_TILE_H__
 #define __CLOCK_LOCATION_TILE_H__
 
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 #include "clock.h"
 #include "clock-face.h"
Index: applets/notification_area/obox.c
===================================================================
--- applets/notification_area/obox.c	(revision 11356)
+++ applets/notification_area/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: applets/notification_area/na-tray.c
===================================================================
--- applets/notification_area/na-tray.c	(revision 11356)
+++ applets/notification_area/na-tray.c	(working copy)
@@ -25,8 +25,7 @@
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-help.h>
 
 #include "na-tray-manager.h"
Index: applets/notification_area/obox.h
===================================================================
--- applets/notification_area/obox.h	(revision 11356)
+++ applets/notification_area/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: applets/notification_area/na-tray.h
===================================================================
--- applets/notification_area/na-tray.h	(revision 11356)
+++ applets/notification_area/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: applets/notification_area/na-tray-manager.c
===================================================================
--- applets/notification_area/na-tray-manager.c	(revision 11356)
+++ applets/notification_area/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: applets/notification_area/main.c
===================================================================
--- applets/notification_area/main.c	(revision 11356)
+++ applets/notification_area/main.c	(working copy)
@@ -26,8 +26,7 @@
 #include <panel-applet.h>
 #include <panel-applet-gconf.h>
 
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-help.h>
 
 #include "na-tray-manager.h"
Index: applets/notification_area/na-tray-manager.h
===================================================================
--- applets/notification_area/na-tray-manager.h	(revision 11356)
+++ applets/notification_area/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: libpanel-applet/panel-applet-gconf.h
===================================================================
--- libpanel-applet/panel-applet-gconf.h	(revision 11356)
+++ libpanel-applet/panel-applet-gconf.h	(working copy)
@@ -25,8 +25,8 @@
 #ifndef __PANEL_APPLET_GCONF_H__
 #define __PANEL_APPLET_GCONF_H__
 
-#include <glib/gmacros.h>
-#include <glib/gerror.h>
+#include <glib.h>
+#include <glib.h>
 #include <gconf/gconf-value.h>
 
 #include <panel-applet.h>
Index: libpanel-applet/panel-applet.c
===================================================================
--- libpanel-applet/panel-applet.c	(revision 11356)
+++ libpanel-applet/panel-applet.c	(working copy)
@@ -34,8 +34,6 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtktooltips.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-types.h>
Index: libpanel-applet/panel-applet.h
===================================================================
--- libpanel-applet/panel-applet.h	(revision 11356)
+++ libpanel-applet/panel-applet.h	(working copy)
@@ -25,9 +25,8 @@
 #ifndef __PANEL_APPLET_H__
 #define __PANEL_APPLET_H__
 
-#include <glib/gmacros.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkeventbox.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-client.h>
 #include <bonobo/bonobo-control.h>
