diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp
index e8311902d92..01ad88417ed 100644
--- a/src/compiler/glsl/ast_function.cpp
+++ b/src/compiler/glsl/ast_function.cpp
@@ -25,7 +25,8 @@
 #include "ast.h"
 #include "compiler/glsl_types.h"
 #include "ir.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 #include "main/shaderobj.h"
 #include "builtin_functions.h"
 
diff --git a/src/mesa/main/shader_types.h b/src/mesa/main/shader_types.h
index a8f04b3763d..07e0aaddb2b 100644
--- a/src/mesa/main/shader_types.h
+++ b/src/mesa/main/shader_types.h
@@ -33,6 +33,7 @@
 
 #include "main/config.h" /* for MAX_FEEDBACK_BUFFERS */
 #include "main/glheader.h"
+#include "util/mesa-sha1.h"
 
 /**
  * Shader information needed by both gl_shader and gl_linked shader.