diff --git a/clutter/json/Makefile.am b/clutter/json/Makefile.am
index 28d0512cc..2481b6696 100644
--- a/clutter/json/Makefile.am
+++ b/clutter/json/Makefile.am
@@ -25,7 +25,8 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DG_LOG_DOMAIN=\"Clutter-Json\" \
-	-DG_DISABLE_DEPRECATED
+	-DG_DISABLE_DEPRECATED \
+	-DJSON_COMPILATION
 
 AM_CFLAGS = $(MAINTAINER_CFLAGS)
 
@@ -40,6 +41,7 @@ BUILT_GIRSOURCES =
 
 ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.la
 	$(INTROSPECTION_SCANNER) -v --namespace ClutterJson --nsversion=@CLUTTER_API_VERSION@ \
+		$(INCLUDES) \
 		--add-include-path=$(srcdir) --add-include-path=. \
 		--include=GObject-2.0 \
 		--library=clutter-json \
diff --git a/clutter/json/json-glib.h b/clutter/json/json-glib.h
index ac58b5179..3e750804b 100644
--- a/clutter/json/json-glib.h
+++ b/clutter/json/json-glib.h
@@ -1,8 +1,12 @@
 #ifndef __JSON_GLIB_H__
 #define __JSON_GLIB_H__
 
+#define __JSON_GLIB_INSIDE__
+
 #include "json-types.h"
 #include "json-generator.h"
 #include "json-parser.h"
 
+#undef __JSON_GLIB_INSIDE__
+
 #endif /* __JSON_GLIB_H__ */