diff --git a/builtins.cpp b/builtins.cpp
index 90410f1e..8686ec97 100644
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -883,7 +883,7 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
                                       &linkError))
             Error(SourcePos(), "Error linking stdlib bitcode: %s", linkError.c_str());
 #else // LLVM 3.6+
-            ))
+            )) {}
 #endif
         lSetInternalFunctions(module);
         if (symbolTable != NULL)
diff --git a/opt.cpp b/opt.cpp
index 135a7c8c..b36c7d8f 100644
--- a/opt.cpp
+++ b/opt.cpp
@@ -103,6 +103,9 @@
 #include <llvm/Analysis/Passes.h>
 #include <llvm/Support/raw_ostream.h>
 #include <llvm/Support/Dwarf.h>
+#if !defined(LLVM_3_2) && !defined(LLVM_3_5) && !defined(LLVM_3_4) && !defined(LLVM_3_5)
+  #include <llvm/IR/IntrinsicInst.h>
+#endif
 #ifdef ISPC_IS_LINUX
   #include <alloca.h>
 #elif defined(ISPC_IS_WINDOWS)