diff --git a/gswitchit/gswitchit-applet.c b/gswitchit/gswitchit-applet.c
index a2f3248..dab7ebf 100644
--- a/gswitchit/gswitchit-applet.c
+++ b/gswitchit/gswitchit-applet.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 #define GROUPS_SUBMENU_PATH "/popups/popup/groups"
diff --git a/gswitchit/gswitchit-applet.h b/gswitchit/gswitchit-applet.h
index 5569933..51d0edc 100644
--- a/gswitchit/gswitchit-applet.h
+++ b/gswitchit/gswitchit-applet.h
@@ -17,9 +17,8 @@
 #ifndef __GSWITCHIT_APPLET_H__
 #define __GSWITCHIT_APPLET_H__
 
-#include <gdk/gdkevents.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
 
 #include <libgnomekbd/gkbd-indicator.h>
diff --git a/gweather/gweather-dialog.h b/gweather/gweather-dialog.h
index 88ea2b4..4527b17 100644
--- a/gweather/gweather-dialog.h
+++ b/gweather/gweather-dialog.h
@@ -13,7 +13,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
diff --git a/gweather/gweather-pref.h b/gweather/gweather-pref.h
index 003b717..597b0a0 100644
--- a/gweather/gweather-pref.h
+++ b/gweather/gweather-pref.h
@@ -13,7 +13,7 @@
 #ifndef __GWEATHER_PREF_H_
 #define __GWEATHER_PREF_H_
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
diff --git a/multiload/global.h b/multiload/global.h
index 988ba10..5fb50c0 100644
--- a/multiload/global.h
+++ b/multiload/global.h
@@ -3,7 +3,7 @@
 
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
 
 G_BEGIN_DECLS
diff --git a/multiload/netspeed.h b/multiload/netspeed.h
index da3886f..5bc19cf 100644
--- a/multiload/netspeed.h
+++ b/multiload/netspeed.h
@@ -1,7 +1,7 @@
 #ifndef H_MULTILOAD_NETSPEED_
 #define H_MULTILOAD_NETSPEED_
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 typedef struct _NetSpeed NetSpeed;
 
