diff --git a/src/mesa/state_tracker/st_atifs_to_tgsi.h b/src/mesa/state_tracker/st_atifs_to_tgsi.h
index c1b6758ba02..14227023ba0 100644
--- a/src/mesa/state_tracker/st_atifs_to_tgsi.h
+++ b/src/mesa/state_tracker/st_atifs_to_tgsi.h
@@ -23,13 +23,13 @@
 #ifndef ST_ATIFS_TO_TGSI_H
 #define ST_ATIFS_TO_TGSI_H
 
+#include "main/glheader.h"
+#include "pipe/p_defines.h"
+
 #if defined __cplusplus
 extern "C" {
 #endif
 
-#include "main/glheader.h"
-#include "pipe/p_defines.h"
-
 struct gl_context;
 struct gl_program;
 struct ureg_program;
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.h b/src/mesa/state_tracker/st_mesa_to_tgsi.h
index ed7a3adfe1a..3df54ce5b87 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.h
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.h
@@ -29,15 +29,15 @@
 #ifndef ST_MESA_TO_TGSI_H
 #define ST_MESA_TO_TGSI_H
 
-#if defined __cplusplus
-extern "C" {
-#endif
-
 #include "main/glheader.h"
 
 #include "pipe/p_compiler.h"
 #include "pipe/p_defines.h"
 
+#if defined __cplusplus
+extern "C" {
+#endif
+
 struct gl_context;
 struct gl_program;
 struct tgsi_token;