Index: test/gkbd-indicator-test.c
===================================================================
--- test/gkbd-indicator-test.c	(revision 355)
+++ test/gkbd-indicator-test.c	(working copy)
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
Index: test/gkbd-keyboard-drawing-test.c
===================================================================
--- test/gkbd-keyboard-drawing-test.c	(revision 355)
+++ test/gkbd-keyboard-drawing-test.c	(working copy)
@@ -24,7 +24,7 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib/goption.h>
+#include <glib.h>
 #include "libgnomekbd/gkbd-keyboard-drawing.h"
 
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 355)
+++ ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-12-09  Pedro Fragoso  <ember@ubuntu.com>
+
+	* capplet/gkbd-indicator-plugins-capplet.h:
+	* test/gkbd-indicator-test.c:
+	* test/gkbd-keyboard-drawing-test.c:
+	GNOME Goal: Clean up GLib and GTK+ includes (Closes: #563629)
+
 2008-11-09 svu
 
 	* libgnomekbd/gkbd-keyboard-config.c: fixed memleak,
Index: capplet/gkbd-indicator-plugins-capplet.h
===================================================================
--- capplet/gkbd-indicator-plugins-capplet.h	(revision 355)
+++ capplet/gkbd-indicator-plugins-capplet.h	(working copy)
@@ -21,7 +21,7 @@
 #define __GKBD_INDICATOR_PLUGINS_CAPPLET_H__
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 #include "libgnomekbd/gkbd-desktop-config.h"
