Index: typing-break/drw-utils.h
===================================================================
--- typing-break/drw-utils.h	(revision 9144)
+++ typing-break/drw-utils.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef __DRW_UTILS_H__
 #define __DRW_UTILS_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 void drw_setup_background (GtkWidget *window);
 
Index: typing-break/drw-monitor.c
===================================================================
--- typing-break/drw-monitor.c	(revision 9144)
+++ typing-break/drw-monitor.c	(working copy)
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkinvisible.h>
+#include <gtk/gtk.h>
 #include <math.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
Index: typing-break/drw-break-window.h
===================================================================
--- typing-break/drw-break-window.h	(revision 9144)
+++ typing-break/drw-break-window.h	(working copy)
@@ -22,7 +22,7 @@
 #ifndef __DRW_BREAK_WINDOW_H__
 #define __DRW_BREAK_WINDOW_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: typing-break/drwright.c
===================================================================
--- typing-break/drwright.c	(revision 9144)
+++ typing-break/drwright.c	(working copy)
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkspawn.h>
+#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
Index: shell/control-center.c
===================================================================
--- shell/control-center.c	(revision 9144)
+++ shell/control-center.c	(working copy)
@@ -23,14 +23,6 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkentry.h>
 #include <panel-applet.h>
 #include <libgnome/gnome-desktop-item.h>
 #include <libgnomeui/libgnomeui.h>
Index: capplets/appearance/gedit-message-area.h
===================================================================
--- capplets/appearance/gedit-message-area.h	(revision 9144)
+++ capplets/appearance/gedit-message-area.h	(working copy)
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_MESSAGE_AREA_H__
 #define __GEDIT_MESSAGE_AREA_H__
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: capplets/appearance/gnome-wp-item.h
===================================================================
--- capplets/appearance/gnome-wp-item.h	(revision 9144)
+++ capplets/appearance/gnome-wp-item.h	(working copy)
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-desktop-thumbnail.h>
 #include <libgnomeui/gnome-bg.h>
Index: capplets/keyboard/gnome-keyboard-properties-a11y.h
===================================================================
--- capplets/keyboard/gnome-keyboard-properties-a11y.h	(revision 9144)
+++ capplets/keyboard/gnome-keyboard-properties-a11y.h	(working copy)
@@ -25,7 +25,7 @@
 #define __GNOME_KEYBOARD_PROPERTY_A11Y_H
 
 #include <gconf/gconf-changeset.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 
 extern void setup_a11y_tabs (GladeXML * dialog, GConfChangeSet * changeset);
Index: capplets/keybindings/eggaccelerators.h
===================================================================
--- capplets/keybindings/eggaccelerators.h	(revision 9144)
+++ capplets/keybindings/eggaccelerators.h	(working copy)
@@ -21,7 +21,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: capplets/keybindings/eggaccelerators.c
===================================================================
--- capplets/keybindings/eggaccelerators.c	(revision 9144)
+++ capplets/keybindings/eggaccelerators.c	(working copy)
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 
 enum
 {
Index: capplets/keybindings/eggcellrendererkeys.h
===================================================================
--- capplets/keybindings/eggcellrendererkeys.h	(revision 9144)
+++ capplets/keybindings/eggcellrendererkeys.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __EGG_CELL_RENDERER_KEYS_H__
 #define __EGG_CELL_RENDERER_KEYS_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 #include "eggaccelerators.h"
 
 G_BEGIN_DECLS
Index: capplets/common/file-transfer-dialog.h
===================================================================
--- capplets/common/file-transfer-dialog.h	(revision 9144)
+++ capplets/common/file-transfer-dialog.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef __FILE_TRANSFER_DIALOG_H__
 #define __FILE_TRANSFER_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: capplets/common/capplet-stock-icons.c
===================================================================
--- capplets/common/capplet-stock-icons.c	(revision 9144)
+++ capplets/common/capplet-stock-icons.c	(working copy)
@@ -23,8 +23,7 @@
  *	Taken bits of code from panel-stock-icons.c, Thanks Mark <mark@skynet.ie>
  */
 
-#include <gtk/gtkstock.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "capplet-stock-icons.h"
Index: capplets/common/capplet-stock-icons.h
===================================================================
--- capplets/common/capplet-stock-icons.h	(revision 9144)
+++ capplets/common/capplet-stock-icons.h	(working copy)
@@ -26,8 +26,8 @@
 #ifndef __CAPPLET_STOCK_ICONS_H__
 #define __CAPPLET_STOCK_ICONS_H__
 
-#include <glib/gmacros.h>
-#include <gtk/gtkenums.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: capplets/sound/mixer-support.c
===================================================================
--- capplets/sound/mixer-support.c	(revision 9144)
+++ capplets/sound/mixer-support.c	(working copy)
@@ -24,11 +24,11 @@
 
 #include <string.h>
 
-#include <glib/glist.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 #include <gst/audio/mixerutils.h>
 
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include "mixer-support.h"
 
Index: capplets/sound/mixer-support.h
===================================================================
--- capplets/sound/mixer-support.h	(revision 9144)
+++ capplets/sound/mixer-support.h	(working copy)
@@ -22,7 +22,7 @@
 #ifndef __GNOME_SETTINGS_MIXER_SUPPORT__
 #define __GNOME_SETTINGS_MIXER_SUPPORT__
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <gst/interfaces/mixer.h>
 
 G_BEGIN_DECLS
