Index: src/mud-tray.c
===================================================================
--- src/mud-tray.c	(revision 709)
+++ src/mud-tray.c	(working copy)
@@ -20,9 +20,7 @@
  */
 
 #include <glib/gi18n.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "gnome-mud.h"
 #include "mud-connection-view.h"
Index: src/mud-preferences-window.c
===================================================================
--- src/mud-preferences-window.c	(revision 709)
+++ src/mud-preferences-window.c	(working copy)
@@ -25,29 +25,8 @@
 #include <glade/glade-xml.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfontbutton.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtklabel.h>
-#include <glib/gprintf.h>
+#include <gtk/gtk.h>
+#include <glib.h>
 
 #include "mud-preferences-window.h"
 #include "mud-profile.h"
Index: src/mud-connection-view.c
===================================================================
--- src/mud-connection-view.c	(revision 709)
+++ src/mud-connection-view.c	(working copy)
@@ -23,8 +23,8 @@
 #include <gconf/gconf-client.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmenu.h>
-#include <glib/gqueue.h>
+#include <gtk/gtk.h>
+#include <glib.h>
 #include <vte/vte.h>
 #define GNET_EXPERIMENTAL
 #include <gnet.h>
Index: src/mud-regex.c
===================================================================
--- src/mud-regex.c	(revision 709)
+++ src/mud-regex.c	(working copy)
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <string.h>
-#include <glib/gprintf.h>
+#include <glib.h>
 
 #include "mud-regex.h"
 
Index: src/mud-connection-view.h
===================================================================
--- src/mud-connection-view.h	(revision 709)
+++ src/mud-connection-view.h	(working copy)
@@ -3,7 +3,7 @@
 
 G_BEGIN_DECLS
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gnet.h>
 
 
Index: src/modules.c
===================================================================
--- src/modules.c	(revision 709)
+++ src/modules.c	(working copy)
@@ -29,7 +29,7 @@
 
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #if HAVE_DIRENT_H
Index: src/gconf-helper.c
===================================================================
--- src/gconf-helper.c	(revision 709)
+++ src/gconf-helper.c	(working copy)
@@ -20,9 +20,9 @@
 #  include "config.h"
 #endif
 
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkcolorsel.h>
+#include <gtk/gtk.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
Index: src/mud-profile.c
===================================================================
--- src/mud-profile.c	(revision 709)
+++ src/mud-profile.c	(working copy)
@@ -25,8 +25,7 @@
 #include <gconf/gconf-client.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 
 #include "gconf-helper.h"
 #include "mud-profile.h"
Index: src/mud-profile.h
===================================================================
--- src/mud-profile.h	(revision 709)
+++ src/mud-profile.h	(working copy)
@@ -3,7 +3,7 @@
 
 G_BEGIN_DECLS
 
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 #define MUD_TYPE_PROFILE              (mud_profile_get_type ())
 #define MUD_PROFILE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MUD_TYPE_PROFILE, MudProfile))
@@ -100,7 +100,7 @@
 void mud_profile_copy_preferences (MudProfile *from, MudProfile *to);
 GList* mud_profile_process_commands (MudProfile *profile, const gchar *data);
 
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 void mud_profile_set_echotext (MudProfile *profile, gboolean value);
 void mud_profile_set_keeptext (MudProfile *profile, gboolean value);
 void mud_profile_set_disablekeys (MudProfile *profile, gboolean value);
Index: src/gnome-mud.c
===================================================================
--- src/gnome-mud.c	(revision 709)
+++ src/gnome-mud.c	(working copy)
@@ -22,9 +22,7 @@
 
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkaboutdialog.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <gnet.h>
Index: src/mud-window.c
===================================================================
--- src/mud-window.c	(revision 709)
+++ src/mud-window.c	(working copy)
@@ -22,25 +22,11 @@
 
 #include <glade/glade-xml.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkimage.h>
-#include <gdk/gdkpixbuf.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkpaned.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkprogressbar.h>
+#include <gdk/gdk.h>
 #include <vte/vte.h>
-#include <glib/gstring.h>
+#include <glib.h>
 #include <string.h>
 #include <stdlib.h>
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 709)
+++ ChangeLog	(working copy)
@@ -1,3 +1,18 @@
+2008-12-13  Przemysław Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+	* src/gconf-helper.c:
+	* src/gnome-mud.c:
+	* src/modules.c:
+	* src/mud-connection-view.c:
+	* src/mud-connection-view.h:
+	* src/mud-preferences-window.c:
+	* src/mud-profile.c:
+	* src/mud-profile.h:
+	* src/mud-regex.c:
+	* src/mud-tray.c:
+	* src/mud-window.c: Cleaned up gtk and glib includes
+	to use only toplevel headers. Bug #564363.
+
 2008-12-09  Les Harris  <lharris@gnome.org>
 
 	* gnome-mud-desktop.in: Applied 
