diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index 01c7c7a65..7e2603f69 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -55,6 +55,7 @@
 #include "backends/meta-output.h"
 #include "backends/x11/meta-monitor-manager-xrandr.h"
 #include "clutter/clutter.h"
+#include "core/main-private.h"
 #include "core/util-private.h"
 #include "meta/main.h"
 #include "meta/meta-x11-errors.h"
diff --git a/src/core/main-private.h b/src/core/main-private.h
index 8b48103da..be6b1cef3 100644
--- a/src/core/main-private.h
+++ b/src/core/main-private.h
@@ -37,6 +37,14 @@ typedef enum _MetaDisplayPolicy
   META_DISPLAY_POLICY_DISABLED,
 } MetaDisplayPolicy;
 
+#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
+ ((xcoord) >= (rect).x &&                   \
+  (xcoord) <  ((rect).x + (rect).width) &&  \
+  (ycoord) >= (rect).y &&                   \
+  (ycoord) <  ((rect).y + (rect).height))
+
+#define META_GRAB_OP_GET_BASE_TYPE(op) (op & 0x00FF)
+
 META_EXPORT_TEST
 void meta_override_compositor_configuration (MetaCompositorType compositor_type,
                                              GType              backend_gtype);
diff --git a/src/core/stack.c b/src/core/stack.c
index 1a05de264..1279066ff 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -32,6 +32,7 @@
 #include "backends/meta-logical-monitor.h"
 #include "cogl/cogl-trace.h"
 #include "core/frame.h"
+#include "core/main-private.h"
 #include "core/meta-workspace-manager-private.h"
 #include "core/window-private.h"
 #include "meta/group.h"
diff --git a/src/meta/common.h b/src/meta/common.h
index 294dfe25d..b282afe27 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -147,8 +147,6 @@ enum
   _WGO_N = META_GRAB_OP_WINDOW_DIR_NORTH,
 };
 
-#define META_GRAB_OP_GET_BASE_TYPE(op) (op & 0x00FF)
-
 typedef enum
 {
   META_GRAB_OP_NONE,
@@ -507,12 +505,6 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
 
 /************************************************************/
 
-#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
- ((xcoord) >= (rect).x &&                   \
-  (xcoord) <  ((rect).x + (rect).width) &&  \
-  (ycoord) >= (rect).y &&                   \
-  (ycoord) <  ((rect).y + (rect).height))
-
 /**
  * MetaStackLayer:
  * @META_LAYER_DESKTOP: Desktop layer
diff --git a/src/ui/frames.h b/src/ui/frames.h
index 555bd8e0a..b8f428f1f 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -25,6 +25,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
+#include "core/main-private.h"
 #include "meta/common.h"
 #include "meta/types.h"
 #include "ui/theme-private.h"