+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <ctpublic.h>
+diff -ur libgda-3.1.5.orig/testing/gda-test-model-query.c libgda-3.1.5/testing/gda-test-model-query.c
+--- libgda-3.1.5.orig/testing/gda-test-model-query.c 2008-07-20 11:51:16.000000000 +0200
++++ libgda-3.1.5/testing/gda-test-model-query.c 2012-06-29 12:53:05.230665872 +0200
+@@ -3,7 +3,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
++#include <glib.h>
+ #include <gmodule.h>
+ #include <glib/gi18n-lib.h>
+
+diff -ur libgda-3.1.5.orig/testing/gda-test-sql.c libgda-3.1.5/testing/gda-test-sql.c
+--- libgda-3.1.5.orig/testing/gda-test-sql.c 2008-07-20 11:51:16.000000000 +0200
++++ libgda-3.1.5/testing/gda-test-sql.c 2012-06-29 12:53:05.230665872 +0200
+@@ -3,7 +3,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
++#include <glib.h>
+ #include <gmodule.h>
+ #include <glib/gi18n-lib.h>
+
+diff -ur libgda-3.1.5.orig/tools/gda-diagnose.c libgda-3.1.5/tools/gda-diagnose.c
+--- libgda-3.1.5.orig/tools/gda-diagnose.c 2008-07-20 11:51:14.000000000 +0200
++++ libgda-3.1.5/tools/gda-diagnose.c 2012-06-29 12:53:05.230665872 +0200
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
++#include <glib.h>
+ #include <gmodule.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider-extra.h>
+diff -ur libgda-3.1.5.orig/tools/gda-inspect-dict-file.c libgda-3.1.5/tools/gda-inspect-dict-file.c
+--- libgda-3.1.5.orig/tools/gda-inspect-dict-file.c 2008-07-20 11:51:14.000000000 +0200
++++ libgda-3.1.5/tools/gda-inspect-dict-file.c 2012-06-29 12:53:05.227332539 +0200
+@@ -1,6 +1,6 @@
+ #include <libgda/libgda.h>
+ #include <unistd.h>
+-#include <glib/gstdio.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+
+ /* options */
+diff -ur libgda-3.1.5.orig/tools/gda-sql.c libgda-3.1.5/tools/gda-sql.c
+--- libgda-3.1.5.orig/tools/gda-sql.c 2008-07-20 11:55:34.000000000 +0200
++++ libgda-3.1.5/tools/gda-sql.c 2012-06-29 12:53:05.227332539 +0200
+@@ -21,12 +21,11 @@
+ #include <libgda/libgda.h>
+ #include <virtual/libgda-virtual.h>
+ #include <glib/gi18n-lib.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <glib/gstdio.h>
+ #include "tools-input.h"
+ #include "command-exec.h"
+ #include <unistd.h>