diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index c6f54ca4a8..a42938b4aa 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -64,7 +64,7 @@ enum
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (GdkX11Screen, _gdk_x11_screen, GDK_TYPE_SCREEN)
+G_DEFINE_TYPE (GdkX11Screen, gdk_x11_screen, GDK_TYPE_SCREEN)
 
 typedef struct _NetWmSupportedAtoms NetWmSupportedAtoms;
 
@@ -86,7 +86,7 @@ struct _GdkX11Monitor
 
 
 static void
-_gdk_x11_screen_init (GdkX11Screen *screen)
+gdk_x11_screen_init (GdkX11Screen *screen)
 {
 }
 
@@ -178,7 +178,7 @@ gdk_x11_screen_dispose (GObject *object)
   if (x11_screen->root_window)
     _gdk_window_destroy (x11_screen->root_window, TRUE);
 
-  G_OBJECT_CLASS (_gdk_x11_screen_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gdk_x11_screen_parent_class)->dispose (object);
 
   x11_screen->xdisplay = NULL;
   x11_screen->xscreen = NULL;
@@ -206,7 +206,7 @@ gdk_x11_screen_finalize (GObject *object)
 
   deinit_multihead (GDK_SCREEN (object));
   
-  G_OBJECT_CLASS (_gdk_x11_screen_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gdk_x11_screen_parent_class)->finalize (object);
 }
 
 static gint
@@ -1661,7 +1661,7 @@ gdk_x11_screen_get_window_manager_name (GdkScreen *screen)
 }
 
 static void
-_gdk_x11_screen_class_init (GdkX11ScreenClass *klass)
+gdk_x11_screen_class_init (GdkX11ScreenClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GdkScreenClass *screen_class = GDK_SCREEN_CLASS (klass);
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index 6755478667..e7aeca9665 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -25,6 +25,7 @@
 #define __GDK_X11_SCREEN__
 
 #include "gdkscreenprivate.h"
+#include "gdkx11screen.h"
 #include "gdkvisual.h"
 #include "xsettings-client.h"
 #include <X11/X.h>
@@ -32,16 +33,6 @@
 
 G_BEGIN_DECLS
   
-typedef struct _GdkX11Screen GdkX11Screen;
-typedef struct _GdkX11ScreenClass GdkX11ScreenClass;
-
-#define GDK_TYPE_X11_SCREEN              (_gdk_x11_screen_get_type ())
-#define GDK_X11_SCREEN(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_SCREEN, GdkX11Screen))
-#define GDK_X11_SCREEN_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_SCREEN, GdkX11ScreenClass))
-#define GDK_IS_X11_SCREEN(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_SCREEN))
-#define GDK_IS_X11_SCREEN_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_SCREEN))
-#define GDK_X11_SCREEN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_SCREEN, GdkX11ScreenClass))
-
 typedef struct _GdkX11Monitor GdkX11Monitor;
 
 struct _GdkX11Screen
diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index f6a6130e63..3404e92af1 100644
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -38,6 +38,22 @@
 
 G_BEGIN_DECLS
 
+#define GDK_TYPE_X11_SCREEN              (gdk_x11_screen_get_type ())
+#define GDK_X11_SCREEN(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_SCREEN, GdkX11Screen))
+#define GDK_X11_SCREEN_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_SCREEN, GdkX11ScreenClass))
+#define GDK_IS_X11_SCREEN(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_SCREEN))
+#define GDK_IS_X11_SCREEN_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_SCREEN))
+#define GDK_X11_SCREEN_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_SCREEN, GdkX11ScreenClass))
+
+#ifdef GDK_COMPILATION
+typedef struct _GdkX11Screen GdkX11Screen;
+#else
+typedef GdkScreen GdkX11Screen;
+#endif
+typedef struct _GdkX11ScreenClass GdkX11ScreenClass;
+
+GType    gdk_x11_screen_get_type          (void);
+
 Screen * gdk_x11_screen_get_xscreen       (GdkScreen   *screen);
 int      gdk_x11_screen_get_screen_number (GdkScreen   *screen);