diff --git a/src/core/screen.c b/src/core/screen.c
index 59dd254a1..cbfcdb8f2 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -28,6 +28,7 @@
 
 #include <config.h>
 #include "screen-private.h"
+#include <meta/main.h>
 #include <meta/util.h>
 #include <meta/errors.h>
 #include "window-private.h"
diff --git a/src/meta/main.h b/src/meta/main.h
index 23beebca3..f1aab670a 100644
--- a/src/meta/main.h
+++ b/src/meta/main.h
@@ -29,6 +29,7 @@
 GOptionContext *meta_get_option_context (void);
 void            meta_init               (void);
 int             meta_run                (void);
+gboolean        meta_get_replace_current_wm (void);  /* Actually defined in util.c */
 
 typedef enum
 {
diff --git a/src/meta/util.h b/src/meta/util.h
index 096cdb3a9..d3458403c 100644
--- a/src/meta/util.h
+++ b/src/meta/util.h
@@ -36,7 +36,6 @@ gboolean meta_is_debugging (void);
 void     meta_set_debugging (gboolean setting);
 gboolean meta_is_syncing (void);
 void     meta_set_syncing (gboolean setting);
-gboolean meta_get_replace_current_wm (void);
 void     meta_set_replace_current_wm (gboolean setting);
 
 void meta_debug_spew_real (const char *format,