diff --git a/cbackend.cpp b/cbackend.cpp
index 3db2d504..2ac6cc0b 100644
--- a/cbackend.cpp
+++ b/cbackend.cpp
@@ -63,7 +63,13 @@
 #include "llvm/Analysis/ConstantsScanner.h"
 #include "llvm/Analysis/FindUsedTypes.h"
 #include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/Verifier.h"
+#if defined(LLVM_3_5)
+    #include "llvm/IR/Verifier.h"
+    #include <llvm/IR/IRPrintingPasses.h>
+#else
+    #include "llvm/Analysis/Verifier.h"
+    #include <llvm/Assembly/PrintModulePass.h>
+#endif
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/CodeGen/IntrinsicLowering.h"
@@ -102,7 +108,6 @@
 #include <llvm/Transforms/IPO.h>
 #include <llvm/Transforms/Utils/BasicBlockUtils.h>
 #include <llvm/Support/ToolOutputFile.h>
-#include <llvm/Assembly/PrintModulePass.h>
 #include <algorithm>
 // Some ms header decided to define setjmp as _setjmp, undo this for this file.
 #ifdef _MSC_VER
@@ -241,9 +246,7 @@ namespace {
   class CBEMCAsmInfo : public llvm::MCAsmInfo {
   public:
     CBEMCAsmInfo() {
-#if defined(LLVM_3_5)
-      GlobalPrefix = '\0';
-#else
+#if !defined(LLVM_3_5)
       GlobalPrefix = "";
 #endif
       PrivateGlobalPrefix = "";
diff --git a/func.cpp b/func.cpp
index af2cc05a..51267656 100644
--- a/func.cpp
+++ b/func.cpp
@@ -69,10 +69,15 @@
 #include <llvm/Target/TargetMachine.h>
 #include <llvm/Target/TargetOptions.h>
 #include <llvm/PassManager.h>
-#include <llvm/Analysis/Verifier.h>
+#if defined(LLVM_3_5)
+    #include <llvm/IR/Verifier.h>
+    #include <llvm/IR/IRPrintingPasses.h>
+#else
+    #include <llvm/Analysis/Verifier.h>
+    #include <llvm/Assembly/PrintModulePass.h>
+#endif
 #include <llvm/Support/CFG.h>
 #include <llvm/Support/ToolOutputFile.h>
-#include <llvm/Assembly/PrintModulePass.h>
 
 Function::Function(Symbol *s, Stmt *c) {
     sym = s;
diff --git a/module.cpp b/module.cpp
index 6006ea34..98a199f6 100644
--- a/module.cpp
+++ b/module.cpp
@@ -95,7 +95,13 @@
   #include <llvm/IR/DataLayout.h>
   #include <llvm/Analysis/TargetTransformInfo.h>
 #endif
-#include <llvm/Analysis/Verifier.h>
+#if defined(LLVM_3_5)
+    #include <llvm/IR/Verifier.h>
+    #include <llvm/IR/IRPrintingPasses.h>
+#else
+    #include <llvm/Analysis/Verifier.h>
+    #include <llvm/Assembly/PrintModulePass.h>
+#endif
 #include <llvm/Support/CFG.h>
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Frontend/TextDiagnosticPrinter.h>
@@ -103,7 +109,6 @@
 #include <clang/Basic/TargetInfo.h>
 #include <llvm/Support/ToolOutputFile.h>
 #include <llvm/Support/Host.h>
-#include <llvm/Assembly/PrintModulePass.h>
 #include <llvm/Support/raw_ostream.h>
 #include <llvm/Bitcode/ReaderWriter.h>
 
diff --git a/opt.cpp b/opt.cpp
index f70e522d..9c66ade1 100644
--- a/opt.cpp
+++ b/opt.cpp
@@ -68,7 +68,13 @@
 #endif
 #include <llvm/PassManager.h>
 #include <llvm/PassRegistry.h>
-#include <llvm/Assembly/PrintModulePass.h>
+#if defined(LLVM_3_5)
+    #include <llvm/IR/Verifier.h>
+    #include <llvm/IR/IRPrintingPasses.h>
+#else
+    #include <llvm/Analysis/Verifier.h>
+    #include <llvm/Assembly/PrintModulePass.h>
+#endif
 #include <llvm/Analysis/ConstantFolding.h>
 #include <llvm/Target/TargetLibraryInfo.h>
 #include <llvm/ADT/Triple.h>
@@ -86,7 +92,6 @@
   #include <llvm/Analysis/TargetTransformInfo.h>
 #endif
 #include <llvm/Target/TargetMachine.h>
-#include <llvm/Analysis/Verifier.h>
 #include <llvm/Analysis/Passes.h>
 #include <llvm/Support/raw_ostream.h>
 #include <llvm/Support/PatternMatch.h>