diff --git a/configure.in b/configure.in
index b181669..8b173e6 100644
--- a/configure.in
+++ b/configure.in
@@ -428,7 +428,7 @@ AC_SUBST(JSON_GLIB_LIBS)
 dnl *********************************
 dnl Check for GObject Introspection
 dnl *********************************
-GOBJECT_INTROSPECTION_CHECK([0.6.5])
+GOBJECT_INTROSPECTION_CHECK([0.6.6])
 
 dnl ******************************
 dnl Checks for libgcrypt
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 2301884..3bf84c8 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -235,7 +235,6 @@ Gdaui-@GDA_ABI_VERSION@.gir: $(INTROSPECTION_SCANNER) libgda-ui-4.0.la
 		$(LIBGDA_CFLAGS) \
 		$(GTK_CFLAGS) \
 		$(GIO_CFLAGS) \
-		--add-include-path=data-entries \
 		--add-include-path=$(top_srcdir)/libgda \
 		--include=GL-1.0 \
 		--include=GObject-2.0 \
@@ -263,7 +262,6 @@ Gdaui-@GDA_ABI_VERSION@.typelib: Gdaui-@GDA_ABI_VERSION@.gir $(INTROSPECTION_COM
 	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) \
 	--includedir=$(srcdir) --includedir=. \
 	--includedir=$(top_builddir)/libgda \
-	--includedir=$(srcdir)/data-entries\
 	$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 8da4548..cc82f27 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -93,24 +93,16 @@ gda_headers = \
 	gda-value.h \
 	gda-xa-transaction.h
 
-libgda_sources =  \
-	csv.h \
-	libcsv.c \
-	gda-attributes-manager.c \
+gda_sources= \
 	gda-batch.c \
 	dir-blob-op.h \
 	dir-blob-op.c \
-	$(gda_headers) \
 	libgda.h \
 	gda-blob-op.c \
 	gda-column.c \
 	gda-config.c \
 	gda-connection.c \
 	gda-connection-event.c \
-	gda-connection-internal.h \
-	gda-connection-sqlite.h \
-	gda-custom-marshal.c \
-	gda-custom-marshal.h \
 	gda-data-comparator.c \
 	gda-data-handler.c \
 	gda-data-model-array.c \
@@ -126,18 +118,12 @@ libgda_sources =  \
 	gda-data-meta-wrapper.h \
 	gda-data-proxy.c \
 	gda-data-select.c \
-	gda-data-select-extra.h \
 	gda-easy.c \
-	gda-types.c \
-	gda-types.h \
 	gda-holder.c \
 	gda-init.c \
 	gda-lockable.c \
 	gda-log.c \
-	gda-marshal.c \
 	gda-meta-store.c \
-	gda-meta-store-extra.h \
-	gda-meta-struct-private.h \
 	gda-meta-struct.c \
 	gda-meta-struct-io.c \
 	gda-mutex.c \
@@ -162,10 +148,27 @@ libgda_sources =  \
 	gda-tree-mgr-select.c \
 	gda-util.c \
 	gda-value.c \
-	gda-xa-transaction.c \
+	gda-xa-transaction.c 
+
+libgda_sources =  \
+	csv.h \
+	libcsv.c \
+	gda-attributes-manager.c \
+	$(gda_headers) \
+	gda-connection-internal.h \
+	gda-connection-sqlite.h \
+	gda-custom-marshal.c \
+	gda-custom-marshal.h \
+	gda-data-select-extra.h \
+	gda-types.c \
+	gda-types.h \
+	gda-marshal.c \
+	gda-meta-store-extra.h \
+	gda-meta-struct-private.h \
 	global.h \
 	md5.h \
-	md5c.c
+	md5c.c \
+	$(gda_sources)
 
 gda-enum-types.h: s-enum-types-h
 	@true
