diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 13eefe247..0c894223d 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -47,6 +47,13 @@
 
 #include "cally/cally.h" /* For accessibility support */
 
+typedef struct
+{
+  GSourceFunc func;
+  gpointer data;
+  GDestroyNotify notify;
+} ClutterThreadsDispatch;
+
 /* main context */
 static ClutterContext *ClutterCntx       = NULL;
 
@@ -108,7 +115,7 @@ clutter_disable_accessibility (void)
   clutter_enable_accessibility = FALSE;
 }
 
-gboolean
+static gboolean
 _clutter_threads_dispatch (gpointer data)
 {
   ClutterThreadsDispatch *dispatch = data;
@@ -120,7 +127,7 @@ _clutter_threads_dispatch (gpointer data)
   return ret;
 }
 
-void
+static void
 _clutter_threads_dispatch_free (gpointer data)
 {
   ClutterThreadsDispatch *dispatch = data;
diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h
index bd0dcac69..9677395ad 100644
--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -98,17 +98,6 @@ typedef enum
   CLUTTER_IN_MAP_UNMAP   = 1 << 8,
 } ClutterPrivateFlags;
 
-/* shared between clutter-main.c and clutter-frame-source.c */
-typedef struct
-{
-  GSourceFunc func;
-  gpointer data;
-  GDestroyNotify notify;
-} ClutterThreadsDispatch;
-
-gboolean _clutter_threads_dispatch      (gpointer data);
-void     _clutter_threads_dispatch_free (gpointer data);
-
 ClutterContext *        _clutter_context_get_default                    (void);
 
 CLUTTER_EXPORT