Index: src/applet-dialogs.c
===================================================================
--- src/applet-dialogs.c	(revision 1074)
+++ src/applet-dialogs.c	(working copy)
@@ -38,7 +38,6 @@
 #include <nm-utils.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
Index: src/applet-device-gsm.c
===================================================================
--- src/applet-device-gsm.c	(revision 1074)
+++ src/applet-device-gsm.c	(working copy)
@@ -25,9 +25,7 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtk.h>
 
 #include <nm-device.h>
 #include <nm-setting-connection.h>
Index: src/applet-dialogs.h
===================================================================
--- src/applet-dialogs.h	(revision 1074)
+++ src/applet-dialogs.h	(working copy)
@@ -24,7 +24,6 @@
 #define __APPLET_DIALOGS_H__
 
 #include <gtk/gtk.h>
-#include <gtk/gtkmenuitem.h>
 
 #include "applet.h"
 
Index: src/polkit-helpers/polkit-gnome-action.c
===================================================================
--- src/polkit-helpers/polkit-gnome-action.c	(revision 1074)
+++ src/polkit-helpers/polkit-gnome-action.c	(working copy)
@@ -44,8 +44,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
-#undef GTK_DISABLE_DEPRECATED
-#include <gtk/gtktooltips.h>
 #define GTK_DISABLE_DEPRECATED
 
 #define DBUS_API_SUBJECT_TO_CHANGE
Index: src/wireless-security/wireless-security.h
===================================================================
--- src/wireless-security/wireless-security.h	(revision 1074)
+++ src/wireless-security/wireless-security.h	(working copy)
@@ -24,9 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <gtk/gtksizegroup.h>
 #include <glade/glade.h>
-#include <gtk/gtkwidget.h>
 
 #include <nm-connection.h>
 
Index: src/wireless-security/eap-method.h
===================================================================
--- src/wireless-security/eap-method.h	(revision 1074)
+++ src/wireless-security/eap-method.h	(working copy)
@@ -24,9 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <gtk/gtksizegroup.h>
 #include <glade/glade.h>
-#include <gtk/gtkwidget.h>
 
 #include <nm-connection.h>
 #include <nm-setting-8021x.h>
Index: src/applet.h
===================================================================
--- src/applet.h	(revision 1074)
+++ src/applet.h	(working copy)
@@ -30,7 +30,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkmenu.h>
 
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
Index: src/wireless-dialog.c
===================================================================
--- src/wireless-dialog.c	(revision 1074)
+++ src/wireless-dialog.c	(working copy)
@@ -27,7 +27,6 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkcontainer.h>
 #include <glade/glade.h>
 #include <netinet/ether.h>
 
Index: src/wireless-dialog.h
===================================================================
--- src/wireless-dialog.h	(revision 1074)
+++ src/wireless-dialog.h	(working copy)
@@ -23,8 +23,7 @@
 #define WIRELESS_DIALOG_H
 
 #include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include <nm-connection.h>
Index: src/connection-editor/page-wired-security.h
===================================================================
--- src/connection-editor/page-wired-security.h	(revision 1074)
+++ src/connection-editor/page-wired-security.h	(working copy)
@@ -27,7 +27,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include "ce-page.h"
Index: src/connection-editor/page-dsl.h
===================================================================
--- src/connection-editor/page-dsl.h	(revision 1074)
+++ src/connection-editor/page-dsl.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include "ce-page.h"
Index: src/connection-editor/mobile-wizard.c
===================================================================
--- src/connection-editor/mobile-wizard.c	(revision 1074)
+++ src/connection-editor/mobile-wizard.c	(working copy)
@@ -24,10 +24,7 @@
 #include <glib/gi18n.h>
 
 #include <glade/glade.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkbox.h>
+#include <gtk/gtk.h>
 
 #include <NetworkManager.h>
 #include <nm-client.h>
Index: src/connection-editor/page-wireless.h
===================================================================
--- src/connection-editor/page-wireless.h	(revision 1074)
+++ src/connection-editor/page-wireless.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include "ce-page.h"
Index: src/connection-editor/nm-connection-list.c
===================================================================
--- src/connection-editor/nm-connection-list.c	(revision 1074)
+++ src/connection-editor/nm-connection-list.c	(working copy)
@@ -26,14 +26,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
 
Index: src/connection-editor/nm-connection-list.h
===================================================================
--- src/connection-editor/nm-connection-list.h	(revision 1074)
+++ src/connection-editor/nm-connection-list.h	(working copy)
@@ -26,9 +26,8 @@
 #include <glib-object.h>
 #include <glade/glade-xml.h>
 #include <gconf/gconf-client.h>
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkicontheme.h>
 #include <nm-dbus-settings-system.h>
 #include "nma-gconf-settings.h"
 
Index: src/connection-editor/nm-connection-editor.c
===================================================================
--- src/connection-editor/nm-connection-editor.c	(revision 1074)
+++ src/connection-editor/nm-connection-editor.c	(working copy)
@@ -30,13 +30,6 @@
 #include <unistd.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtklabel.h>
 #include <glib/gi18n.h>
 
 #ifdef NO_POLKIT_GNOME
