diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index eefc2aee7f0..dfcfa196cfb 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -33,11 +33,13 @@
 
 #include "util/macros.h"
 
+#include <limits.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <limits.h>
 
 
 #if defined(_WIN32) && !defined(__WIN32__)
@@ -54,10 +56,6 @@
 #endif /* _MSC_VER */
 
 
-#include <stdint.h>
-#include <stdbool.h>
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif