Index: src/e-phone-entry.h
===================================================================
--- src/e-phone-entry.h	(revision 328)
+++ src/e-phone-entry.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef PHONE_ENTRY_H
 #define PHONE_ENTRY_H
 
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 #include "e-contact-entry.h"
 
 G_BEGIN_DECLS
Index: src/phonemgr-chooser-button.h
===================================================================
--- src/phonemgr-chooser-button.h	(revision 328)
+++ src/phonemgr-chooser-button.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef __PHONEMGR_CHOOSER_BUTTON_H__
 #define __PHONEMGR_CHOOSER_BUTTON_H__
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 328)
+++ ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2008-12-18  Przemysław Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+	* src/e-phone-entry.h:
+	* src/phonemgr-chooser-button.h:
+	* cut-n-paste/gconf-bridge/gconf-bridge.h:
+	* cut-n-paste/gconf-bridge/gconf-bridge.c: Cleared up gtk includes
+	to use only toplevel headers. Bug #565036.
+
 2008-12-15  Bastien Nocera  <hadess@hadess.net>
 
 	* cut-n-paste/e-contact-entry/e-contact-entry.c:
Index: cut-n-paste/gconf-bridge/gconf-bridge.c
===================================================================
--- cut-n-paste/gconf-bridge/gconf-bridge.c	(revision 328)
+++ cut-n-paste/gconf-bridge/gconf-bridge.c	(working copy)
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #include "gconf-bridge.h"
Index: cut-n-paste/gconf-bridge/gconf-bridge.h
===================================================================
--- cut-n-paste/gconf-bridge/gconf-bridge.h	(revision 328)
+++ cut-n-paste/gconf-bridge/gconf-bridge.h	(working copy)
@@ -23,8 +23,7 @@
 #define __GCONF_BRIDGE_H__
 
 #include <gconf/gconf-client.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
