Index: libgda/gda-config.c
===================================================================
--- libgda/gda-config.c	(revision 3263)
+++ libgda/gda-config.c	(working copy)
@@ -36,7 +36,7 @@
 #include <libgda/gda-util.h>
 #ifdef HAVE_FAM
 #include <fam.h>
-#include <glib/giochannel.h>
+#include <glib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
Index: libgda/gda-value.c
===================================================================
--- libgda/gda-value.c	(revision 3263)
+++ libgda/gda-value.c	(working copy)
@@ -28,11 +28,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include <glib/gdate.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gstring.h>
-#include <glib/gi18n-lib.h>
 #include <libgda/gda-value.h>
 #include <libgda/gda-blob-op.h>
 #include <libgda/gda-util.h>
Index: libgda/gda-value.h
===================================================================
--- libgda/gda-value.h	(revision 3263)
+++ libgda/gda-value.h	(working copy)
@@ -27,8 +27,7 @@
 #define __GDA_VALUE_H__
 
 #include <time.h>
-#include <glib/glist.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <libxml/tree.h>
 #include <libgda/gda-decl.h>
Index: libgda/gda-log.c
===================================================================
--- libgda/gda-log.c	(revision 3263)
+++ libgda/gda-log.c	(working copy)
@@ -24,10 +24,6 @@
 #include <syslog.h>
 #endif
 #include <time.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gutils.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-log.h>
 
Index: libgda/gda-log.h
===================================================================
--- libgda/gda-log.h	(revision 3263)
+++ libgda/gda-log.h	(working copy)
@@ -20,8 +20,7 @@
 #if !defined(__gda_log_h__)
 #  define __gda_log_h__
 
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <time.h>
 
 G_BEGIN_DECLS
Index: libgda/sqlite/gda-sqlite.h
===================================================================
--- libgda/sqlite/gda-sqlite.h	(revision 3263)
+++ libgda/sqlite/gda-sqlite.h	(working copy)
@@ -25,8 +25,7 @@
 #ifndef __GDA_SQLITE_H__
 #define __GDA_SQLITE_H__
 
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <libgda/libgda.h>
 
 #ifdef HAVE_SQLITE
Index: libgda/gda-quark-list.c
===================================================================
--- libgda/gda-quark-list.c	(revision 3263)
+++ libgda/gda-quark-list.c	(working copy)
@@ -23,10 +23,6 @@
 
 #include <libgda/gda-quark-list.h>
 #include <libgda/gda-util.h>
-#include <glib/ghash.h>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
 
 struct _GdaQuarkList {
 	GHashTable *hash_table;
Index: libgda/gda-column.c
===================================================================
--- libgda/gda-column.c	(revision 3263)
+++ libgda/gda-column.c	(working copy)
@@ -23,8 +23,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
 #include <libgda/gda-column.h>
 #include <string.h>
 #include "gda-marshal.h"
Index: libgda/gda-quark-list.h
===================================================================
--- libgda/gda-quark-list.h	(revision 3263)
+++ libgda/gda-quark-list.h	(working copy)
@@ -24,8 +24,7 @@
 #ifndef __GDA_QUARK_LIST_H__
 #define __GDA_QUARK_LIST_H__
 
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
Index: libgda/gda-column.h
===================================================================
--- libgda/gda-column.h	(revision 3263)
+++ libgda/gda-column.h	(working copy)
@@ -28,7 +28,7 @@
 
 #include <glib-object.h>
 #include <libgda/gda-value.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <libgda/gda-decl.h>
 
 G_BEGIN_DECLS
Index: libgda/gda-server-operation.c
===================================================================
--- libgda/gda-server-operation.c	(revision 3263)
+++ libgda/gda-server-operation.c	(working copy)
@@ -21,7 +21,7 @@
  */
 
 #include <stdlib.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgda/gda-marshal.h>
 #include <libgda/gda-server-provider.h>
 #include <libgda/gda-server-operation.h>
Index: libgda/gda-init.c
===================================================================
--- libgda/gda-init.c	(revision 3263)
+++ libgda/gda-init.c	(working copy)
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/gmain.h>
+#include <glib.h>
 #include <gmodule.h>
 #include <libgda/libgda.h>
 #include <glib/gi18n-lib.h>
Index: libgda/gda-data-model.c
===================================================================
--- libgda/gda-data-model.c	(revision 3263)
+++ libgda/gda-data-model.c	(working copy)
@@ -24,7 +24,7 @@
  */
 
 #include <glib/gi18n-lib.h>
-#include <glib/gprintf.h>
+#include <glib.h>
 #include <libgda/gda-data-model.h>
 #include <libgda/gda-data-model-private.h>
 #include <libgda/gda-data-model-extra.h>
Index: libgda/gda-util.c
===================================================================
--- libgda/gda-util.c	(revision 3263)
+++ libgda/gda-util.c	(working copy)
@@ -27,10 +27,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
-#include <glib/gfileutils.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gprintf.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-log.h>
 #include <libgda/gda-util.h>
Index: libgda/gda-util.h
===================================================================
--- libgda/gda-util.h	(revision 3263)
+++ libgda/gda-util.h	(working copy)
@@ -24,8 +24,7 @@
 #ifndef __GDA_UTIL_H__
 #define __GDA_UTIL_H__
 
-#include <glib/ghash.h>
-#include <glib/glist.h>
+#include <glib.h>
 #include "gda-holder.h"
 #include "gda-row.h"
 #include "gda-connection.h"
Index: libgda/gda-data-model-array.c
===================================================================
--- libgda/gda-data-model-array.c	(revision 3263)
+++ libgda/gda-data-model-array.c	(working copy)
@@ -22,7 +22,7 @@
  */
 
 #include <string.h>
-#include <glib/garray.h>
+#include <glib.h>
 #include <libgda/gda-data-model-array.h>
 #include <glib/gi18n-lib.h>
 #include <libgda/gda-data-model.h>
Index: libgda/gda-server-provider.c
===================================================================
--- libgda/gda-server-provider.c	(revision 3263)
+++ libgda/gda-server-provider.c	(working copy)
@@ -22,7 +22,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <libgda/gda-server-provider.h>
 #include <libgda/gda-server-provider-extra.h>
 #include <libgda/gda-server-provider-private.h>
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 3263)
+++ ChangeLog	(working copy)
@@ -1,3 +1,24 @@
+2008-12-12  Przemysław Grzegorczyk  <pgrzegorczyk@gmail.com>
+
+	* libgda/gda-init.c:
+	* libgda/gda-config.c:
+	* libgda/sqlite/gda-sqlite.h:
+	* libgda/gda-value.c:
+	* libgda/gda-value.h:
+	* libgda/gda-util.c:
+	* libgda/gda-util.h:
+	* libgda/gda-server-provider.c:
+	* libgda/gda-server-operation.c:
+	* libgda/gda-quark-list.c:
+	* libgda/gda-quark-list.h:
+	* libgda/gda-log.c:
+	* libgda/gda-log.h:
+	* libgda/gda-data-model.c:
+	* libgda/gda-data-model-array.c:
+	* libgda/gda-column.c:
+	* libgda/gda-column.h: Cleared up glib includes
+	to use only toplevel headers. Bug #564274.
+
 2008-12-11  Murray Cumming  <murrayc@murrayc.com>
 
 	* Many files: Add an extra "%s" arguement to g_set_error() calls, 
