diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 666a1f69b54..1c64b6933d8 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -1,12 +1,11 @@
 LEVEL = ../..
 TOOLNAME = lli
-PARALLEL_DIRS = Interpreter JIT
 
 # Get the $(ARCH) setting
 include $(LEVEL)/Makefile.config
 
 # Generic JIT libraries
-JITLIBS   = lli-jit codegen
+JITLIBS   = lli-jit codegen executionengine
 ARCHLIBS  =
 
 # You can enable the X86 JIT on a non-X86 host by setting the flag
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 125f0758567..ebe618a90eb 100644
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -9,10 +9,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ExecutionEngine.h"
-#include "GenericValue.h"
 #include "Support/CommandLine.h"
 #include "Support/Debug.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetMachineImpls.h"