diff --git a/ctx.h b/ctx.h
index d8963bbf..793242c7 100644
--- a/ctx.h
+++ b/ctx.h
@@ -42,11 +42,12 @@
 #include <map>
 #include <llvm/InstrTypes.h>
 #include <llvm/Instructions.h>
-#include <llvm/Analysis/DIBuilder.h>
 #if defined(LLVM_3_0) || defined(LLVM_3_1)
   #include <llvm/Analysis/DebugInfo.h>
+  #include <llvm/Analysis/DIBuilder.h>
 #else
   #include <llvm/DebugInfo.h>
+  #include <llvm/DIBuilder.h>
 #endif
 
 struct CFInfo;
diff --git a/expr.cpp b/expr.cpp
index 7cf814e0..a842a7f0 100644
--- a/expr.cpp
+++ b/expr.cpp
@@ -64,7 +64,6 @@
 #include <llvm/Instructions.h>
 #include <llvm/CallingConv.h>
 #include <llvm/Target/TargetData.h>
-#include <llvm/Support/IRBuilder.h>
 #include <llvm/ExecutionEngine/GenericValue.h>
 #include <llvm/Support/InstIterator.h>
 
diff --git a/ispc.cpp b/ispc.cpp
index ae090f20..ac0be154 100644
--- a/ispc.cpp
+++ b/ispc.cpp
@@ -49,11 +49,12 @@
 #endif
 #include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
-#include <llvm/Analysis/DIBuilder.h>
 #if defined(LLVM_3_0) || defined(LLVM_3_1)
   #include <llvm/Analysis/DebugInfo.h>
+  #include <llvm/Analysis/DIBuilder.h>
 #else
   #include <llvm/DebugInfo.h>
+  #include <llvm/DIBuilder.h>
 #endif
 #include <llvm/Support/Dwarf.h>
 #include <llvm/Instructions.h>
diff --git a/stmt.cpp b/stmt.cpp
index ae62eddf..30166f9c 100644
--- a/stmt.cpp
+++ b/stmt.cpp
@@ -56,7 +56,6 @@
 #include <llvm/Metadata.h>
 #include <llvm/Instructions.h>
 #include <llvm/CallingConv.h>
-#include <llvm/Support/IRBuilder.h>
 #include <llvm/Support/raw_ostream.h>
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/type.cpp b/type.cpp
index f3584361..272de7a4 100644
--- a/type.cpp
+++ b/type.cpp
@@ -45,11 +45,12 @@
 #include <map>
 #include <llvm/Value.h>
 #include <llvm/Module.h>
-#include <llvm/Analysis/DIBuilder.h>
 #if defined(LLVM_3_0) || defined(LLVM_3_1)
   #include <llvm/Analysis/DebugInfo.h>
+  #include <llvm/Analysis/DIBuilder.h>
 #else
   #include <llvm/DebugInfo.h>
+  #include <llvm/DIBuilder.h>
 #endif
 #include <llvm/Support/Dwarf.h>