diff --git a/Makefile b/Makefile
index e593e7f..f2c5ce7 100644
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,7 @@ EXTRA_FILES = \
 	tests/Makefile.in				\
 	tests/glx/Makefile.in				\
 	src/glsl/glsl_parser.cpp			\
-	src/glsl/glsl_parser.h				\
+	src/glsl/glsl_parser.hh				\
 	src/glsl/glsl_lexer.cpp				\
 	src/glsl/glcpp/glcpp-lex.c			\
 	src/glsl/glcpp/glcpp-parse.c			\
@@ -210,7 +210,7 @@ IGNORE_FILES = \
 
 parsers: configure
 	-@touch $(TOP)/configs/current
-	$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp
+	$(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.hh glsl_lexer.cpp
 	$(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
 	$(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h
 
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 33881ad..c028688 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -239,21 +239,6 @@ lp_disassemble(const void* func)
    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
 #endif
 
-#if HAVE_LLVM >= 0x0300
-   OwningPtr<MCInstPrinter> Printer(
-         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
-#elif HAVE_LLVM >= 0x0208
-   OwningPtr<MCInstPrinter> Printer(
-         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo));
-#else
-   OwningPtr<MCInstPrinter> Printer(
-         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, Out));
-#endif
-   if (!Printer) {
-      debug_printf("error: no instruction printer for target %s\n", Triple.c_str());
-      return;
-   }
-
 #if HAVE_LLVM >= 0x0301
    TargetOptions options;
 #if defined(DEBUG)
@@ -321,13 +306,6 @@ lp_disassemble(const void* func)
        * Print the instruction.
        */
 
-#if HAVE_LLVM >= 0x0300
-      Printer->printInst(&Inst, Out, "");
-#elif HAVE_LLVM >= 0x208
-      Printer->printInst(&Inst, Out);
-#else
-      Printer->printInst(&Inst);
-#endif
       Out.flush();
 
       /*
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index fe7616b..c4130da 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -62,7 +62,6 @@
 extern "C" void
 lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
 {
-   llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
 }
 
 
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 955556b..416e4f7 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -37,7 +37,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/include
 
-BUILT_SOURCES = glsl_parser.h
+BUILT_SOURCES = glsl_parser.hh
 AM_YFLAGS = -d -p "_mesa_glsl_"
 AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
 
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index f8e8723..7bd0dfe 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -14,14 +14,14 @@ env.Prepend(CPPPATH = [
     '#src/glsl/glcpp',
 ])
 
-# Make glcpp/glcpp-parse.h and glsl_parser.h reacheable from the include path
+# Make glcpp/glcpp-parse.h and glsl_parser.hh reacheable from the include path
 env.Append(CPPPATH = [Dir('.').abspath])
 
 env.Append(YACCFLAGS = '-d')
 
 parser_env = env.Clone()
 parser_env.Append(YACCFLAGS = [
-    '--defines=%s' % File('glsl_parser.h').abspath,
+    '--defines=%s' % File('glsl_parser.hh').abspath,
     '-p', '_mesa_glsl_',
 ])
 
@@ -73,7 +73,7 @@ else:
     )
 
     # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll
-    # depends on glsl_parser.h
+    # depends on glsl_parser.hh
     env.Depends(builtin_compiler, glsl_parser)
 
     builtin_glsl_function = env.CodeGenerate(
@@ -99,7 +99,7 @@ glsl = env.ConvenienceLibrary(
 )
 
 # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll depends on
-# glsl_parser.h
+# glsl_parser.hh
 env.Depends(glsl, glsl_parser)
 
 Export('glsl')
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index 936a907..dbc34e2 100644
--- a/src/glsl/glsl_lexer.ll
+++ b/src/glsl/glsl_lexer.ll
@@ -26,7 +26,7 @@
 #include "strtod.h"
 #include "ast.h"
 #include "glsl_parser_extras.h"
-#include "glsl_parser.h"
+#include "glsl_parser.hh"
 
 static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);
 
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 7f8d47c..4f39360 100644
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -32,7 +32,7 @@ extern "C" {
 #include "ralloc.h"
 #include "ast.h"
 #include "glsl_parser_extras.h"
-#include "glsl_parser.h"
+#include "glsl_parser.hh"
 #include "ir_optimization.h"
 #include "loop_analysis.h"