diff --git a/gio/giotypes.h b/gio/giotypes.h
index 980f3e311..c6b080661 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -43,11 +43,14 @@ typedef struct _GConverter                    GConverter;
 typedef struct _GConverterInputStream         GConverterInputStream;
 typedef struct _GConverterOutputStream        GConverterOutputStream;
 typedef struct _GDataInputStream              GDataInputStream;
-typedef struct _GPermission                   GPermission;
 typedef struct _GSimplePermission             GSimplePermission;
 typedef struct _GZlibCompressor               GZlibCompressor;
 typedef struct _GZlibDecompressor             GZlibDecompressor;
 
+typedef struct _GSettingsBackend              GSettingsBackend;
+typedef struct _GSettings                     GSettings;
+typedef struct _GPermission                   GPermission;
+
 /**
  * GDrive:
  *
diff --git a/gio/gsettings.h b/gio/gsettings.h
index aad224e64..07c03911b 100644
--- a/gio/gsettings.h
+++ b/gio/gsettings.h
@@ -26,7 +26,7 @@
 #ifndef __G_SETTINGS_H__
 #define __G_SETTINGS_H__
 
-#include <glib-object.h>
+#include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
@@ -42,7 +42,6 @@ G_BEGIN_DECLS
 
 typedef struct _GSettingsPrivate                            GSettingsPrivate;
 typedef struct _GSettingsClass                              GSettingsClass;
-typedef struct _GSettings                                   GSettings;
 
 struct _GSettingsClass
 {
diff --git a/gio/gsettingsbackend.h b/gio/gsettingsbackend.h
index 7fdd4e445..47456a3a3 100644
--- a/gio/gsettingsbackend.h
+++ b/gio/gsettingsbackend.h
@@ -60,8 +60,6 @@ G_BEGIN_DECLS
  **/
 typedef struct _GSettingsBackendPrivate                     GSettingsBackendPrivate;
 typedef struct _GSettingsBackendClass                       GSettingsBackendClass;
-typedef struct _GSettingsBackend                            GSettingsBackend;
-
 
 struct _GSettingsBackendClass
 {