diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 803d85f5bb..d26ce76b5e 100644
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -38,6 +38,25 @@
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>		/* For CARD16 */
 
+typedef struct _XSettingsBuffer  XSettingsBuffer;
+
+typedef enum
+{
+  XSETTINGS_SUCCESS,
+  XSETTINGS_ACCESS,
+  XSETTINGS_FAILED,
+  XSETTINGS_NO_ENTRY,
+  XSETTINGS_DUPLICATE_ENTRY
+} XSettingsResult;
+
+struct _XSettingsBuffer
+{
+  char byte_order;
+  size_t len;
+  unsigned char *data;
+  unsigned char *pos;
+};
+
 struct _XSettingsClient
 {
   GdkScreen *screen;
diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h
index 6bb2dbcb96..298950b11d 100644
--- a/gdk/x11/xsettings-client.h
+++ b/gdk/x11/xsettings-client.h
@@ -26,10 +26,6 @@
 #include <gdk/gdkscreen.h>
 #include <X11/Xlib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* Renames for GDK inclusion */
 
 #define xsettings_client_destroy         _gdk_x11_xsettings_client_destroy
@@ -39,7 +35,6 @@ extern "C" {
 #define xsettings_setting_equal          _gdk_x11_xsettings_setting_equal
 #define xsettings_setting_free           _gdk_x11_xsettings_setting_free
 
-typedef struct _XSettingsBuffer  XSettingsBuffer;
 typedef struct _XSettingsColor   XSettingsColor;
 typedef struct _XSettingsSetting XSettingsSetting;
 typedef struct _XSettingsClient XSettingsClient;
@@ -61,23 +56,6 @@ typedef enum
   XSETTINGS_ACTION_DELETED
 } XSettingsAction;
 
-typedef enum
-{
-  XSETTINGS_SUCCESS,
-  XSETTINGS_ACCESS,
-  XSETTINGS_FAILED,
-  XSETTINGS_NO_ENTRY,
-  XSETTINGS_DUPLICATE_ENTRY
-} XSettingsResult;
-
-struct _XSettingsBuffer
-{
-  char byte_order;
-  size_t len;
-  unsigned char *data;
-  unsigned char *pos;
-};
-
 struct _XSettingsColor
 {
   unsigned short red, green, blue, alpha;
@@ -119,8 +97,4 @@ const XSettingsSetting *
                  xsettings_client_get_setting     (XSettingsClient     *client,
 						   const char          *name);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* XSETTINGS_CLIENT_H */