diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h
index 7eb72d3a..c66b227d 100644
--- a/include/private/vkd3d_test.h
+++ b/include/private/vkd3d_test.h
@@ -19,6 +19,7 @@
 #ifndef __VKD3D_TEST_H
 #define __VKD3D_TEST_H
 
+#include "vkd3d_common.h"
 #include <assert.h>
 #include <inttypes.h>
 #include <stdarg.h>
@@ -27,8 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "vkd3d_common.h"
-
 static void vkd3d_test_main(int argc, char **argv);
 static const char *vkd3d_test_name;
 
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 90f848f1..caf94d23 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -36,11 +36,6 @@
 typedef int HRESULT;
 #endif
 
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <time.h>
-
 #define COBJMACROS
 #define INITGUID
 #include "vkd3d_test.h"
@@ -48,6 +43,11 @@ typedef int HRESULT;
 #define WIDL_C_INLINE_WRAPPERS
 #include "d3d12.h"
 
+#include <inttypes.h>
+#include <limits.h>
+#include <math.h>
+#include <time.h>
+
 #ifdef _WIN32
 # include "dxgi1_4.h"
 #else