diff --git a/demos/demo_win32.h b/demos/demo_win32.h
index 2c853f66..1537a180 100644
--- a/demos/demo_win32.h
+++ b/demos/demo_win32.h
@@ -23,6 +23,7 @@
 
 #include <dxgi1_4.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 #define DEMO_WINDOW_CLASS_NAME L"demo_wc"
 
diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h
index 7016d280..fe0aa92a 100644
--- a/demos/demo_xcb.h
+++ b/demos/demo_xcb.h
@@ -25,6 +25,10 @@
 #include <vkd3d.h>
 #include <xcb/xcb_event.h>
 #include <xcb/xcb_icccm.h>
+#include <sys/stat.h>
+#include <limits.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 struct demo
 {
diff --git a/demos/triangle.c b/demos/triangle.c
index 6c14fb1e..381c7a24 100644
--- a/demos/triangle.c
+++ b/demos/triangle.c
@@ -46,12 +46,7 @@
  */
 
 #define INITGUID
-#include <limits.h>
 #include <assert.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include "demo.h"
 
 struct cxt_fence