diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index 2215c3356..cf3ea5848 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -494,7 +494,7 @@ static const GOptionEntry entries[] =
   { NULL }
 };
 
-void
+static void
 clutter_backend_x11_add_options (ClutterBackend *backend,
                                  GOptionGroup   *group)
 {
@@ -562,7 +562,7 @@ clutter_backend_x11_constructor (GType                  gtype,
   return g_object_ref (backend_singleton);
 }
 
-ClutterFeatureFlags
+static ClutterFeatureFlags
 clutter_backend_x11_get_features (ClutterBackend *backend)
 {
   return CLUTTER_FEATURE_STAGE_USER_RESIZE | CLUTTER_FEATURE_STAGE_CURSOR;
diff --git a/clutter/x11/clutter-device-manager-core-x11.c b/clutter/x11/clutter-device-manager-core-x11.c
index c9c8e93d5..4614a07a9 100644
--- a/clutter/x11/clutter-device-manager-core-x11.c
+++ b/clutter/x11/clutter-device-manager-core-x11.c
@@ -60,6 +60,8 @@ static GParamSpec *obj_props[PROP_LAST] = { NULL, };
 
 static void clutter_event_translator_iface_init (ClutterEventTranslatorIface *iface);
 
+#define clutter_device_manager_x11_get_type     _clutter_device_manager_x11_get_type
+
 G_DEFINE_TYPE_WITH_CODE (ClutterDeviceManagerX11,
                          clutter_device_manager_x11,
                          CLUTTER_TYPE_DEVICE_MANAGER,
diff --git a/clutter/x11/clutter-device-manager-core-x11.h b/clutter/x11/clutter-device-manager-core-x11.h
index 945d470fc..f0f28bc17 100644
--- a/clutter/x11/clutter-device-manager-core-x11.h
+++ b/clutter/x11/clutter-device-manager-core-x11.h
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define CLUTTER_TYPE_DEVICE_MANAGER_X11            (clutter_device_manager_x11_get_type ())
+#define CLUTTER_TYPE_DEVICE_MANAGER_X11            (_clutter_device_manager_x11_get_type ())
 #define CLUTTER_DEVICE_MANAGER_X11(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_DEVICE_MANAGER_X11, ClutterDeviceManagerX11))
 #define CLUTTER_IS_DEVICE_MANAGER_X11(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_DEVICE_MANAGER_X11))
 #define CLUTTER_DEVICE_MANAGER_X11_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_DEVICE_MANAGER_X11, ClutterDeviceManagerX11Class))
@@ -63,7 +63,7 @@ struct _ClutterDeviceManagerX11Class
   ClutterDeviceManagerClass parent_class;
 };
 
-GType clutter_device_manager_x11_get_type (void) G_GNUC_CONST;
+GType _clutter_device_manager_x11_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS