[json-glib/json-glib-0-14] Adapt to the demise of single includes in GLib (cherry picked from commit f904ad102004258dc7b839b93a

[Emmanuele Bassi <ebassi src gnome org>]

commit 692d8275b0d2a7883af4088c95a8403d902ffd10
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Oct 12 07:15:23 2011 -0400

    Adapt to the demise of single includes in GLib
    (cherry picked from commit f904ad102004258dc7b839b93a7904517cc4c623)
    
    Signed-off-by: Emmanuele Bassi <ebassi linux intel com>

 json-glib/json-scanner.h   |    4 +---
 json-glib/tests/gvariant.c |    2 +-
 json-glib/tests/node.c     |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/json-glib/json-scanner.h b/json-glib/json-scanner.h
index 49d7b1e..e3df02c 100644
--- a/json-glib/json-scanner.h
+++ b/json-glib/json-scanner.h
@@ -34,9 +34,7 @@
 #ifndef __JSON_SCANNER_H__
 #define __JSON_SCANNER_H__
 
-#include <glib/gdataset.h>
-#include <glib/ghash.h>
-#include <glib/gscanner.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/json-glib/tests/gvariant.c b/json-glib/tests/gvariant.c
index 0dbccdf..074dd69 100644
--- a/json-glib/tests/gvariant.c
+++ b/json-glib/tests/gvariant.c
@@ -1,4 +1,4 @@
-#include <glib/gtestutils.h>
+#include <glib.h>
 #include <json-glib/json-glib.h>
 #include <string.h>
 
diff --git a/json-glib/tests/node.c b/json-glib/tests/node.c
index da979a4..0c2fd9b 100644
--- a/json-glib/tests/node.c
+++ b/json-glib/tests/node.c
@@ -1,4 +1,4 @@
-#include <glib/gtestutils.h>
+#include <glib.h>
 #include <json-glib/json-glib.h>
 #include <string.h>