diff --git a/ChangeLog b/ChangeLog
index e7f3e18be..4ec503d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 24 13:09:49 2006  Søren Sandmann  <sandmann@redhat.com>
+
+	* src/c-window.c: Fix compilation in the non-composited case.
+
 Wed May 24 12:57:32 2006  Søren Sandmann  <sandmann@redhat.com>
 
 	* src/c-window.c (meta_comp_window_free): return TRUE when the
diff --git a/src/c-window.c b/src/c-window.c
index b6f5995a6..7fe8523c0 100644
--- a/src/c-window.c
+++ b/src/c-window.c
@@ -632,8 +632,6 @@ meta_comp_window_explode (MetaCompWindow *comp_window,
     g_idle_add (update_explosion, info);
 }
 
-#endif
-
 /* new shrinkydink code */
 
 #define SHRINK_TIME 1.0
@@ -683,6 +681,8 @@ meta_comp_window_shrink (MetaCompWindow *comp_window,
     g_idle_add (update_shrink, info);
 }
 
+#endif
+
 #if 0
 /* old shrinkydink minimize effect */
 
diff --git a/src/compositor.c b/src/compositor.c
index 1be021f74..46f47b42e 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -105,6 +105,8 @@ get_xid (MetaWindow *window)
 	return window->xwindow;
 }
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+
 static void
 do_effect (MetaEffect *effect,
 	   gpointer data)
@@ -153,6 +155,8 @@ do_effect (MetaEffect *effect,
     }
 }
 
+#endif /* HAVE_COMPOSITE_EXTENSIONS */
+
 MetaCompositor *
 meta_compositor_new (MetaDisplay *display)
 {