diff --git a/girepository/giarginfo.h b/girepository/giarginfo.h
index 2b6060741..f6edd4065 100644
--- a/girepository/giarginfo.h
+++ b/girepository/giarginfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gibaseinfo.h b/girepository/gibaseinfo.h
index 2ec299b9a..f9ef0f49c 100644
--- a/girepository/gibaseinfo.h
+++ b/girepository/gibaseinfo.h
@@ -30,8 +30,8 @@
 #endif
 
 #include <glib-object.h>
-#include <gitypelib.h>
-#include <gitypes.h>
+#include <girepository/gitypelib.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c
index d90efb6a4..a4c639c77 100644
--- a/girepository/gicallableinfo.c
+++ b/girepository/gicallableinfo.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 #include "girffi.h"
diff --git a/girepository/gicallableinfo.h b/girepository/gicallableinfo.h
index 6c5529d06..5c04e0d3d 100644
--- a/girepository/gicallableinfo.h
+++ b/girepository/gicallableinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/giconstantinfo.c b/girepository/giconstantinfo.c
index 03d583386..891b61aaf 100644
--- a/girepository/giconstantinfo.c
+++ b/girepository/giconstantinfo.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <string.h> // memcpy
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/giconstantinfo.h b/girepository/giconstantinfo.h
index 8be63f10e..8bd12a93e 100644
--- a/girepository/giconstantinfo.h
+++ b/girepository/giconstantinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gienuminfo.c b/girepository/gienuminfo.c
index a33afa219..2f4cbfaaf 100644
--- a/girepository/gienuminfo.c
+++ b/girepository/gienuminfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/gienuminfo.h b/girepository/gienuminfo.h
index f14316631..e84d80d92 100644
--- a/girepository/gienuminfo.h
+++ b/girepository/gienuminfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gifieldinfo.c b/girepository/gifieldinfo.c
index b1a244426..6c0a94176 100644
--- a/girepository/gifieldinfo.c
+++ b/girepository/gifieldinfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 #include "config.h"
diff --git a/girepository/gifieldinfo.h b/girepository/gifieldinfo.h
index b2fdff11a..5352b4c74 100644
--- a/girepository/gifieldinfo.h
+++ b/girepository/gifieldinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gifunctioninfo.c b/girepository/gifunctioninfo.c
index 5ba3d3654..6b1329fc0 100644
--- a/girepository/gifunctioninfo.c
+++ b/girepository/gifunctioninfo.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/gifunctioninfo.h b/girepository/gifunctioninfo.h
index f6da74ac6..2827f7f8c 100644
--- a/girepository/gifunctioninfo.h
+++ b/girepository/gifunctioninfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/giinterfaceinfo.c b/girepository/giinterfaceinfo.c
index 82b9906db..037a89cfd 100644
--- a/girepository/giinterfaceinfo.c
+++ b/girepository/giinterfaceinfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/giinterfaceinfo.h b/girepository/giinterfaceinfo.h
index 18f6fe112..ee8a18f00 100644
--- a/girepository/giinterfaceinfo.h
+++ b/girepository/giinterfaceinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/ginvoke.c b/girepository/ginvoke.c
index 4acdde97d..ad9a5f8c6 100644
--- a/girepository/ginvoke.c
+++ b/girepository/ginvoke.c
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girffi.h"
 
 /**
diff --git a/girepository/giobjectinfo.c b/girepository/giobjectinfo.c
index a7ffefd62..7943936eb 100644
--- a/girepository/giobjectinfo.c
+++ b/girepository/giobjectinfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/giobjectinfo.h b/girepository/giobjectinfo.h
index ef14fce0b..8c51144a9 100644
--- a/girepository/giobjectinfo.h
+++ b/girepository/giobjectinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gipropertyinfo.c b/girepository/gipropertyinfo.c
index c43a6b236..f9c6aa166 100644
--- a/girepository/gipropertyinfo.c
+++ b/girepository/gipropertyinfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/gipropertyinfo.h b/girepository/gipropertyinfo.h
index 828d07004..48aa8365b 100644
--- a/girepository/gipropertyinfo.h
+++ b/girepository/gipropertyinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/giregisteredtypeinfo.c b/girepository/giregisteredtypeinfo.c
index 841a55370..ac8e31adb 100644
--- a/girepository/giregisteredtypeinfo.c
+++ b/girepository/giregisteredtypeinfo.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/giregisteredtypeinfo.h b/girepository/giregisteredtypeinfo.h
index 2b3e185bf..9a6a18ac9 100644
--- a/girepository/giregisteredtypeinfo.h
+++ b/girepository/giregisteredtypeinfo.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/girepository-private.h b/girepository/girepository-private.h
index 1cfa87b7f..32978365f 100644
--- a/girepository/girepository-private.h
+++ b/girepository/girepository-private.h
@@ -29,9 +29,9 @@
 
 #define __GIREPOSITORY_H_INSIDE__
 
-#include <gibaseinfo.h>
-#include <girepository.h>
-#include <gitypelib.h>
+#include <girepository/gibaseinfo.h>
+#include <girepository/girepository.h>
+#include <girepository/gitypelib.h>
 
 typedef struct _GIRealInfo GIRealInfo;
 
diff --git a/girepository/gisignalinfo.c b/girepository/gisignalinfo.c
index 349797809..2c2164ac0 100644
--- a/girepository/gisignalinfo.c
+++ b/girepository/gisignalinfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/gisignalinfo.h b/girepository/gisignalinfo.h
index b14e30fbd..cb0fc3ce5 100644
--- a/girepository/gisignalinfo.h
+++ b/girepository/gisignalinfo.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <glib-object.h>
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gistructinfo.c b/girepository/gistructinfo.c
index ddf07ab75..18a14a15f 100644
--- a/girepository/gistructinfo.c
+++ b/girepository/gistructinfo.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/gistructinfo.h b/girepository/gistructinfo.h
index d64c34679..589ba659d 100644
--- a/girepository/gistructinfo.h
+++ b/girepository/gistructinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gitypeinfo.c b/girepository/gitypeinfo.c
index 24d846308..f90e325a7 100644
--- a/girepository/gitypeinfo.c
+++ b/girepository/gitypeinfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/gitypeinfo.h b/girepository/gitypeinfo.h
index 2dd0275c7..4b2e51a11 100644
--- a/girepository/gitypeinfo.h
+++ b/girepository/gitypeinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/gitypelib.h b/girepository/gitypelib.h
index b3da4bf19..136286b16 100644
--- a/girepository/gitypelib.h
+++ b/girepository/gitypelib.h
@@ -31,7 +31,7 @@
 
 #include <glib.h>
 
-#include <gi-visibility.h>
+#include <girepository/gi-visibility.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/giunioninfo.c b/girepository/giunioninfo.c
index 56604a0b9..cafb74a30 100644
--- a/girepository/giunioninfo.c
+++ b/girepository/giunioninfo.c
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/giunioninfo.h b/girepository/giunioninfo.h
index bacfed8e0..32173b078 100644
--- a/girepository/giunioninfo.h
+++ b/girepository/giunioninfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/girepository/givfuncinfo.c b/girepository/givfuncinfo.c
index d6c0f6636..14a03ea2e 100644
--- a/girepository/givfuncinfo.c
+++ b/girepository/givfuncinfo.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include <girepository.h>
+#include <girepository/girepository.h>
 #include "girepository-private.h"
 #include "gitypelib-internal.h"
 
diff --git a/girepository/givfuncinfo.h b/girepository/givfuncinfo.h
index 45f1acd1a..288afec9f 100644
--- a/girepository/givfuncinfo.h
+++ b/girepository/givfuncinfo.h
@@ -29,7 +29,7 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
-#include <gitypes.h>
+#include <girepository/gitypes.h>
 
 G_BEGIN_DECLS