diff --git a/clients/editor.c b/clients/editor.c
index e081a5b8..b34ef429 100644
--- a/clients/editor.c
+++ b/clients/editor.c
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/eventdemo.c b/clients/eventdemo.c
index f04e39b4..d8eef5b5 100644
--- a/clients/eventdemo.c
+++ b/clients/eventdemo.c
@@ -33,6 +33,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
diff --git a/clients/ivi-shell-user-interface.c b/clients/ivi-shell-user-interface.c
index 465def1a..f4e061d0 100644
--- a/clients/ivi-shell-user-interface.c
+++ b/clients/ivi-shell-user-interface.c
@@ -26,6 +26,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <linux/input.h>
diff --git a/clients/keyboard.c b/clients/keyboard.c
index bcb346a2..9af3f419 100644
--- a/clients/keyboard.c
+++ b/clients/keyboard.c
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/multi-resource.c b/clients/multi-resource.c
index 2fca7c34..2be0a7e3 100644
--- a/clients/multi-resource.c
+++ b/clients/multi-resource.c
@@ -24,6 +24,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/clients/nested-client.c b/clients/nested-client.c
index 1891034d..9918da1f 100644
--- a/clients/nested-client.c
+++ b/clients/nested-client.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/presentation-shm.c b/clients/presentation-shm.c
index 998ce8b2..c9fb66cc 100644
--- a/clients/presentation-shm.c
+++ b/clients/presentation-shm.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/scaler.c b/clients/scaler.c
index f504c73a..17ca55dc 100644
--- a/clients/scaler.c
+++ b/clients/scaler.c
@@ -24,6 +24,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
diff --git a/clients/simple-damage.c b/clients/simple-damage.c
index bb81902d..9f0eb3ec 100644
--- a/clients/simple-damage.c
+++ b/clients/simple-damage.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/simple-dmabuf-intel.c b/clients/simple-dmabuf-intel.c
index ff9b9d6a..505ecb0a 100644
--- a/clients/simple-dmabuf-intel.c
+++ b/clients/simple-dmabuf-intel.c
@@ -24,6 +24,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/simple-dmabuf-v4l.c b/clients/simple-dmabuf-v4l.c
index 7ee5cce7..c92a3eb7 100644
--- a/clients/simple-dmabuf-v4l.c
+++ b/clients/simple-dmabuf-v4l.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/simple-egl.c b/clients/simple-egl.c
index c43e74c0..ddf2f9bd 100644
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/simple-shm.c b/clients/simple-shm.c
index c442d88a..b1fc5f10 100644
--- a/clients/simple-shm.c
+++ b/clients/simple-shm.c
@@ -24,6 +24,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/simple-touch.c b/clients/simple-touch.c
index 8fd0b0a2..4d011471 100644
--- a/clients/simple-touch.c
+++ b/clients/simple-touch.c
@@ -24,6 +24,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/stacking.c b/clients/stacking.c
index 6748576e..4285a171 100644
--- a/clients/stacking.c
+++ b/clients/stacking.c
@@ -24,6 +24,7 @@
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/weston-info.c b/clients/weston-info.c
index c4f76608..712346a0 100644
--- a/clients/weston-info.c
+++ b/clients/weston-info.c
@@ -25,6 +25,7 @@
 
 #include <errno.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/weston-simple-im.c b/clients/weston-simple-im.c
index c997467d..2d239300 100644
--- a/clients/weston-simple-im.c
+++ b/clients/weston-simple-im.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/clients/window.h b/clients/window.h
index 97719a7c..1ad3b4fd 100644
--- a/clients/window.h
+++ b/clients/window.h
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <xkbcommon/xkbcommon.h>
 #include <wayland-client.h>
 #include <cairo.h>
diff --git a/compositor/cms-colord.c b/compositor/cms-colord.c
index b9bc9e3b..152a7347 100644
--- a/compositor/cms-colord.c
+++ b/compositor/cms-colord.c
@@ -27,6 +27,7 @@
 
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/compositor/cms-helper.c b/compositor/cms-helper.c
index 7b7b8aad..1784c46d 100644
--- a/compositor/cms-helper.c
+++ b/compositor/cms-helper.c
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include <stdio.h>
 
 #ifdef HAVE_LCMS
diff --git a/compositor/main.c b/compositor/main.c
index 1f75ae04..99cb8681 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -33,6 +33,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <dlfcn.h>
+#include <stdint.h>
 #include <string.h>
 #include <sys/utsname.h>
 #include <sys/stat.h>
