diff --git a/ChangeLog b/ChangeLog
index cfb92b57ee..b2ee534559 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-26  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkshow.h: include "gdk/gdk.h" instead of "gdk/gdkscreen.h"
+
+	* gtk/gtkshow.c: remove inclusion of single files from gdk/
+
+	Removed trailing whitespace in both files.
+
 2008-05-26  Richard Hult  <richard@imendio.com>
 
 	Bug 530353 – Mac-like gtk_accelerator_get_label()
diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index 949f67b6e6..eef90d2962 100644
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * GTK - The GIMP Toolkit
  * Copyright (C) 2008  Jaap Haitsma <jaap@haitsma.org>
  *
@@ -24,8 +24,6 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-#include "gdk/gdkscreen.h"
-#include "gdk/gdkapplaunchcontext.h"
 
 #include "gtkshow.h"
 
@@ -36,22 +34,22 @@
  * gtk_show_uri:
  * @screen: screen to show the uri on or %NULL for the default screen
  * @uri: the uri to show
- * @timestamp: a timestamp to prevent focus stealing. 
+ * @timestamp: a timestamp to prevent focus stealing.
  * @error: a #GError that is returned in case of errors
  *
- * This is a convenience function for launching the default application 
+ * This is a convenience function for launching the default application
  * to show the uri. The uri must be of a form understood by GIO. Typical
- * examples are 
+ * examples are
  * <simplelist>
  *   <member><filename>file:///home/gnome/pict.jpg</filename></member>
  *   <member><filename>http://www.gnome.org</filename></member>
  *   <member><filename>mailto:me&commat;gnome.org</filename></member>
  * </simplelist>
- * Ideally the timestamp is taken from the event triggering 
- * the gtk_show_uri() call. If timestamp is not known you can take 
+ * Ideally the timestamp is taken from the event triggering
+ * the gtk_show_uri() call. If timestamp is not known you can take
  * %GDK_CURRENT_TIME.
  *
- * This function can be used as a replacement for gnome_vfs_url_show() 
+ * This function can be used as a replacement for gnome_vfs_url_show()
  * and gnome_url_show().
  *
  * Returns: %TRUE on success, %FALSE on error.
@@ -59,9 +57,9 @@
  * Since: 2.14
  */
 gboolean
-gtk_show_uri (GdkScreen    *screen, 
-              const gchar  *uri, 
-              guint32       timestamp, 
+gtk_show_uri (GdkScreen    *screen,
+              const gchar  *uri,
+              guint32       timestamp,
               GError      **error)
 {
   GdkAppLaunchContext *context;
diff --git a/gtk/gtkshow.h b/gtk/gtkshow.h
index 9a3faf015a..02e25f686f 100644
--- a/gtk/gtkshow.h
+++ b/gtk/gtkshow.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * GTK - The GIMP Toolkit
  * Copyright (C) 2008  Jaap Haitsma <jaap@haitsma.org>
  *
@@ -19,22 +19,20 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #ifndef __GTK_SHOW_H__
 #define __GTK_SHOW_H__
 
 #include <glib.h>
-#include "gdk/gdkscreen.h"
+#include "gdk/gdk.h"
 
 G_BEGIN_DECLS
 
-gboolean gtk_show_uri  (GdkScreen   *screen, 
-                        const gchar *uri, 
-                        guint32      timestamp, 
+gboolean gtk_show_uri  (GdkScreen   *screen,
+                        const gchar *uri,
+                        guint32      timestamp,
                         GError     **error);
 
 G_END_DECLS
 
 #endif /* __GTK_SHOW_H__ */
-
-
-