diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index f971ae71918..994213c0ec9 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -23,34 +23,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-/**
- * \file ir_to_mesa.cpp
- *
- * Translate GLSL IR to Mesa's gl_program representation.
- */
-
-#include <stdio.h>
-#include "main/macros.h"
-#include "main/mtypes.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
-#include "main/uniforms.h"
 #include "main/glspirv.h"
-#include "compiler/glsl/ast.h"
-#include "compiler/glsl/ir.h"
-#include "compiler/glsl/ir_expression_flattening.h"
-#include "compiler/glsl/ir_optimization.h"
-#include "compiler/glsl/ir_uniform.h"
 #include "compiler/glsl/glsl_parser_extras.h"
 #include "compiler/glsl_types.h"
 #include "compiler/glsl/linker.h"
 #include "compiler/glsl/program.h"
 #include "compiler/glsl/shader_cache.h"
-#include "program/prog_instruction.h"
-#include "program/prog_optimize.h"
-#include "program/prog_print.h"
-#include "program/program.h"
-#include "program/prog_parameter.h"
 
 
 extern "C" {
diff --git a/src/mesa/program/ir_to_mesa.h b/src/mesa/program/ir_to_mesa.h
index 081458ae4b2..da0a8062026 100644
--- a/src/mesa/program/ir_to_mesa.h
+++ b/src/mesa/program/ir_to_mesa.h
@@ -24,22 +24,15 @@
 #ifndef IR_TO_MESA_H
 #define IR_TO_MESA_H
 
-#include "main/glheader.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct gl_context;
-struct gl_program;
-struct gl_shader;
 struct gl_shader_program;
-struct gl_linked_shader;
-struct gl_program_parameter_list;
 
 void _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);
 
-
 #ifdef __cplusplus
 }
 #endif