diff --git a/tests/interactive/test-cogl-offscreen.c b/tests/interactive/test-cogl-offscreen.c
index b8073ba42..76338a757 100644
--- a/tests/interactive/test-cogl-offscreen.c
+++ b/tests/interactive/test-cogl-offscreen.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
diff --git a/tests/interactive/test-cogl-primitives.c b/tests/interactive/test-cogl-primitives.c
index 37ad4b434..e9ecf987c 100644
--- a/tests/interactive/test-cogl-primitives.c
+++ b/tests/interactive/test-cogl-primitives.c
@@ -1,10 +1,10 @@
-#include <config.h>
-#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
-#include <clutter/clutter.h>
+
+#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <cogl/cogl.h>
+#include <clutter/clutter.h>
 
 typedef void (*PaintFunc) (void);
 
diff --git a/tests/interactive/test-cogl-tex-convert.c b/tests/interactive/test-cogl-tex-convert.c
index 271ee9f36..fe6ad79de 100644
--- a/tests/interactive/test-cogl-tex-convert.c
+++ b/tests/interactive/test-cogl-tex-convert.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
diff --git a/tests/interactive/test-cogl-tex-foreign.c b/tests/interactive/test-cogl-tex-foreign.c
index a07fb121c..3f059b92e 100644
--- a/tests/interactive/test-cogl-tex-foreign.c
+++ b/tests/interactive/test-cogl-tex-foreign.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
diff --git a/tests/interactive/test-cogl-tex-getset.c b/tests/interactive/test-cogl-tex-getset.c
index ffada94c1..20cf08167 100644
--- a/tests/interactive/test-cogl-tex-getset.c
+++ b/tests/interactive/test-cogl-tex-getset.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
diff --git a/tests/interactive/test-cogl-tex-polygon.c b/tests/interactive/test-cogl-tex-polygon.c
index 1c3b1be56..05c8b8bcb 100644
--- a/tests/interactive/test-cogl-tex-polygon.c
+++ b/tests/interactive/test-cogl-tex-polygon.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
diff --git a/tests/interactive/test-cogl-tex-tile.c b/tests/interactive/test-cogl-tex-tile.c
index 6b16d33d5..37eb864cd 100644
--- a/tests/interactive/test-cogl-tex-tile.c
+++ b/tests/interactive/test-cogl-tex-tile.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
diff --git a/tests/interactive/test-cogl-vertex-buffer.c b/tests/interactive/test-cogl-vertex-buffer.c
index 8d134475d..c1fa1b52f 100644
--- a/tests/interactive/test-cogl-vertex-buffer.c
+++ b/tests/interactive/test-cogl-vertex-buffer.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glib.h>
 #include <gmodule.h>
 #include <stdlib.h>
diff --git a/tests/interactive/test-paint-wrapper.c b/tests/interactive/test-paint-wrapper.c
index e97c097d5..45a52efb9 100644
--- a/tests/interactive/test-paint-wrapper.c
+++ b/tests/interactive/test-paint-wrapper.c
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <gmodule.h>
 
 #undef CLUTTER_DISABLE_DEPRECATED
@@ -16,7 +12,7 @@
 #include <stdlib.h>
 #include <glib.h>
 
-#ifdef HAVE_CLUTTER_GLX
+#ifdef CLUTTER_WINDOWING_X11
 #include "clutter/x11/clutter-x11.h"
 #endif
 
@@ -205,7 +201,7 @@ test_paint_wrapper_main (int argc, char *argv[])
 
   error = NULL;
 
-#ifdef HAVE_CLUTTER_GLX
+#ifdef CLUTTER_WINDOWING_X11
   clutter_x11_set_use_argb_visual (TRUE);
 #endif
 
diff --git a/tests/interactive/test-pixmap.c b/tests/interactive/test-pixmap.c
index 366865432..54d1a7c51 100644
--- a/tests/interactive/test-pixmap.c
+++ b/tests/interactive/test-pixmap.c
@@ -1,4 +1,6 @@
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -7,16 +9,16 @@
 #undef CLUTTER_DISABLE_DEPRECATED
 #include <clutter/clutter.h>
 
-#if HAVE_CLUTTER_GLX
+#ifdef CLUTTER_WINDOWING_X11
 
-#include <clutter/x11/clutter-x11.h>
-#include <clutter/x11/clutter-x11-texture-pixmap.h>
+# include <clutter/x11/clutter-x11.h>
+# include <clutter/x11/clutter-x11-texture-pixmap.h>
 
-#include <clutter/glx/clutter-glx.h>
-#include <clutter/glx/clutter-glx-texture-pixmap.h>
+# include <clutter/glx/clutter-glx.h>
+# include <clutter/glx/clutter-glx-texture-pixmap.h>
 
-#include <X11/Xlib.h>
-#include <X11/extensions/Xcomposite.h>
+# include <X11/Xlib.h>
+# include <X11/extensions/Xcomposite.h>
 
 #define IMAGE   TESTS_DATADIR G_DIR_SEPARATOR_S "redhand.png"
 
@@ -320,7 +322,7 @@ test_pixmap_main (int argc, char **argv)
         clutter_behaviour_apply (depth_behavior, group);
     }
 
-#ifdef HAVE_CLUTTER_GLX
+#ifdef CLUTTER_WINDOWING_GLX
   /* a window with glx */
   if (!disable_glx)
     {
@@ -347,7 +349,7 @@ test_pixmap_main (int argc, char **argv)
 				      CLUTTER_GLX_TEXTURE_PIXMAP (tex)))
 	g_print ("NOTE: Using fallback path, not GLX TFP!\n");
     }
-#endif /* HAVE_CLUTTER_GLX */
+#endif /* CLUTTER_WINDOWING_GLX */
 
   if (group)
     row_height = clutter_actor_get_height (group);
@@ -400,6 +402,12 @@ test_pixmap_main (int argc, char **argv)
   return EXIT_SUCCESS;
 }
 
-#else /* HAVE_CLUTTER_GLX */
-int test_pixmap_main (int argc, char **argv) { return EXIT_SUCCESS; };
-#endif /* HAVE_CLUTTER_GLX */
+#else
+
+int
+test_pixmap_main (int argc, char **argv)
+{
+  return EXIT_SUCCESS;
+};
+
+#endif /* CLUTTER_WINDOWING_X11 */
diff --git a/tests/interactive/test-textures.c b/tests/interactive/test-textures.c
index 58a601d58..fba4736bd 100644
--- a/tests/interactive/test-textures.c
+++ b/tests/interactive/test-textures.c
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <gmodule.h>