diff --git a/ChangeLog b/ChangeLog
index cdc4f1e56..ba1fafbb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb  7 00:58:05 2006  Soeren Sandmann  <sandmann@redhat.com>
+
+	* src/compositor.c: Wrap fade code in #ifdef HAVE_COMPOSITE_EXTENSIONS
+
 Mon Feb  6 17:45:39 2006  Søren Sandmann  <sandmann@redhat.com>
 
 	* src/compositor.c: New fancy minimize animation. Fade windows in
diff --git a/src/compositor.c b/src/compositor.c
index 50eda16fe..fbb05b899 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -285,6 +285,7 @@ process_expose (MetaCompositor     *compositor,
 
 #endif /* HAVE_COMPOSITE_EXTENSIONS */
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
 static void queue_repaint (CmDrawableNode *node, gpointer data);
 
 typedef struct
@@ -348,6 +349,7 @@ fade_out (gpointer data)
 	return TRUE;
     }
 }
+#endif
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
 static void