diff --git a/src/core/display-private.h b/src/core/display-private.h
index 58084ea6a..8b10e7e07 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -376,20 +376,6 @@ void     meta_display_set_grab_op_cursor (MetaDisplay *display,
                                           Window       grab_xwindow,
                                           guint32      timestamp);
 
-gboolean meta_display_begin_grab_op (MetaDisplay *display,
-                                     MetaScreen  *screen,
-                                     MetaWindow  *window,
-                                     MetaGrabOp   op,
-                                     gboolean     pointer_already_grabbed,
-                                     gboolean     frame_action,
-                                     int          button,
-                                     gulong       modmask,
-                                     guint32      timestamp,
-                                     int          root_x,
-                                     int          root_y);
-void     meta_display_end_grab_op   (MetaDisplay *display,
-                                     guint32      timestamp);
-
 void    meta_display_check_threshold_reached (MetaDisplay *display,
                                               int          x,
                                               int          y);
@@ -444,28 +430,6 @@ void meta_display_increment_focus_sentinel (MetaDisplay *display);
 void meta_display_decrement_focus_sentinel (MetaDisplay *display);
 gboolean meta_display_focus_sentinel_clear (MetaDisplay *display);
 
-/* meta_display_set_input_focus_window is like XSetInputFocus, except
- * that (a) it can't detect timestamps later than the current time,
- * since Metacity isn't part of the XServer, and thus gives erroneous
- * behavior in this circumstance (so don't do it), (b) it uses
- * display->last_focus_time since we don't have access to the true
- * Xserver one, (c) it makes use of display->user_time since checking
- * whether a window should be allowed to be focused should depend
- * on user_time events (see bug 167358, comment 15 in particular)
- */
-void meta_display_set_input_focus_window   (MetaDisplay *display, 
-                                            MetaWindow  *window,
-                                            gboolean     focus_frame,
-                                            guint32      timestamp);
-
-/* meta_display_focus_the_no_focus_window is called when the
- * designated no_focus_window should be focused, but is otherwise the
- * same as meta_display_set_input_focus_window
- */
-void meta_display_focus_the_no_focus_window (MetaDisplay *display, 
-                                             MetaScreen  *screen,
-                                             guint32      timestamp);
-
 void meta_display_queue_autoraise_callback  (MetaDisplay *display,
                                              MetaWindow  *window);
 void meta_display_remove_autoraise_callback (MetaDisplay *display);
diff --git a/src/include/display.h b/src/include/display.h
index 1775da3b1..472c66bd9 100644
--- a/src/include/display.h
+++ b/src/include/display.h
@@ -26,6 +26,7 @@
 #include <X11/Xlib.h>
 
 #include "types.h"
+#include "common.h"
 
 typedef enum
 {
@@ -96,4 +97,40 @@ MetaWindow* meta_display_get_tab_current (MetaDisplay   *display,
                                           MetaTabList    type,
                                           MetaScreen    *screen,
                                           MetaWorkspace *workspace);
+
+gboolean meta_display_begin_grab_op (MetaDisplay *display,
+                                     MetaScreen  *screen,
+                                     MetaWindow  *window,
+                                     MetaGrabOp   op,
+                                     gboolean     pointer_already_grabbed,
+                                     gboolean     frame_action,
+                                     int          button,
+                                     gulong       modmask,
+                                     guint32      timestamp,
+                                     int          root_x,
+                                     int          root_y);
+void     meta_display_end_grab_op   (MetaDisplay *display,
+                                     guint32      timestamp);
+/* meta_display_set_input_focus_window is like XSetInputFocus, except
+ * that (a) it can't detect timestamps later than the current time,
+ * since Metacity isn't part of the XServer, and thus gives erroneous
+ * behavior in this circumstance (so don't do it), (b) it uses
+ * display->last_focus_time since we don't have access to the true
+ * Xserver one, (c) it makes use of display->user_time since checking
+ * whether a window should be allowed to be focused should depend
+ * on user_time events (see bug 167358, comment 15 in particular)
+ */
+void meta_display_set_input_focus_window   (MetaDisplay *display,
+                                            MetaWindow  *window,
+                                            gboolean     focus_frame,
+                                            guint32      timestamp);
+
+/* meta_display_focus_the_no_focus_window is called when the
+ * designated no_focus_window should be focused, but is otherwise the
+ * same as meta_display_set_input_focus_window
+ */
+void meta_display_focus_the_no_focus_window (MetaDisplay *display,
+                                             MetaScreen  *screen,
+                                             guint32      timestamp);
+
 #endif