--- clutter/cogl/clutter-stage-cogl.c.bak	2011-07-21 22:36:40.293707433 +0200
+++ clutter/cogl/clutter-stage-cogl.c	2011-07-21 22:38:09.751705331 +0200
@@ -124,7 +124,7 @@
 #ifdef COGL_HAS_XLIB_SUPPORT
   if (stage_x11->xwin != None)
     {
-      cogl_onscreen_x11_set_foreign_window_xid (stage_cogl->onscreen,
+      cogl_x11_onscreen_set_foreign_window_xid (stage_cogl->onscreen,
                                                 stage_x11->xwin,
                                                 _clutter_stage_x11_update_foreign_event_mask,
                                                 stage_x11);
@@ -160,7 +160,7 @@
 
 #ifdef COGL_HAS_XLIB_SUPPORT
   if (stage_x11->xwin == None)
-    stage_x11->xwin = cogl_onscreen_x11_get_window_xid (stage_cogl->onscreen);
+    stage_x11->xwin = cogl_x11_onscreen_get_window_xid (stage_cogl->onscreen);
 
   return clutter_stage_window_parent_iface->realize (stage_window);
 #else