Index: clutter/clutter/clutter-backend-glx.h
===================================================================
--- clutter/clutter/clutter-backend-glx.h	(revision 473)
+++ clutter/clutter/clutter-backend-glx.h	(working copy)
@@ -33,7 +33,7 @@
 #include <GL/gl.h>
 
 gboolean
-clutter_backend_init (GOptionContext *context) G_GNUC_INTERNAL;
+clutter_backend_init (GOptionContext *context);
 
 void
 clutter_glx_trap_x_errors(void);
Index: clutter/examples/super-oh.c
===================================================================
--- clutter/examples/super-oh.c	(revision 473)
+++ clutter/examples/super-oh.c	(working copy)
@@ -1,9 +1,12 @@
 #include <clutter/clutter.h>
+#include <X11/Xlib.h>
 #include <math.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <glib.h>
 
+#include "../clutter/clutter-stage-glx.h"
+
 #define TRAILS  0
 #define NHANDS  6
 #define RADIUS  ((CLUTTER_STAGE_WIDTH()+CLUTTER_STAGE_HEIGHT())/NHANDS)
@@ -52,7 +55,7 @@
 	  ((*end == ' ') || (*end == '\0')) &&
 	  ((remote_xwindow < G_MAXULONG) || (errno != ERANGE))) 
 	{
-	  foreign_success = clutter_stage_set_xwindow_foreign 
+	  foreign_success = clutter_stage_glx_set_window_foreign
 	    (CLUTTER_STAGE(clutter_stage_get_default()), remote_xwindow);
         }
     }