diff --git a/clients/multi-resource.c b/clients/multi-resource.c
index b061e6821..c28302294 100644
--- a/clients/multi-resource.c
+++ b/clients/multi-resource.c
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/clients/presentation-shm.c b/clients/presentation-shm.c
index 2d9b88523..998ce8b25 100644
--- a/clients/presentation-shm.c
+++ b/clients/presentation-shm.c
@@ -23,7 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/clients/simple-damage.c b/clients/simple-damage.c
index 82091d52c..bb81902d1 100644
--- a/clients/simple-damage.c
+++ b/clients/simple-damage.c
@@ -23,7 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/clients/simple-dmabuf-intel.c b/clients/simple-dmabuf-intel.c
index 2ac220056..fa2bfc416 100644
--- a/clients/simple-dmabuf-intel.c
+++ b/clients/simple-dmabuf-intel.c
@@ -22,7 +22,7 @@
  * OF THIS SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/clients/simple-dmabuf-v4l.c b/clients/simple-dmabuf-v4l.c
index a73556c85..7ee5cce7d 100644
--- a/clients/simple-dmabuf-v4l.c
+++ b/clients/simple-dmabuf-v4l.c
@@ -20,7 +20,7 @@
  * OF THIS SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/clients/simple-shm.c b/clients/simple-shm.c
index 1aa26cef3..c442d88ad 100644
--- a/clients/simple-shm.c
+++ b/clients/simple-shm.c
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/clients/simple-touch.c b/clients/simple-touch.c
index 446f2cad3..8fd0b0a26 100644
--- a/clients/simple-touch.c
+++ b/clients/simple-touch.c
@@ -22,7 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/clients/terminal.c b/clients/terminal.c
index a70fef310..66bdeec48 100644
--- a/clients/terminal.c
+++ b/clients/terminal.c
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/clients/weston-simple-im.c b/clients/weston-simple-im.c
index 0ee505a0a..c997467df 100644
--- a/clients/weston-simple-im.c
+++ b/clients/weston-simple-im.c
@@ -21,7 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/cms-colord.c b/src/cms-colord.c
index c88eb11b1..b9bc9e3b7 100644
--- a/src/cms-colord.c
+++ b/src/cms-colord.c
@@ -23,9 +23,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/xwayland/hash.c b/xwayland/hash.c
index 54f3de93a..820e51fad 100644
--- a/xwayland/hash.c
+++ b/xwayland/hash.c
@@ -32,7 +32,7 @@
  *    Keith Packard <keithp@keithp.com>
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdint.h>