diff --git a/contrib/girwrap/APILookup.txt b/contrib/girwrap/APILookup.txt
index 95d422b..a2e1e36 100644
--- a/contrib/girwrap/APILookup.txt
+++ b/contrib/girwrap/APILookup.txt
@@ -115,9 +115,7 @@ alias: GLIB_SYSDEF_POLLNVAL =32
 ### predifined: lib
 ###########################################################
 
-inputRoot: invalid
 srcDir: .
-bindDir: gi
 
 lookup: APILookupAppStream.txt
 lookup: APILookupGLib.txt
diff --git a/contrib/girwrap/APILookupAppStream.txt b/contrib/girwrap/APILookupAppStream.txt
index 92e56f2..36cbec8 100644
--- a/contrib/girwrap/APILookupAppStream.txt
+++ b/contrib/girwrap/APILookupAppStream.txt
@@ -20,12 +20,12 @@
 
 # must start with wrap
 wrap: appstream
-file: /usr/share/gir-1.0/AppStream-1.0.gir
+file: AppStream-1.0.gir
 
 addAliases: start
-	public import gi.glibtypes;
-	public import gi.gobjecttypes;
-	public import gi.giotypes;
+	public import glib.c.types;
+	public import gobject.c.types;
+	public import gio.c.types;
 
 	public import core.stdc.stdio;
 	public import core.stdc.string;
diff --git a/contrib/girwrap/APILookupGLib.txt b/contrib/girwrap/APILookupGLib.txt
index 1193331..39f8c09 100644
--- a/contrib/girwrap/APILookupGLib.txt
+++ b/contrib/girwrap/APILookupGLib.txt
@@ -20,8 +20,8 @@
 
 # must start with wrap
 wrap: glib
-file: /usr/share/gir-1.0/GLib-2.0.gir
-file: /usr/share/gir-1.0/GModule-2.0.gir
+file: GLib-2.0.gir
+file: GModule-2.0.gir
 
 addAliases: start
 	public alias uint uid_t;
@@ -117,7 +117,7 @@ addAliases: start
 
 	Type* gMalloc(Type)()
 	{
-		import gi.glib;
+		import glib.c.functions;
 		return cast(Type*)g_malloc0(Type.sizeof);
 	}
 
@@ -1076,7 +1076,7 @@ code: end
 struct: Str
 import: core.stdc.stdio
 import: core.stdc.string
-import: gi.gobjecttypes
+import: gobject.c.types
 code: start
 	/*
 	 * Convert C-style 0 terminated string s to char[] string.
diff --git a/contrib/girwrap/APILookupGObject.txt b/contrib/girwrap/APILookupGObject.txt
index 2c10df6..07b42f6 100644
--- a/contrib/girwrap/APILookupGObject.txt
+++ b/contrib/girwrap/APILookupGObject.txt
@@ -24,7 +24,7 @@ wrap: gobject
 file: GObject-2.0.gir
 
 addAliases: start
-	public import gi.glibtypes;
+	public import glib.c.types;
 addAliases: end
 
 noAlias: Type
diff --git a/contrib/girwrap/APILookupGio.txt b/contrib/girwrap/APILookupGio.txt
index c741980..ab4a96c 100644
--- a/contrib/girwrap/APILookupGio.txt
+++ b/contrib/girwrap/APILookupGio.txt
@@ -20,11 +20,11 @@
 
 # must start with wrap
 wrap: gio
-file: /usr/share/gir-1.0/Gio-2.0.gir
+file: Gio-2.0.gir
 
 addAliases: start
-	public import gi.glibtypes;
-	public import gi.gobjecttypes;
+	public import glib.c.types;
+	public import gobject.c.types;
 addAliases: end
 
 struct:
diff --git a/src/asgen/bindings/appstream_utils.d b/src/asgen/bindings/appstream_utils.d
index 13d7816..315c14c 100644
--- a/src/asgen/bindings/appstream_utils.d
+++ b/src/asgen/bindings/appstream_utils.d
@@ -19,7 +19,7 @@
 
 module asgen.bindings.appstream_utils;
 
-import gi.appstreamtypes;
+import appstream.c.types;
 
 extern(C):
 nothrow:
diff --git a/src/asgen/bindings/gdkpixbuf.d b/src/asgen/bindings/gdkpixbuf.d
index 40e22be..6bea269 100644
--- a/src/asgen/bindings/gdkpixbuf.d
+++ b/src/asgen/bindings/gdkpixbuf.d
@@ -19,8 +19,8 @@
 
 module asgen.bindings.gdkpixbuf;
 
-import gi.glibtypes;
-import gi.giotypes;
+import glib.c.types;
+import gio.c.types;
 import asgen.bindings.cairo;
 
 extern(C):
diff --git a/src/asgen/bindings/rsvg.d b/src/asgen/bindings/rsvg.d
index 430e4b3..4a89ef4 100644
--- a/src/asgen/bindings/rsvg.d
+++ b/src/asgen/bindings/rsvg.d
@@ -19,7 +19,7 @@
 
 module asgen.bindings.rsvg;
 
-import gi.glibtypes;
+import glib.c.types;
 import asgen.bindings.cairo;
 
 extern(C):
diff --git a/src/asgen/config.d b/src/asgen/config.d
index ac4c9be..d6a07ac 100644
--- a/src/asgen/config.d
+++ b/src/asgen/config.d
@@ -28,7 +28,7 @@ import std.json;
 import std.typecons;
 static import std.file;
 
-public import gi.appstreamtypes : FormatVersion;
+public import appstream.c.types : FormatVersion;
 
 import asgen.utils : existsAndIsDir, randomString;
 import asgen.logging;
diff --git a/src/asgen/handlers/screenshothandler.d b/src/asgen/handlers/screenshothandler.d
index c397ee0..23a3a20 100644
--- a/src/asgen/handlers/screenshothandler.d
+++ b/src/asgen/handlers/screenshothandler.d
@@ -26,7 +26,7 @@ import std.array : empty;
 import std.algorithm : startsWith;
 import std.stdio;
 import gobject.ObjectG;
-import gi.appstream;
+import appstream.c.functions;
 import appstream.Component;
 import appstream.Screenshot;
 import appstream.Image;
diff --git a/src/asgen/image.d b/src/asgen/image.d
index 5b78b9f..2dee086 100644
--- a/src/asgen/image.d
+++ b/src/asgen/image.d
@@ -31,8 +31,8 @@ import asgen.bindings.cairo;
 import asgen.bindings.rsvg;
 import asgen.bindings.gdkpixbuf;
 
-import gi.glibtypes;
-import gi.glib;
+import glib.c.types;
+import glib.c.functions;
 
 import asgen.logging;
 import asgen.config;
@@ -132,7 +132,7 @@ public:
 
     this (ubyte[] imgBytes, ImageFormat ikind)
     {
-        import gi.gio;
+        import gio.c.functions;
         import gio.MemoryInputStream;
 
         auto istream = new MemoryInputStream ();
diff --git a/src/asgen/result.d b/src/asgen/result.d
index 799dd37..b28dd72 100644
--- a/src/asgen/result.d
+++ b/src/asgen/result.d
@@ -299,7 +299,7 @@ public:
             auto customHashTable = cpt.getCustom ();
             auto noCustomKeysAllowed = conf.allowedCustomKeys.length == 0;
             if (customHashTable.size > 0) {
-                import gi.glibtypes;
+                import glib.c.types;
 
                 if (noCustomKeysAllowed) {
                     // if we don't allow any custom keys, we can delete them faster