diff --git a/docs/meson.build b/docs/meson.build
index 105f94db6ea914d98a4783a346092ecb59e45d47..fd682a1e6e4c211817b977b90baace6b8785cdeb 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -6,6 +6,7 @@ valacapi = run_command ('valac', '--api-version')
 driver = '--driver='+valacapi.stdout().strip()
 pkgname = '--package-name='+'GXml-'+API_VERSION
 pkgversion = '--package-version='+PROJECT_VERSION
+vapidirgee = '--vapidir='+gee_vapidir
 vapidirgxml = '--vapidir='+join_paths (meson.current_source_dir (),'gxml')
 vapidirvapi = '--vapidir='+join_paths (meson.current_source_dir (),'vapi')
 docsdir = join_paths (get_option ('datadir'), 'devhelp','books')
@@ -30,6 +31,7 @@ custom_target ('libgxml-valadocs',
 			'--pkg=gio-2.0',
 			'--pkg=libxml-2.0',
 			'--pkg=gee-0.8',
+			vapidirgee,
 			vapidirgxml,
 			configvapi,
 			'--directory=@OUTDIR@',
diff --git a/gxml/meson.build b/gxml/meson.build
index f1f891b23a96a0c0a12c43e7a17f61373f9bdd9e..048dc0d980da37ef270f37c1c985b6b2871db296 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -155,7 +155,7 @@ custom_target('libgxml-typelib',
 	command: [
 		g_ir_compiler,
 		'--shared-library', 'lib'+PROJECT_NAME+'-@0@.so'.format (API_VERSION),
-		'--output', '@OUTPUT@',
+		'--output', '@OUTPUT@', '--includedir', gee_girdir,
 		join_paths(meson.current_build_dir(), GIR_NAME)
 	],
 	output: TYPELIB_NAME,
diff --git a/meson.build b/meson.build
index 4b4d640a1f39c829edd3ca13d1762cc103f3e7a4..6613fbd70e2689821d1e29a54d3493aff906fdd8 100644
--- a/meson.build
+++ b/meson.build
@@ -7,11 +7,16 @@ VERSIONED_PROJECT_NAME = PROJECT_NAME+'-'+API_VERSION
 CAMEL_CASE_NAME = 'GXml'
 VERSIONED_CAMEL_CASE_NAME = CAMEL_CASE_NAME +'-'+ API_VERSION
 
+gee = dependency('gee-0.8')
+gee_girdir = gee.get_variable('datadir') / 'gir-1.0'
+gee_vapidir = gee.get_variable('datadir') / 'vala' / 'vapi'
+add_project_arguments(['--vapidir', gee_vapidir], language: 'vala')
+
 libgxml_deps = [
 	dependency('libxml-2.0'),
 	dependency('gio-2.0'),
-	dependency('gee-0.8'),
-	meson.get_compiler('c').find_library('intl', required: false)
+	meson.get_compiler('c').find_library('intl', required: false),
+	gee
 	]
 
 VALADEPS = 'gee-0.8\ngio-2.0\nlibxml-2.0'