Index: src/libcontrast/contrast.h
===================================================================
--- src/libcontrast/contrast.h	(revision 2697)
+++ src/libcontrast/contrast.h	(working copy)
@@ -23,7 +23,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 /*
  * Defined colors.  Keep this list alphabetized if you add new ones, but set the
Index: src/common/servlist.c
===================================================================
--- src/common/servlist.c	(revision 2697)
+++ src/common/servlist.c	(working copy)
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "cfgfiles.h"
 #include "fe.h"
Index: src/common/text.c
===================================================================
--- src/common/text.c	(revision 2697)
+++ src/common/text.c	(working copy)
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 
 #include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
 #include "cfgfiles.h"
 #include "plugin.h"
 #include "fe.h"
Index: src/common/xchat.h
===================================================================
--- src/common/xchat.h	(revision 2697)
+++ src/common/xchat.h	(working copy)
@@ -1,10 +1,6 @@
 #include "../../config.h"
 
-#include <glib/gslist.h>
-#include <glib/glist.h>
-#include <glib/gutils.h>
-#include <glib/giochannel.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <time.h>			/* need time_t */
 
 #ifndef XCHAT_H
Index: src/fe-gnome/palette.h
===================================================================
--- src/fe-gnome/palette.h	(revision 2697)
+++ src/fe-gnome/palette.h	(working copy)
@@ -19,7 +19,7 @@
  *
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 extern GdkColor colors[];
 extern const GdkColor *color_schemes[];
Index: src/fe-gnome/conversation-panel.h
===================================================================
--- src/fe-gnome/conversation-panel.h	(revision 2697)
+++ src/fe-gnome/conversation-panel.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef XCHAT_GNOME_CONVERSATION_PANEL_H
 #define XCHAT_GNOME_CONVERSATION_PANEL_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "../common/xchat.h"
 
 G_BEGIN_DECLS
Index: src/fe-gnome/xtext.c
===================================================================
--- src/fe-gnome/xtext.c	(revision 2697)
+++ src/fe-gnome/xtext.c	(working copy)
@@ -43,12 +43,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #ifdef XCHAT
 #include "../../config.h"			/* can define USE_XLIB here */
Index: src/fe-gnome/xtext.h
===================================================================
--- src/fe-gnome/xtext.h	(revision 2697)
+++ src/fe-gnome/xtext.h	(working copy)
@@ -1,7 +1,7 @@
 #ifndef __XTEXT_H__
 #define __XTEXT_H__
 
-#include <gtk/gtkadjustment.h>
+#include <gtk/gtk.h>
 #ifdef USE_XFT
 #include <X11/Xft/Xft.h>
 #endif
Index: src/fe-gnome/pixmaps.c
===================================================================
--- src/fe-gnome/pixmaps.c	(revision 2697)
+++ src/fe-gnome/pixmaps.c	(working copy)
@@ -20,7 +20,7 @@
  */
 
 #include <config.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include "pixmaps.h"
 
 void
Index: src/fe-gnome/gui.h
===================================================================
--- src/fe-gnome/gui.h	(revision 2697)
+++ src/fe-gnome/gui.h	(working copy)
@@ -23,8 +23,7 @@
 #define XCHAT_GNOME_GUI_H
 
 #include <glade/glade.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-program.h>
 #include "userlist.h"
 #include "navigation-tree.h"
Index: src/fe-gnome/status-bar.h
===================================================================
--- src/fe-gnome/status-bar.h	(revision 2697)
+++ src/fe-gnome/status-bar.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef XCHAT_GNOME_STATUS_BAR_H
 #define XCHAT_GNOME_STATUS_BAR_H
 
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 #include "../common/xchat.h"
 
 G_BEGIN_DECLS
Index: src/fe-gnome/topic-label.h
===================================================================
--- src/fe-gnome/topic-label.h	(revision 2697)
+++ src/fe-gnome/topic-label.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef XCHAT_GNOME_TOPIC_LABEL_H
 #define XCHAT_GNOME_TOPIC_LABEL_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "../common/xchat.h"
 
 G_BEGIN_DECLS
Index: src/fe-gnome/find-bar.h
===================================================================
--- src/fe-gnome/find-bar.h	(revision 2697)
+++ src/fe-gnome/find-bar.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef XCHAT_GNOME_FIND_BAR_H
 #define XCHAT_GNOME_FIND_BAR_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: src/fe-gnome/irc-network-editor.h
===================================================================
--- src/fe-gnome/irc-network-editor.h	(revision 2697)
+++ src/fe-gnome/irc-network-editor.h	(working copy)
@@ -19,10 +19,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreeviewcolumn.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
 #include "irc-network.h"
Index: src/fe-gnome/userlist.h
===================================================================
--- src/fe-gnome/userlist.h	(revision 2697)
+++ src/fe-gnome/userlist.h	(working copy)
@@ -20,7 +20,7 @@
  */
 
 #include <glib-object.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include "../common/xchat.h"
 #include "../common/userlist.h"
 
