diff --git a/Assembly.cpp b/Assembly.cpp
index 0de16982f..0fa125378 100644
--- a/Assembly.cpp
+++ b/Assembly.cpp
@@ -21,7 +21,7 @@
 
 #include "Assembly.h"
 
-#include <libethsupport/Log.h>
+#include <libethential/Log.h>
 #include <libethcore/CommonEth.h>
 
 using namespace std;
diff --git a/Assembly.h b/Assembly.h
index 3907f69fd..29f899c0e 100644
--- a/Assembly.h
+++ b/Assembly.h
@@ -23,8 +23,9 @@
 
 #include <iostream>
 #include <sstream>
-#include <libethsupport/Common.h>
-#include <libethcore/Instruction.h>
+#include <libethential/Common.h>
+#include <libevmface/Instruction.h>
+#include <libethcore/SHA3.h>
 #include "Exceptions.h"
 
 namespace eth
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc5fc2221..4117e6edc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,17 +18,10 @@ endif()
 file(GLOB HEADERS "*.h") 
 
 include_directories(..)
-include_directories(${MINIUPNPC_ID})
-include_directories(${LEVELDB_ID})
-
-target_link_libraries(${EXECUTABLE} ethcore)
-target_link_libraries(${EXECUTABLE} ethsupport)
-target_link_libraries(${EXECUTABLE} secp256k1)
-target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
+target_link_libraries(${EXECUTABLE} ethential)
+target_link_libraries(${EXECUTABLE} evmface)
 target_link_libraries(${EXECUTABLE} gmp)
 
-
 if(${TARGET_PLATFORM} STREQUAL "w64")
 	include_directories(/usr/x86_64-w64-mingw32/include/cryptopp)
 	target_link_libraries(${EXECUTABLE} cryptopp)
diff --git a/CodeFragment.cpp b/CodeFragment.cpp
index 9284c1f31..2ad23471d 100644
--- a/CodeFragment.cpp
+++ b/CodeFragment.cpp
@@ -24,8 +24,8 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/spirit/include/support_utree.hpp>
-#include <libethsupport/Log.h>
-#include <libethcore/Instruction.h>
+#include <libethential/Log.h>
+#include <libevmface/Instruction.h>
 #include <libethcore/CommonEth.h>
 #include "CompilerState.h"
 using namespace std;
diff --git a/CodeFragment.h b/CodeFragment.h
index 8e3ff1d7d..b9d44c030 100644
--- a/CodeFragment.h
+++ b/CodeFragment.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <libethsupport/Common.h>
-#include <libethcore/Instruction.h>
+#include <libethential/Common.h>
+#include <libevmface/Instruction.h>
 #include "Assembly.h"
 #include "Exceptions.h"
 
diff --git a/Compiler.h b/Compiler.h
index 395d79094..da84a2fea 100644
--- a/Compiler.h
+++ b/Compiler.h
@@ -23,7 +23,7 @@
 
 #include <string>
 #include <vector>
-#include <libethsupport/Common.h>
+#include <libethential/Common.h>
 
 namespace eth
 {
diff --git a/Parser.h b/Parser.h
index 059ffe6a2..5286c3e8a 100644
--- a/Parser.h
+++ b/Parser.h
@@ -23,7 +23,7 @@
 
 #include <string>
 #include <vector>
-#include <libethsupport/Common.h>
+#include <libethential/Common.h>
 
 namespace boost { namespace spirit { class utree; } }
 namespace sp = boost::spirit;