diff --git a/cursor/cursor-data.h b/cursor/cursor-data.h
index 0d03cd53b0551afae67875f852a919331193d1f4..dd7a80af594809a032144fe53a1a783164991aa7 100644
--- a/cursor/cursor-data.h
+++ b/cursor/cursor-data.h
@@ -25,6 +25,8 @@
 * Author:  Keith Packard, SuSE, Inc.
 */
 
+#include <stdint.h>
+
 static uint32_t cursor_data[] = {
 	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
diff --git a/cursor/wayland-cursor.c b/cursor/wayland-cursor.c
index 18abe87a24940d9c489db89b2ea9b7b93d48200b..d40c5c8e469f46d98ac97d7f7b9e751699db7293 100644
--- a/cursor/wayland-cursor.c
+++ b/cursor/wayland-cursor.c
@@ -29,6 +29,7 @@
 #include "wayland-client.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
diff --git a/src/event-loop.c b/src/event-loop.c
index 32216a7c4c940c6b69db4a1235a7c3163d0037fc..6130d2af67f0a6b42a1ee395d50b5f2d181c08e5 100644
--- a/src/event-loop.c
+++ b/src/event-loop.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/socket.h>
diff --git a/src/scanner.c b/src/scanner.c
index ebae4ccc688e7c1fb99c024e2d009bc06ef57085..d501ba758e9cd4c4216d65bb60f08f43d20ec64a 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -31,6 +31,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
diff --git a/src/wayland-client-core.h b/src/wayland-client-core.h
index dfd3e18f5b3b5cd0259d7f129d2be7409751b73b..03e781b55c96395c6cacdbf1ac8c0385c3a0b620 100644
--- a/src/wayland-client-core.h
+++ b/src/wayland-client-core.h
@@ -26,6 +26,7 @@
 #ifndef WAYLAND_CLIENT_CORE_H
 #define WAYLAND_CLIENT_CORE_H
 
+#include <stdint.h>
 #include "wayland-util.h"
 #include "wayland-version.h"
 
diff --git a/src/wayland-private.h b/src/wayland-private.h
index 045109b0f0a2dd669f389a0a90aab0897ba749d8..adfbe016bbad8a47c3cc24babfe0ef62f37b956f 100644
--- a/src/wayland-private.h
+++ b/src/wayland-private.h
@@ -30,6 +30,7 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 #define WL_HIDE_DEPRECATED 1
 
diff --git a/src/wayland-server.h b/src/wayland-server.h
index a6e7951a6e2d9baccc89a87a9c1956a25a73f9a0..f11fb4d0f777028f2b8af708113606be6e5bbe4e 100644
--- a/src/wayland-server.h
+++ b/src/wayland-server.h
@@ -36,6 +36,7 @@
 #ifndef WAYLAND_SERVER_H
 #define WAYLAND_SERVER_H
 
+#include <stdint.h>
 #include "wayland-server-core.h"
 
 #ifdef  __cplusplus
diff --git a/src/wayland-shm.c b/src/wayland-shm.c
index 20bb8c82d1074c883f56ba26def24267f924008a..7fea364cbcf216c53e29e2e821540e8db4c2838a 100644
--- a/src/wayland-shm.c
+++ b/src/wayland-shm.c
@@ -33,6 +33,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <unistd.h>
diff --git a/tests/connection-test.c b/tests/connection-test.c
index 5d97fd98a14b0df1f1bf624fecf97ef6625b07e5..3e34f77951e0ca5e5fa4b35e7d7934e9abbcce8e 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <string.h>
 #include <assert.h>
 #include <sys/socket.h>
diff --git a/tests/display-test.c b/tests/display-test.c
index 17956db88588dd1d02b68c09d5b8dd0e3ba78f58..f4800ce9ab99a21ba1d3d1ad4590427e4937bdd3 100644
--- a/tests/display-test.c
+++ b/tests/display-test.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <string.h>
 #include <assert.h>
 #include <sys/socket.h>
diff --git a/tests/event-loop-test.c b/tests/event-loop-test.c
index ae5ff9450c9e80680ad069859c194cd0e0b717b3..33566b41caa455e25d3063680dbf689eaae212d3 100644
--- a/tests/event-loop-test.c
+++ b/tests/event-loop-test.c
@@ -25,6 +25,7 @@
  */
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <assert.h>
 #include <unistd.h>
 #include <signal.h>
diff --git a/tests/map-test.c b/tests/map-test.c
index d25904885340cb337ea22c41f20fd895272e4a72..8ecc1aa583800cbd240684a4e4209e9c14f2ab0b 100644
--- a/tests/map-test.c
+++ b/tests/map-test.c
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <assert.h>
 #include "wayland-private.h"
 #include "test-runner.h"
diff --git a/tests/os-wrappers-test.c b/tests/os-wrappers-test.c
index b636b62225a7122aee100bbe9e35bd18538c221b..102622c321d9654e11d51ab6275537e085476bf0 100644
--- a/tests/os-wrappers-test.c
+++ b/tests/os-wrappers-test.c
@@ -27,6 +27,7 @@
 #define _GNU_SOURCE
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/tests/queue-test.c b/tests/queue-test.c
index 932bc555815748271f46dea5f39548d911e78615..86a360256fcf07944e61c782889e980672337ed9 100644
--- a/tests/queue-test.c
+++ b/tests/queue-test.c
@@ -24,6 +24,7 @@
  */
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <unistd.h>
diff --git a/tests/resources-test.c b/tests/resources-test.c
index 337f9f9f0fe691a4e9a4754c837da1c3ed289eb0..59d8beb735c4fc4f0e94b5a8eeb5805d4bc8847d 100644
--- a/tests/resources-test.c
+++ b/tests/resources-test.c
@@ -26,6 +26,7 @@
 #include <assert.h>
 #include <sys/socket.h>
 #include <unistd.h>
+#include <stdint.h>
 
 #include "wayland-server.h"
 #include "test-runner.h"
diff --git a/tests/test-compositor.c b/tests/test-compositor.c
index b01e8afe08cbe6ba01d173fd993eb45eca46d200..0631f6149c5cba90de15311d3a90122b06102fbc 100644
--- a/tests/test-compositor.c
+++ b/tests/test-compositor.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/socket.h>
diff --git a/tests/test-compositor.h b/tests/test-compositor.h
index 526e9123d369824a14c3b9da299c59989bb3ed57..876d0c0976716895b63f115e6f99c8fa7bc091ef 100644
--- a/tests/test-compositor.h
+++ b/tests/test-compositor.h
@@ -23,6 +23,7 @@
  * SOFTWARE.
  */
 
+#include <stdint.h>
 #include <unistd.h>
 
 #include "wayland-server.h"