diff --git a/CMakeLists.txt b/CMakeLists.txt
index d99d5f1b..a9952fc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,7 +150,7 @@ else(LLVM_CONFIG_FILE_PATH STREQUAL "LLVM_CONFIG_FILE_PATH-NOTFOUND")
         file(STRINGS ${LLVM_CONFIG_FILE_PATH}/config.h LLVM_NATIVE_ARCH REGEX "^#define LLVM_NATIVE_ARCH")
         if(LLVM_NATIVE_ARCH)
                 string(REGEX REPLACE "^#define LLVM_NATIVE_ARCH (.*)Target$" "\\1" LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH})
-                message("Found native target ${LLVM_NATIVE_ARCH}")
+                message(STATUS "Found native target ${LLVM_NATIVE_ARCH}")
                 set(LLVM_MODULES_DEFINE "LLVM_TARGET(${LLVM_NATIVE_ARCH})")
         else(LLVM_NATIVE_ARCH)
                 message("Couldn't find the LLVM_NATIVE_ARCH define in ${LLVM_CONFIG_FILE_PATH}/config.h. Probably you have an older LLVM and can ignore this warning.")
diff --git a/gen/metadata.h b/gen/metadata.h
index f7f6b2ff..3716a46c 100644
--- a/gen/metadata.h
+++ b/gen/metadata.h
@@ -1,19 +1,18 @@
 #ifndef LDC_GEN_METADATA_H
 #define LDC_GEN_METADATA_H
 
-#include "gen/llvm-version.h"
+// MDNode was moved into its own header, and contains Value*s
+#include "llvm/MDNode.h"
+typedef llvm::Value MDNodeField;
 
-    // MDNode was moved into its own header, and contains Value*s
-    #include "llvm/MDNode.h"
-    typedef llvm::Value MDNodeField;
-    
-    // Use getNumElements() and getElement() to access elements.
-    inline unsigned MD_GetNumElements(llvm::MDNode* N) {
-        return N->getNumElements();
-    }
-    inline MDNodeField* MD_GetElement(llvm::MDNode* N, unsigned i) {
-        return N->getElement(i);
-    }
+// Use getNumElements() and getElement() to access elements.
+inline unsigned MD_GetNumElements(llvm::MDNode* N) {
+    return N->getNumElements();
+}
+
+inline MDNodeField* MD_GetElement(llvm::MDNode* N, unsigned i) {
+    return N->getElement(i);
+}
 
 #define METADATA_LINKAGE_TYPE  llvm::GlobalValue::WeakODRLinkage
 
diff --git a/gen/optimizer.cpp b/gen/optimizer.cpp
index 7a8c70ab..a15c4121 100644
--- a/gen/optimizer.cpp
+++ b/gen/optimizer.cpp
@@ -159,11 +159,9 @@ static void addPassesForOptLevel(PassManager& pm) {
         if (!disableLangSpecificPasses) {
             if (!disableSimplifyRuntimeCalls)
                 addPass(pm, createSimplifyDRuntimeCalls());
-            
-#ifdef USE_METADATA
+
             if (!disableGCToStack)
                 addPass(pm, createGarbageCollect2Stack());
-#endif
         }
         // Run some clean-up passes
         addPass(pm, createInstructionCombiningPass());
diff --git a/gen/passes/StripExternals.cpp b/gen/passes/StripExternals.cpp
index b62c7df6..8ed4b630 100644
--- a/gen/passes/StripExternals.cpp
+++ b/gen/passes/StripExternals.cpp
@@ -15,8 +15,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "gen/llvm-version.h"
-
 #define DEBUG_TYPE "strip-externals"
 
 #include "Passes.h"
diff --git a/gen/runtime.cpp b/gen/runtime.cpp
index 98a01051..1108439b 100644
--- a/gen/runtime.cpp
+++ b/gen/runtime.cpp
@@ -1,5 +1,4 @@
 #include "gen/llvm.h"
-#include "gen/llvm-version.h"
 #include "llvm/Module.h"
 #include "llvm/Attributes.h"
 #include "llvm/Bitcode/ReaderWriter.h"
diff --git a/gen/tollvm.cpp b/gen/tollvm.cpp
index 9da64426..3e6e44c2 100644
--- a/gen/tollvm.cpp
+++ b/gen/tollvm.cpp
@@ -20,7 +20,6 @@
 #include "gen/complex.h"
 #include "gen/llvmhelpers.h"
 #include "gen/linkage.h"
-#include "gen/llvm-version.h"
 
 #include "ir/irtype.h"
 #include "ir/irtypeclass.h"
diff --git a/gen/toobj.cpp b/gen/toobj.cpp
index d68b28ae..5b078a0d 100644
--- a/gen/toobj.cpp
+++ b/gen/toobj.cpp
@@ -11,7 +11,6 @@
 #include <fstream>
 
 #include "gen/llvm.h"
-#include "gen/llvm-version.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Module.h"
diff --git a/gen/typinf.cpp b/gen/typinf.cpp
index 5f390b6e..e62af649 100644
--- a/gen/typinf.cpp
+++ b/gen/typinf.cpp
@@ -42,7 +42,6 @@
 #include "gen/linkage.h"
 #include "gen/metadata.h"
 #include "gen/rttibuilder.h"
-#include "gen/llvm-version.h"
 
 #include "ir/irvar.h"
 #include "ir/irtype.h"