diff --git a/ChangeLog b/ChangeLog
index 531e54fcc..347ec356d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-04-18  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkicontheme.h
+	* gtk/gtkrecentmanager.h: include <gdk/gdk.h> instead of
+	<gdk/gdkscreen.h>.
+
+	* gtk/gtkbuilderparser.c
+	* gtk/gtklinkbutton.c
+	* gtk/gtkpreview.c
+	* gtk/gtkrecentchooserdefault.c
+	* gtk/gtkrecentchoosermenu.c
+	* modules/input/gtkimcontextthai.c: remove inclusion of single
+	files from gdk, none of the includes was actually needed.
+
 2008-04-18  Michael Natterer  <mitch@imendio.com>
 
 	* gdk/gdk.h: reorder one include so they are all alphabetical.
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 1b56b3907..15fbae3a3 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -23,8 +23,6 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include <gdk/gdkenumtypes.h>
-#include <gdk/gdkkeys.h>
 #include "gtktypeutils.h"
 #include "gtkbuilderprivate.h"
 #include "gtkbuilder.h"
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 6b62bc51f..f1c20a23e 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index 751f91596..358600e51 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -26,10 +26,6 @@
 
 #include <string.h>
 
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkcursor.h>
-#include <gdk/gdkdisplay.h>
-
 #include "gtkclipboard.h"
 #include "gtkdnd.h"
 #include "gtkimagemenuitem.h"
@@ -58,7 +54,7 @@ struct _GtkLinkButtonPrivate
 enum
 {
   PROP_0,
-  
+
   PROP_URI
 };
 
diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c
index 2a7396412..e03f0fa6e 100644
--- a/gtk/gtkpreview.c
+++ b/gtk/gtkpreview.c
@@ -35,7 +35,6 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
-#include "gdk/gdkrgb.h"
 #include "gtkpreview.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 7f47d303f..cd777938e 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -29,8 +29,6 @@
 #include <unistd.h>
 #endif
 
-#include <gdk/gdkscreen.h>
-
 #include "gtkstock.h"
 #include "gtkicontheme.h"
 #include "gtkiconfactory.h"
diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index 43cb55221..43a1b2cd3 100644
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -22,8 +22,6 @@
 
 #include <string.h>
 
-#include <gdk/gdkscreen.h>
-
 #include "gtkrecentmanager.h"
 #include "gtkrecentfilter.h"
 #include "gtkrecentchooser.h"
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index b184b3fa8..11aeda88a 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -22,8 +22,8 @@
 #define __GTK_RECENT_MANAGER_H__
 
 #include <glib-object.h>
-#include <gdk/gdkscreen.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
 #include <time.h>
 
 G_BEGIN_DECLS
diff --git a/modules/input/gtkimcontextthai.c b/modules/input/gtkimcontextthai.c
index 3cc67c845..0b2d6b6b5 100644
--- a/modules/input/gtkimcontextthai.c
+++ b/modules/input/gtkimcontextthai.c
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkkeys.h>
 #include "gtkimcontextthai.h"
 #include "thai-charprop.h"