diff --git a/clients/config.c b/clients/config.c
index 5680d5070..69edbc62f 100644
--- a/clients/config.c
+++ b/clients/config.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <window.h>
+#include "window.h"
 
 static int
 handle_key(const struct config_key *key, const char *value)
diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index adf3a5c0d..3cca520f1 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -32,11 +32,11 @@
 #include <sys/wait.h>
 #include <linux/input.h>
 
-#include "wayland-client.h"
+#include <wayland-client.h>
 #include "cairo-util.h"
 #include "window.h"
 
-#include <desktop-shell-client-protocol.h>
+#include "desktop-shell-client-protocol.h"
 
 struct desktop {
 	struct display *display;
diff --git a/clients/dnd.c b/clients/dnd.c
index 5bfe31cd2..db794fdaa 100644
--- a/clients/dnd.c
+++ b/clients/dnd.c
@@ -32,7 +32,7 @@
 #include <sys/epoll.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "wayland-client.h"
+#include <wayland-client.h>
 
 #include "window.h"
 #include "cairo-util.h"
diff --git a/clients/flower.c b/clients/flower.c
index 5ad58f13e..7743b44e3 100644
--- a/clients/flower.c
+++ b/clients/flower.c
@@ -33,7 +33,7 @@
 #include <sys/time.h>
 #include <glib.h>
 
-#include "wayland-client.h"
+#include <wayland-client.h>
 #include "window.h"
 
 static void
diff --git a/clients/gears.c b/clients/gears.c
index 6af505b2c..1f3ab7d8f 100644
--- a/clients/gears.c
+++ b/clients/gears.c
@@ -37,7 +37,7 @@
 #include <EGL/eglext.h>
 
 #include "wayland-util.h"
-#include "wayland-client.h"
+#include <wayland-client.h>
 
 #include "window.h"
 
diff --git a/clients/image.c b/clients/image.c
index 51ce1f05d..13115d25d 100644
--- a/clients/image.c
+++ b/clients/image.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "wayland-client.h"
+#include <wayland-client.h>
 
 #include "window.h"
 
diff --git a/clients/resizor.c b/clients/resizor.c
index e48095fb9..ede9429c5 100644
--- a/clients/resizor.c
+++ b/clients/resizor.c
@@ -28,7 +28,7 @@
 #include <math.h>
 
 #include "wayland-util.h"
-#include "wayland-client.h"
+#include <wayland-client.h>
 
 #include "window.h"
 
diff --git a/clients/screenshot.c b/clients/screenshot.c
index 124e576a5..bfe5ea058 100644
--- a/clients/screenshot.c
+++ b/clients/screenshot.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "wayland-client.h"
+#include <wayland-client.h>
 #include "screenshooter-client-protocol.h"
 
 /* The screenshooter is a good example of a custom object exposed by
diff --git a/clients/smoke.c b/clients/smoke.c
index 061bd6da7..6ceade058 100644
--- a/clients/smoke.c
+++ b/clients/smoke.c
@@ -32,7 +32,7 @@
 #include <cairo.h>
 #include <glib.h>
 
-#include "wayland-client.h"
+#include <wayland-client.h>
 #include "window.h"
 
 struct smoke {
diff --git a/clients/terminal.c b/clients/terminal.c
index 092e06920..df2f8c77f 100644
--- a/clients/terminal.c
+++ b/clients/terminal.c
@@ -37,7 +37,7 @@
 #include <X11/keysym.h>
 
 #include "wayland-util.h"
-#include "wayland-client.h"
+#include <wayland-client.h>
 
 #include "window.h"
 
diff --git a/clients/view.c b/clients/view.c
index 0eec1f908..f5f8841c4 100644
--- a/clients/view.c
+++ b/clients/view.c
@@ -38,7 +38,7 @@
 #include <glib/poppler-page.h>
 
 #include "wayland-util.h"
-#include "wayland-client.h"
+#include <wayland-client.h>
 
 #include "window.h"
 
diff --git a/clients/window.c b/clients/window.c
index ffa01d43c..db48a399c 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -51,7 +51,7 @@
 
 #include <linux/input.h>
 #include "wayland-util.h"
-#include "wayland-client.h"
+#include <wayland-client.h>
 #include "cairo-util.h"
 
 #include "window.h"
diff --git a/compositor/compositor.c b/compositor/compositor.c
index 9b32eff87..fe123f8ce 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -42,7 +42,7 @@
 #include <getopt.h>
 #include <signal.h>
 
-#include "wayland-server.h"
+#include <wayland-server.h>
 #include "compositor.h"
 
 /* The plan here is to generate a random anonymous socket name and
diff --git a/compositor/compositor.h b/compositor/compositor.h
index c61e69703..30fb5cb84 100644
--- a/compositor/compositor.h
+++ b/compositor/compositor.h
@@ -25,7 +25,7 @@
 
 #include <libudev.h>
 #include <pixman.h>
-#include "wayland-server.h"
+#include <wayland-server.h>
 #include "wayland-util.h"
 
 #include <GLES2/gl2.h>
diff --git a/compositor/shell.c b/compositor/shell.c
index 7bae94435..f8305dbe1 100644
--- a/compositor/shell.c
+++ b/compositor/shell.c
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 #include <assert.h>
 
-#include "wayland-server.h"
+#include <wayland-server.h>
 #include "compositor.h"
 #include "desktop-shell-server-protocol.h"