Index: src/connection-editor/ce-page.h
===================================================================
--- src/connection-editor/ce-page.h	(revision 1074)
+++ src/connection-editor/ce-page.h	(working copy)
@@ -23,12 +23,10 @@
 #ifndef __CE_PAGE_H__
 #define __CE_PAGE_H__
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 
 #include <nm-connection.h>
Index: src/connection-editor/page-ip4.h
===================================================================
--- src/connection-editor/page-ip4.h	(revision 1074)
+++ src/connection-editor/page-ip4.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include "ce-page.h"
Index: src/connection-editor/page-ppp.h
===================================================================
--- src/connection-editor/page-ppp.h	(revision 1074)
+++ src/connection-editor/page-ppp.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include "ce-page.h"
Index: src/connection-editor/page-wireless-security.h
===================================================================
--- src/connection-editor/page-wireless-security.h	(revision 1074)
+++ src/connection-editor/page-wireless-security.h	(working copy)
@@ -27,7 +27,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
Index: src/connection-editor/page-vpn.h
===================================================================
--- src/connection-editor/page-vpn.h	(revision 1074)
+++ src/connection-editor/page-vpn.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include "ce-page.h"
Index: src/connection-editor/main.c
===================================================================
--- src/connection-editor/main.c	(revision 1074)
+++ src/connection-editor/main.c	(working copy)
@@ -31,7 +31,7 @@
 #include <dbus/dbus.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
Index: src/connection-editor/page-mobile.h
===================================================================
--- src/connection-editor/page-mobile.h	(revision 1074)
+++ src/connection-editor/page-mobile.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include "ce-page.h"
Index: src/connection-editor/page-wired.h
===================================================================
--- src/connection-editor/page-wired.h	(revision 1074)
+++ src/connection-editor/page-wired.h	(working copy)
@@ -25,7 +25,7 @@
 
 #include <nm-connection.h>
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include "ce-page.h"
Index: src/ap-menu-item.h
===================================================================
--- src/ap-menu-item.h	(revision 1074)
+++ src/ap-menu-item.h	(working copy)
@@ -25,7 +25,6 @@
 #define __AP_MENU_ITEM_H__
 
 #include <gtk/gtk.h>
-#include <gtk/gtkcheckmenuitem.h>
 #include "applet.h"
 #include "nm-access-point.h"
 
Index: src/applet-device-wifi.c
===================================================================
--- src/applet-device-wifi.c	(revision 1074)
+++ src/applet-device-wifi.c	(working copy)
@@ -32,9 +32,7 @@
 #include <ctype.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtk.h>
 
 #include <nm-device.h>
 #include <nm-access-point.h>
Index: src/applet-device-wifi.h
===================================================================
--- src/applet-device-wifi.h	(revision 1074)
+++ src/applet-device-wifi.h	(working copy)
@@ -22,7 +22,7 @@
 #ifndef __APPLET_DEVICE_WIFI_H__
 #define __APPLET_DEVICE_WIFI_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "applet.h"
 
Index: src/applet-device-cdma.c
===================================================================
--- src/applet-device-cdma.c	(revision 1074)
+++ src/applet-device-cdma.c	(working copy)
@@ -24,9 +24,7 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtk.h>
 
 #include <nm-device.h>
 #include <nm-setting-connection.h>
Index: src/applet-device-wired.c
===================================================================
--- src/applet-device-wired.c	(revision 1074)
+++ src/applet-device-wired.c	(working copy)
@@ -26,9 +26,7 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtk.h>
 
 #include <nm-device.h>
 #include <nm-setting-connection.h>
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1074)
+++ ChangeLog	(working copy)
@@ -1,3 +1,36 @@
+2008-12-13  Przemysław Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+	* src/wireless-security/eap-method.h:
+	* src/wireless-security/wireless-security.h:
+	* src/polkit-helpers/polkit-gnome-action.c:
+	* src/connection-editor/ce-page.h:
+	* src/connection-editor/main.c:
+	* src/connection-editor/mobile-wizard.c:
+	* src/connection-editor/nm-connection-editor.c:
+	* src/connection-editor/nm-connection-list.c:
+	* src/connection-editor/nm-connection-list.h:
+	* src/connection-editor/page-dsl.h:
+	* src/connection-editor/page-ip4.h:
+	* src/connection-editor/page-mobile.h:
+	* src/connection-editor/page-ppp.h:
+	* src/connection-editor/page-vpn.h:
+	* src/connection-editor/page-wired-security.h:
+	* src/connection-editor/page-wired.h:
+	* src/connection-editor/page-wireless-security.h:
+	* src/connection-editor/page-wireless.h:
+	* src/ap-menu-item.h:
+	* src/applet-device-cdma.c:
+	* src/applet-device-gsm.c:
+	* src/applet-device-wifi.c:
+	* src/applet-device-wifi.h:
+	* src/applet-device-wired.c:
+	* src/applet-dialogs.c:
+	* src/applet-dialogs.h:
+	* src/applet.h:
+	* src/wireless-dialog.c:
+	* src/wireless-dialog.h: Cleared up gtk and glib includes
+	to use only toplevel headers. Bug #564379.
+
 2008-12-11  Dan Williams  <dcbw@redhat.com>
 
 	* src/ap-menu-item.c
