diff --git a/include/evmjit/JIT.h b/include/evmjit/JIT.h
index c12637a25..adca983d9 100644
--- a/include/evmjit/JIT.h
+++ b/include/evmjit/JIT.h
@@ -35,7 +35,7 @@ inline bool operator==(h256 _h1, h256 _h2)
 /// Representation of 256-bit value binary compatible with LLVM i256
 struct i256
 {
-	uint64_t words[4] = {0,};
+	uint64_t words[4];
 
 	i256() = default;
 	i256(h256 _h) { *this = *reinterpret_cast<i256*>(&_h); }
@@ -149,7 +149,7 @@ public:
 	/// Returns `true` if the EVM code has been compiled and loaded into memory.
 	/// In this case the code can be executed without overhead.
 	/// \param _codeHash	The Keccak hash of the EVM code.
-	static bool isCodeReady(h256 const& _codeHash);
+	EXPORT static bool isCodeReady(h256 const& _codeHash);
 
 	EXPORT static ReturnCode exec(ExecutionContext& _context);
 };
diff --git a/libevmjit/Cache.h b/libevmjit/Cache.h
index 2f152c9f8..5de4222fc 100644
--- a/libevmjit/Cache.h
+++ b/libevmjit/Cache.h
@@ -3,7 +3,9 @@
 #include <memory>
 #include <unordered_map>
 
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/ExecutionEngine/ObjectCache.h>
+#include "preprocessor/llvm_includes_end.h"
 
 namespace llvm
 {
diff --git a/libevmjit/JIT.cpp b/libevmjit/JIT.cpp
index f8b4d4c00..6a9b7f932 100644
--- a/libevmjit/JIT.cpp
+++ b/libevmjit/JIT.cpp
@@ -1,5 +1,7 @@
 #include "evmjit/JIT.h"
 
+#include <array>
+
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Module.h>
 #include <llvm/ADT/Triple.h>
diff --git a/libevmjit/RuntimeManager.h b/libevmjit/RuntimeManager.h
index 5ce749933..98d5b3132 100644
--- a/libevmjit/RuntimeManager.h
+++ b/libevmjit/RuntimeManager.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <array>
+
 #include "CompilerHelper.h"
 #include "Type.h"
 #include "Instruction.h"