diff --git a/clients/window.c b/clients/window.c
index a3874e10..c77a8ce0 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -198,7 +198,7 @@ display_get_image_for_drm_surface(struct display *display,
 	return data->image;
 }
 
-cairo_surface_t *
+static cairo_surface_t *
 display_create_drm_surface(struct display *display,
 			   struct rectangle *rectangle)
 {
@@ -251,7 +251,7 @@ display_create_drm_surface(struct display *display,
 	return surface;
 }
 
-cairo_surface_t *
+static cairo_surface_t *
 display_create_drm_surface_from_file(struct display *display,
 				     const char *filename,
 				     struct rectangle *rect)
@@ -326,7 +326,7 @@ struct shm_surface_data {
 	size_t length;
 };
 
-void
+static void
 shm_surface_data_destroy(void *p)
 {
 	struct shm_surface_data *data = p;
@@ -335,7 +335,7 @@ shm_surface_data_destroy(void *p)
 	munmap(data->map, data->length);
 }
 
-cairo_surface_t *
+static cairo_surface_t *
 display_create_shm_surface(struct display *display,
 			   struct rectangle *rectangle)
 {
@@ -394,7 +394,7 @@ display_create_shm_surface(struct display *display,
 	return surface;
 }
 
-cairo_surface_t *
+static cairo_surface_t *
 display_create_shm_surface_from_file(struct display *display,
 				     const char *filename,
 				     struct rectangle *rect)
@@ -459,7 +459,7 @@ display_create_surface(struct display *display,
 #endif
 }
 
-cairo_surface_t *
+static cairo_surface_t *
 display_create_surface_from_file(struct display *display,
 				 const char *filename,
 				 struct rectangle *rectangle)
diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c
index 3ac8c5f1..c64944c2 100644
--- a/compositor/compositor-wayland.c
+++ b/compositor/compositor-wayland.c
@@ -181,7 +181,6 @@ wayland_compositor_present(struct wlsc_compositor *base)
 {
 	struct wayland_compositor *c = (struct wayland_compositor *) base;
 	struct wayland_output *output;
-	uint32_t msec;
 
 	glFlush();
 
diff --git a/compositor/compositor.c b/compositor/compositor.c
index f993bf63..ee5b9aa6 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -16,6 +16,8 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#define _GNU_SOURCE
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/wayland/wayland-server.h b/wayland/wayland-server.h
index 98a1a6c0..f2b9297f 100644
--- a/wayland/wayland-server.h
+++ b/wayland/wayland-server.h
@@ -74,7 +74,7 @@ int wl_event_loop_dispatch(struct wl_event_loop *loop, int timeout);
 struct wl_event_source *wl_event_loop_add_idle(struct wl_event_loop *loop,
 					       wl_event_loop_idle_func_t func,
 					       void *data);
-int wl_event_get_fd(struct wl_event_loop *loop);
+int wl_event_loop_get_fd(struct wl_event_loop *loop);
 
 struct wl_client;
 struct wl_display;