diff --git a/compositor/screen-share.c b/compositor/screen-share.c
index c9e7436f..0db02036 100644
--- a/compositor/screen-share.c
+++ b/compositor/screen-share.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/compositor/text-backend.c b/compositor/text-backend.c
index 0c000ba1..262ba9fb 100644
--- a/compositor/text-backend.c
+++ b/compositor/text-backend.c
@@ -28,6 +28,7 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
diff --git a/compositor/weston-screenshooter.c b/compositor/weston-screenshooter.c
index 234ee0b3..9999909e 100644
--- a/compositor/weston-screenshooter.c
+++ b/compositor/weston-screenshooter.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <linux/input.h>
 
 #include "compositor.h"
diff --git a/desktop-shell/exposay.c b/desktop-shell/exposay.c
index f05fa4c5..b11a7f79 100644
--- a/desktop-shell/exposay.c
+++ b/desktop-shell/exposay.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <linux/input.h>
 
 #include "shell.h"
diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
index 0d003b1a..2e18e289 100644
--- a/desktop-shell/input-panel.c
+++ b/desktop-shell/input-panel.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 9b77add9..64979cdb 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/desktop-shell/shell.h b/desktop-shell/shell.h
index f8f62d5c..f73cae5f 100644
--- a/desktop-shell/shell.h
+++ b/desktop-shell/shell.h
@@ -24,6 +24,7 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <time.h>
 
 #include "compositor.h"
diff --git a/fullscreen-shell/fullscreen-shell.c b/fullscreen-shell/fullscreen-shell.c
index 2ec2d021..1eea38af 100644
--- a/fullscreen-shell/fullscreen-shell.c
+++ b/fullscreen-shell/fullscreen-shell.c
@@ -28,6 +28,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index 0c28e817..f3a88308 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -52,6 +52,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <linux/input.h>
diff --git a/ivi-shell/input-panel-ivi.c b/ivi-shell/input-panel-ivi.c
index 954d4ef8..4c71cc76 100644
--- a/ivi-shell/input-panel-ivi.c
+++ b/ivi-shell/input-panel-ivi.c
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index e437d9ea..c909de2c 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -55,6 +55,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#include <stdint.h>
+
 #include "stdbool.h"
 #include "compositor.h"
 
diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h
index 66b19f64..b6f08894 100644
--- a/ivi-shell/ivi-layout-private.h
+++ b/ivi-shell/ivi-layout-private.h
@@ -26,6 +26,8 @@
 #ifndef _ivi_layout_PRIVATE_H_
 #define _ivi_layout_PRIVATE_H_
 
+#include <stdint.h>
+
 #include "compositor.h"
 #include "ivi-layout-export.h"
 
diff --git a/ivi-shell/ivi-layout-transition.c b/ivi-shell/ivi-layout-transition.c
index 4913db45..bf0640ee 100644
--- a/ivi-shell/ivi-layout-transition.c
+++ b/ivi-shell/ivi-layout-transition.c
@@ -28,6 +28,7 @@
 #include <time.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdbool.h>
 
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index dec49363..7c2f32d8 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -59,6 +59,7 @@
 
 #include <string.h>
 #include <assert.h>
+#include <stdint.h>
 
 #include "compositor/weston.h"
 #include "compositor.h"
diff --git a/ivi-shell/ivi-shell.c b/ivi-shell/ivi-shell.c
index 090ee4d1..c996b8f8 100644
--- a/ivi-shell/ivi-shell.c
+++ b/ivi-shell/ivi-shell.c
@@ -35,6 +35,7 @@
  */
 #include "config.h"
 
+#include <stdint.h>
 #include <string.h>
 #include <dlfcn.h>
 #include <limits.h>
diff --git a/ivi-shell/ivi-shell.h b/ivi-shell/ivi-shell.h
index 369e5f80..e35f75f2 100644
--- a/ivi-shell/ivi-shell.h
+++ b/ivi-shell/ivi-shell.h
@@ -27,6 +27,7 @@
 #define WESTON_IVI_SHELL_H
 
 #include <stdbool.h>
+#include <stdint.h>
 
 #include "compositor.h"
 
diff --git a/libweston/animation.c b/libweston/animation.c
index 2c7943f6..30b3e5de 100644
--- a/libweston/animation.c
+++ b/libweston/animation.c
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <math.h>
 
diff --git a/libweston/bindings.c b/libweston/bindings.c
index cc68cfe1..21366522 100644
--- a/libweston/bindings.c
+++ b/libweston/bindings.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <linux/input.h>
 
diff --git a/libweston/clipboard.c b/libweston/clipboard.c
index 54a578f0..f37508cb 100644
--- a/libweston/clipboard.c
+++ b/libweston/clipboard.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <linux/input.h>
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index f903a3b4..34922af1 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c
index e21ceca5..852acc0b 100644
--- a/libweston/compositor-fbdev.c
+++ b/libweston/compositor-fbdev.c
@@ -30,6 +30,7 @@
 
 #include <errno.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
diff --git a/libweston/compositor-fbdev.h b/libweston/compositor-fbdev.h
index 9b5bf8e6..7b182c7e 100644
--- a/libweston/compositor-fbdev.h
+++ b/libweston/compositor-fbdev.h
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #include "compositor.h"
 
 #define WESTON_FBDEV_BACKEND_CONFIG_VERSION 1
diff --git a/libweston/compositor-headless.c b/libweston/compositor-headless.c
index 6c22ee30..e514b17c 100644
--- a/libweston/compositor-headless.c
+++ b/libweston/compositor-headless.c
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
diff --git a/libweston/compositor-headless.h b/libweston/compositor-headless.h
index 1432f700..b432b097 100644
--- a/libweston/compositor-headless.h
+++ b/libweston/compositor-headless.h
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #include "compositor.h"
 
 #define WESTON_HEADLESS_BACKEND_CONFIG_VERSION 1
diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c
index 53c71248..2a270d39 100644
--- a/libweston/compositor-rdp.c
+++ b/libweston/compositor-rdp.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index 1343e21f..ceb5050d 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libweston/compositor-wayland.h b/libweston/compositor-wayland.h
index de69b988..b705dee9 100644
--- a/libweston/compositor-wayland.h
+++ b/libweston/compositor-wayland.h
@@ -32,6 +32,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #define WESTON_WAYLAND_BACKEND_CONFIG_VERSION 1
 
 struct weston_wayland_backend_output_config {
diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
index e2e6110e..9e2dc372 100644
--- a/libweston/compositor-x11.c
+++ b/libweston/compositor-x11.c
@@ -29,6 +29,7 @@
 
 #include <assert.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/libweston/compositor-x11.h b/libweston/compositor-x11.h
index 8363a760..6a17f96e 100644
--- a/libweston/compositor-x11.h
+++ b/libweston/compositor-x11.h
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #include "compositor.h"
 
 #define WESTON_X11_BACKEND_CONFIG_VERSION 1
diff --git a/libweston/compositor.h b/libweston/compositor.h
index ad2f6e3f..0133084e 100644
--- a/libweston/compositor.h
+++ b/libweston/compositor.h
@@ -32,6 +32,7 @@ extern "C" {
 #endif
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <time.h>
 #include <pixman.h>
 #include <xkbcommon/xkbcommon.h>
diff --git a/libweston/data-device.c b/libweston/data-device.c
index 44a08f91..19d39721 100644
--- a/libweston/data-device.c
+++ b/libweston/data-device.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/libweston/dbus.c b/libweston/dbus.c
index cadedd9d..36815dbd 100644
--- a/libweston/dbus.c
+++ b/libweston/dbus.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/epoll.h>
diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index be6b11eb..ed44c6d4 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -30,6 +30,7 @@
 #include <GLES2/gl2ext.h>
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h
index ad81a644..37d000fe 100644
--- a/libweston/gl-renderer.h
+++ b/libweston/gl-renderer.h
@@ -25,6 +25,8 @@
 
 #include "config.h"
 
+#include <stdint.h>
+
 #include "compositor.h"
 
 #ifdef ENABLE_EGL
diff --git a/libweston/launcher-logind.c b/libweston/launcher-logind.c
index f755ec33..8d5e8f92 100644
--- a/libweston/launcher-logind.c
+++ b/libweston/launcher-logind.c
@@ -30,6 +30,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libweston/launcher-util.c b/libweston/launcher-util.c
index 03b9d632..4abd1e28 100644
--- a/libweston/launcher-util.c
+++ b/libweston/launcher-util.c
@@ -31,6 +31,7 @@
 #include "launcher-util.h"
 #include "launcher-impl.h"
 
+#include <stdint.h>
 #include <unistd.h>
 #include <linux/input.h>
 
diff --git a/libweston/launcher-weston-launch.c b/libweston/launcher-weston-launch.c
index ad919f18..96ac25ad 100644
--- a/libweston/launcher-weston-launch.c
+++ b/libweston/launcher-weston-launch.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libweston/libbacklight.c b/libweston/libbacklight.c
index 722d66f0..4039575c 100644
--- a/libweston/libbacklight.c
+++ b/libweston/libbacklight.c
@@ -32,6 +32,7 @@
 #include "config.h"
 
 #include "libbacklight.h"
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/libweston/libinput-device.c b/libweston/libinput-device.c
index 782f6569..f97afcf8 100644
--- a/libweston/libinput-device.c
+++ b/libweston/libinput-device.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <linux/input.h>
diff --git a/libweston/libinput-seat.c b/libweston/libinput-seat.c
index 94e19f5e..78a5fc44 100644
--- a/libweston/libinput-seat.c
+++ b/libweston/libinput-seat.c
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/libweston/linux-dmabuf.c b/libweston/linux-dmabuf.c
index a91ae85d..7b29f08d 100644
--- a/libweston/linux-dmabuf.c
+++ b/libweston/linux-dmabuf.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/libweston/noop-renderer.c b/libweston/noop-renderer.c
index b6499b82..6eed40ee 100644
--- a/libweston/noop-renderer.c
+++ b/libweston/noop-renderer.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 
 #include "compositor.h"
diff --git a/libweston/pixman-renderer.c b/libweston/pixman-renderer.c
index f66a11ed..4ba13778 100644
--- a/libweston/pixman-renderer.c
+++ b/libweston/pixman-renderer.c
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
 
diff --git a/libweston/screenshooter.c b/libweston/screenshooter.c
index fc14ad30..2c5dacc1 100644
--- a/libweston/screenshooter.c
+++ b/libweston/screenshooter.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <linux/input.h>
diff --git a/libweston/spring-tool.c b/libweston/spring-tool.c
index 1848b3f7..9e7c344e 100644
--- a/libweston/spring-tool.c
+++ b/libweston/spring-tool.c
@@ -23,6 +23,8 @@
  * SOFTWARE.
  */
 
+#include <stdint.h>
+
 #include "config.h"
 
 #include "compositor.h"
diff --git a/libweston/zoom.c b/libweston/zoom.c
index 08c06931..a1a1ab21 100644
--- a/libweston/zoom.c
+++ b/libweston/zoom.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
diff --git a/shared/config-parser.c b/shared/config-parser.c
index d5bbb8db..1edfd60c 100644
--- a/shared/config-parser.c
+++ b/shared/config-parser.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/shared/config-parser.h b/shared/config-parser.h
index 17ef5d73..f18d2c0b 100644
--- a/shared/config-parser.h
+++ b/shared/config-parser.h
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #define WESTON_CONFIG_FILE_ENV_VAR "WESTON_CONFIG_FILE"
 
 enum config_key_type {
diff --git a/shared/frame.c b/shared/frame.c
index 1b67eb13..9cd44c66 100644
--- a/shared/frame.c
+++ b/shared/frame.c
@@ -27,6 +27,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-util.h>
diff --git a/shared/image-loader.c b/shared/image-loader.c
index f477dfd7..30b57cd4 100644
--- a/shared/image-loader.c
+++ b/shared/image-loader.c
@@ -28,6 +28,7 @@
 
 #include <errno.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <png.h>
diff --git a/shared/xalloc.c b/shared/xalloc.c
index 9bf5245e..1cc5c12a 100644
--- a/shared/xalloc.c
+++ b/shared/xalloc.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/shared/xalloc.h b/shared/xalloc.h
index 85fccb48..484de2d8 100644
--- a/shared/xalloc.h
+++ b/shared/xalloc.h
@@ -30,6 +30,7 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/tests/buffer-count-test.c b/tests/buffer-count-test.c
index 065249de..e7d8ca7d 100644
--- a/tests/buffer-count-test.c
+++ b/tests/buffer-count-test.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <EGL/egl.h>
 #include <wayland-egl.h>
diff --git a/tests/internal-screenshot-test.c b/tests/internal-screenshot-test.c
index 458ebdb4..3bf9b31b 100644
--- a/tests/internal-screenshot-test.c
+++ b/tests/internal-screenshot-test.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 
 #include "weston-test-client-helper.h"
diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index bc36ad13..d851ec00 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -30,6 +30,7 @@
 #include <signal.h>
 #include <string.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 #include "compositor.h"
 #include "ivi-shell/ivi-layout-export.h"
diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c
index ef6903a4..f6e465bd 100644
--- a/tests/ivi_layout-test-plugin.c
+++ b/tests/ivi_layout-test-plugin.c
@@ -27,6 +27,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <unistd.h>
 #include <signal.h>
 #include <string.h>
diff --git a/tests/ivi_layout-test.c b/tests/ivi_layout-test.c
index 7f226738..72aad7fb 100644
--- a/tests/ivi_layout-test.c
+++ b/tests/ivi_layout-test.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/tests/keyboard-test.c b/tests/keyboard-test.c
index 9cf69ec6..6b4ba19d 100644
--- a/tests/keyboard-test.c
+++ b/tests/keyboard-test.c
@@ -25,6 +25,8 @@
 
 #include "config.h"
 
+#include <stdint.h>
+
 #include "weston-test-client-helper.h"
 
 TEST(simple_keyboard_test)
diff --git a/tests/presentation-test.c b/tests/presentation-test.c
index cb5ff192..f12f8eef 100644
--- a/tests/presentation-test.c
+++ b/tests/presentation-test.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/surface-global-test.c b/tests/surface-global-test.c
index b0a1d1cb..55899c67 100644
--- a/tests/surface-global-test.c
+++ b/tests/surface-global-test.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 
 #include "compositor.h"
 
diff --git a/tests/surface-screenshot.c b/tests/surface-screenshot.c
index 703d48b0..332b5e39 100644
--- a/tests/surface-screenshot.c
+++ b/tests/surface-screenshot.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
diff --git a/tests/text-test.c b/tests/text-test.c
index b4a32f4c..685a28dc 100644
--- a/tests/text-test.c
+++ b/tests/text-test.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <string.h>
+#include <stdint.h>
 #include <stdio.h>
 
 #include "weston-test-client-helper.h"
diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c
index 1056f411..fd6ebaf8 100644
--- a/tests/weston-test-client-helper.c
+++ b/tests/weston-test-client-helper.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/tests/weston-test-client-helper.h b/tests/weston-test-client-helper.h
index d6ecb5fe..8908ae7e 100644
--- a/tests/weston-test-client-helper.h
+++ b/tests/weston-test-client-helper.h
@@ -30,6 +30,7 @@
 
 #include <assert.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <pixman.h>
 
 #include <wayland-client-protocol.h>
diff --git a/tests/weston-test.c b/tests/weston-test.c
index 09d8b5e5..afda7bc9 100644
--- a/tests/weston-test.c
+++ b/tests/weston-test.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <signal.h>
diff --git a/wcap/wcap-decode.h b/wcap/wcap-decode.h
index 3c374419..00b757fe 100644
--- a/wcap/wcap-decode.h
+++ b/wcap/wcap-decode.h
@@ -26,6 +26,8 @@
 #ifndef _WCAP_DECODE_
 #define _WCAP_DECODE_
 
+#include <stdint.h>
+
 #define WCAP_HEADER_MAGIC	0x57434150
 
 #define WCAP_FORMAT_XRGB8888	0x34325258
diff --git a/xwayland/dnd.c b/xwayland/dnd.c
index f17e4cd0..61edb119 100644
--- a/xwayland/dnd.c
+++ b/xwayland/dnd.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
diff --git a/xwayland/hash.h b/xwayland/hash.h
index 6e1674e1..334d8f47 100644
--- a/xwayland/hash.h
+++ b/xwayland/hash.h
@@ -35,6 +35,8 @@
 #ifndef HASH_H
 #define HASH_H
 
+#include <stdint.h>
+
 struct hash_table;
 struct hash_table *hash_table_create(void);
 typedef void (*hash_table_iterator_func_t)(void *element, void *data);
diff --git a/xwayland/launcher.c b/xwayland/launcher.c
index b7aee3b4..15443cd1 100644
--- a/xwayland/launcher.c
+++ b/xwayland/launcher.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
diff --git a/xwayland/selection.c b/xwayland/selection.c
index bd5e28a9..641ac490 100644
--- a/xwayland/selection.c
+++ b/xwayland/selection.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 49d974e2..5f86d8a0 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -26,6 +26,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>