diff --git a/ChangeLog b/ChangeLog
index 1fb302ce1..f90140d04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-11  Elijah Newren  <newren gmail com>
+
+	* src/compositor.c: Patch from Bruno Boaventura de Oliveira
+	Lacerda to fix warnings about unused function and global var.
+	#355489.
+
 2006-09-11  Thomas Thurman <thomas@thurman.org.uk>
 
 	* configure.in: post-release bump to 2.16.2
diff --git a/src/compositor.c b/src/compositor.c
index 22d7cefa9..613c703c7 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -96,6 +96,8 @@ handle_error (Display *dpy, XErrorEvent *ev, gpointer data)
 }
 #endif
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+
 static Window
 get_xid (MetaWindow *window)
 {
@@ -105,6 +107,8 @@ get_xid (MetaWindow *window)
 	return window->xwindow;
 }
 
+#endif /* HAVE_COMPOSITE_EXTENSIONS */
+
 #ifdef HAVE_COMPOSITE_EXTENSIONS
 
 static void
@@ -551,7 +555,9 @@ meta_compositor_process_event (MetaCompositor *compositor,
 #endif /* HAVE_COMPOSITE_EXTENSIONS */
 }
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
 static GTimer *timer;
+#endif /* HAVE_COMPOSITE_EXTENSIONS */
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
 static void