diff --git a/evmcc/evmcc.cpp b/evmcc/evmcc.cpp
index 5ee11abb14..9ac3639e2c 100644
--- a/evmcc/evmcc.cpp
+++ b/evmcc/evmcc.cpp
@@ -11,6 +11,8 @@
 
 #include <llvm/Bitcode/ReaderWriter.h>
 #include <llvm/Support/raw_os_ostream.h>
+#include <llvm/Support/Signals.h>
+#include <llvm/Support/PrettyStackTrace.h>
 
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
@@ -85,6 +87,9 @@ void parseProgramOptions(int _argc, char** _argv, boost::program_options::variab
 
 int main(int argc, char** argv)
 {
+	llvm::sys::PrintStackTraceOnErrorSignal();
+	llvm::PrettyStackTraceProgram X(argc, argv);
+
 	boost::program_options::variables_map options;
 	parseProgramOptions(argc, argv, options);
 
diff --git a/libevmjit/ExecutionEngine.cpp b/libevmjit/ExecutionEngine.cpp
index 2174df4eb8..5c0125f35a 100644
--- a/libevmjit/ExecutionEngine.cpp
+++ b/libevmjit/ExecutionEngine.cpp
@@ -6,15 +6,11 @@
 #include <llvm/ADT/Triple.h>
 #include <llvm/ExecutionEngine/ExecutionEngine.h>
 #include <llvm/ExecutionEngine/SectionMemoryManager.h>
-#include <llvm/ExecutionEngine/GenericValue.h>
 #include <llvm/ExecutionEngine/MCJIT.h>
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Support/Host.h>
 
 #include "Runtime.h"
-#include "Memory.h"
-#include "Stack.h"
-#include "Type.h"
 #include "Compiler.h"
 #include "Cache.h"
 
@@ -54,11 +50,6 @@ ReturnCode runEntryFunc(EntryFuncPtr _mainFunc, Runtime* _runtime)
 
 ReturnCode ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeData* _data, Env* _env, bytes const& _code)
 {
-	// TODO: Use it in evmcc
-	//llvm::sys::PrintStackTraceOnErrorSignal();
-	//static const auto program = "EVM JIT";
-	//llvm::PrettyStackTraceProgram X(1, &program);
-
 	static std::unique_ptr<llvm::ExecutionEngine> ee;  // TODO: Use Managed Objects from LLVM?
 
 	EntryFuncPtr entryFuncPtr{};