diff --git a/Makefile b/Makefile
index afaf9133..51263e5f 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,6 @@ compositor :					\
 	compositor-drm.o			\
 	compositor-x11.o			\
 	screenshooter.o				\
-	cairo-util.o				\
 	drm.o
 
 compositor : CFLAGS += $(COMPOSITOR_CFLAGS)
diff --git a/clients/Makefile b/clients/Makefile
index f6b51ec4..cd46599e 100644
--- a/clients/Makefile
+++ b/clients/Makefile
@@ -11,12 +11,12 @@ all : $(egl_clients) $(cairo_clients)
 clean :
 	rm -f $(egl_clients) $(cairo_clients) *.o
 
-flower : flower.o window.o wayland-glib.o ../cairo-util.o
-gears : gears.o window.o wayland-glib.o ../cairo-util.o
-screenshot : screenshot.o wayland-glib.o ../cairo-util.o
-terminal : terminal.o window.o wayland-glib.o ../cairo-util.o
-image : image.o window.o wayland-glib.o ../cairo-util.o
-view : view.o window.o wayland-glib.o ../cairo-util.o
+flower : flower.o window.o wayland-glib.o cairo-util.o
+gears : gears.o window.o wayland-glib.o cairo-util.o
+screenshot : screenshot.o wayland-glib.o cairo-util.o
+terminal : terminal.o window.o wayland-glib.o cairo-util.o
+image : image.o window.o wayland-glib.o cairo-util.o
+view : view.o window.o wayland-glib.o cairo-util.o
 
 terminal : LDLIBS += -lutil
 view : CFLAGS += $(POPPLER_CFLAGS)
diff --git a/cairo-util.c b/clients/cairo-util.c
similarity index 100%
rename from cairo-util.c
rename to clients/cairo-util.c
diff --git a/cairo-util.h b/clients/cairo-util.h
similarity index 100%
rename from cairo-util.h
rename to clients/cairo-util.h
diff --git a/clients/window.c b/clients/window.c
index 00f49e20..f71bf317 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -46,7 +46,7 @@
 #include "wayland-util.h"
 #include "wayland-client.h"
 #include "wayland-glib.h"
-#include "../cairo-util.h"
+#include "cairo-util.h"
 
 #include "window.h"
 
diff --git a/compositor.c b/compositor.c
index 7ad2b682..f9324e2d 100644
--- a/compositor.c
+++ b/compositor.c
@@ -31,7 +31,6 @@
 #include <linux/input.h>
 
 #include "wayland-server-protocol.h"
-#include "cairo-util.h"
 #include "compositor.h"
 
 const char *option_background = "background.jpg";