@@ -333,16 +336,27 @@ Gda-@GDA_ABI_VERSION@.gir: $(INTROSPECTION_SCANNER) libgda-@GDA_ABI_VERSION@.la
 		--namespace Gda --nsversion=@GDA_ABI_VERSION@ \
 		-I$(top_srcdir) -I$(top_srcdir)/libgda \
 		$(LIBGDA_CFLAGS) \
-		--add-include-path=providers-support \
-		--add-include-path=sql-parser \
-		--add-include-path=thread-wrapper \
-		--add-include-path=handlers \
-		--c-include='libgda/libgda.h' \
 		--include=GL-1.0 \
 		--include=GObject-2.0 \
 		--include=libxml2-2.0 \
 		--library=gda-@GDA_ABI_VERSION@ \
 	    $(INCLUDE_CFLAGS) \
+	    --c-include=$(top_srcdir)/libgda/csv.h \
+		--c-include=$(top_srcdir)/libgda/libcsv.c \
+		--c-include=$(srcdir)/gda-attributes-manager.c \
+		--c-include=$(top_srcdir)/libgda/gda-connection-internal.h \
+		--c-include=$(srcdir)/gda-connection-sqlite.h \
+		--c-include=$(top_srcdir)/libgda/gda-custom-marshal.c \
+		--c-include=$(srcdir)/gda-custom-marshal.h \
+		--c-include=$(top_srcdir)/libgda/gda-data-select-extra.h \
+		--c-include=$(srcdir)/gda-types.c \
+		--c-include=$(top_srcdir)/libgda/gda-types.h \
+		--c-include=$(srcdir)/gda-marshal.c \
+		--c-include=$(top_srcdir)/libgda/gda-meta-store-extra.h \
+		--c-include=$(srcdir)/gda-meta-struct-private.h \
+		--c-include=$(top_srcdir)/libgda/global.h \
+		--c-include=$(srcdir)/md5.h \
+		--c-include=$(top_srcdir)/libgda/md5c.c \
 	    --output $@ \
 		$(addprefix $(srcdir)/, $(gda_headers)) \
 	        $(srcdir)/gda-types.h \
@@ -351,7 +365,7 @@ Gda-@GDA_ABI_VERSION@.gir: $(INTROSPECTION_SCANNER) libgda-@GDA_ABI_VERSION@.la
 		$(addprefix $(srcdir)/, $(psupport)) \
 		$(addprefix $(srcdir)/, $(sqlparser)) \
 		sql-parser/gda-sql-parser-enum-types.c \
-		$(addprefix $(srcdir)/, $(threadwraper)) \
+		$(addprefix $(srcdir)/, $(threadwrapper)) \
 		$(addprefix $(srcdir)/, $(handlers))
 
 BUILT_GIRSOURCES += Gda-@GDA_ABI_VERSION@.gir
@@ -367,11 +381,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 Gda-@GDA_ABI_VERSION@.typelib: Gda-@GDA_ABI_VERSION@.gir $(INTROSPECTION_COMPILER)
 	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) \
-	--includedir=$(srcdir) --includedir=. \
-	--includedir=$(srcdir)/providers-support \
-	--includedir=$(srcdir)/sql-parser \
-	--includedir=$(srcdir)/thread-wrapper \
-	--includedir=$(srcdir)/handlers \
+	--includedir=$(srcdir) \
 	$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/libgda/sql-parser/gda-statement-struct-decl.h b/libgda/sql-parser/gda-statement-struct-decl.h
index 30df061..40de039 100644
--- a/libgda/sql-parser/gda-statement-struct-decl.h
+++ b/libgda/sql-parser/gda-statement-struct-decl.h
@@ -37,7 +37,7 @@ typedef enum {
 	GDA_SQL_MALFORMED_IDENTIFIER_ERROR,
 	GDA_SQL_MISSING_IDENTIFIER_ERROR,
 	GDA_SQL_VALIDATION_ERROR
-} GdaSqlErrorType;
+} GdaSqlError;
 
 /*
  * Struct declarations
