diff --git a/MemTrie.cpp b/MemTrie.cpp
index b5d875acb..d654179f3 100644
--- a/MemTrie.cpp
+++ b/MemTrie.cpp
@@ -21,8 +21,8 @@
 
 #include "MemTrie.h"
 
-#include <libethcore/TrieCommon.h>
-#include <libethcore/SHA3.h>
+#include <libdevcrypto/TrieCommon.h>
+#include <libdevcrypto/SHA3.h>
 #include <libethcore/CommonEth.h>
 using namespace std;
 using namespace dev;
diff --git a/MemTrie.h b/MemTrie.h
index 66669653c..86b09540f 100644
--- a/MemTrie.h
+++ b/MemTrie.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <libethential/Common.h>
-#include <libethential/FixedHash.h>
+#include <libdevcore/Common.h>
+#include <libdevcore/FixedHash.h>
 
 namespace dev
 {
diff --git a/TrieHash.cpp b/TrieHash.cpp
index b2ebce731..af32e870d 100644
--- a/TrieHash.cpp
+++ b/TrieHash.cpp
@@ -21,8 +21,8 @@
 
 #include "TrieHash.h"
 
-#include <libethcore/TrieCommon.h>
-#include <libethcore/SHA3.h>
+#include <libdevcrypto/TrieCommon.h>
+#include <libdevcrypto/SHA3.h>
 #include <libethcore/CommonEth.h>
 using namespace std;
 using namespace dev;
diff --git a/TrieHash.h b/TrieHash.h
index 4d86c4dbf..be1d84480 100644
--- a/TrieHash.h
+++ b/TrieHash.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <libethential/Common.h>
-#include <libethential/FixedHash.h>
+#include <libdevcore/Common.h>
+#include <libdevcore/FixedHash.h>
 
 namespace dev
 {
diff --git a/crypto.cpp b/crypto.cpp
index 2e4ffa055..d2943984e 100644
--- a/crypto.cpp
+++ b/crypto.cpp
@@ -22,9 +22,9 @@
 
 #include <random>
 #include <secp256k1/secp256k1.h>
-#include <libethential/Common.h>
-#include <libethential/RLP.h>
-#include <libethential/Log.h>
+#include <libdevcore/Common.h>
+#include <libdevcore/RLP.h>
+#include <libdevcore/Log.h>
 #include <libethereum/Transaction.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/dagger.cpp b/dagger.cpp
index fd60a8efa..555c5d776 100644
--- a/dagger.cpp
+++ b/dagger.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <chrono>
-#include <libethential/Log.h>
+#include <libdevcore/Log.h>
 #include <libethcore/Dagger.h>
 using namespace std;
 using namespace std::chrono;
diff --git a/genesis.cpp b/genesis.cpp
index be6655aba..5f17d2762 100644
--- a/genesis.cpp
+++ b/genesis.cpp
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <random>
 #include "JsonSpiritHeaders.h"
-#include <libethential/CommonIO.h>
+#include <libdevcore/CommonIO.h>
 #include <libethereum/BlockChain.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/hexPrefix.cpp b/hexPrefix.cpp
index 7dbe80a57..9b65db0e4 100644
--- a/hexPrefix.cpp
+++ b/hexPrefix.cpp
@@ -22,8 +22,8 @@
 
 #include <fstream>
 #include "JsonSpiritHeaders.h"
-#include <libethcore/TrieCommon.h>
-#include <libethential/Log.h>
+#include <libdevcrypto/TrieCommon.h>
+#include <libdevcore/Log.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
diff --git a/main.cpp b/main.cpp
index 08142095c..ef009e299 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,7 +20,7 @@
  * Main test functions.
  */
 
-#include <libethcore/TrieDB.h>
+#include <libdevcrypto/TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
 
@@ -35,7 +35,7 @@ int vmTest();
 int hexPrefixTest();
 int peerTest(int argc, char** argv);
 
-#include <libethential/Log.h>
+#include <libdevcore/Log.h>
 #include <libethcore/BlockInfo.h>
 using namespace std;
 using namespace dev;
diff --git a/rlp.cpp b/rlp.cpp
index 963d61091..b51f3a225 100644
--- a/rlp.cpp
+++ b/rlp.cpp
@@ -23,9 +23,9 @@
 #include <fstream>
 #include <sstream>
 #include "JsonSpiritHeaders.h"
-#include <libethential/Log.h>
-#include <libethential/RLP.h>
-#include <libethential/Common.h>
+#include <libdevcore/Log.h>
+#include <libdevcore/RLP.h>
+#include <libdevcore/Common.h>
 #include <boost/test/unit_test.hpp>
 #include <algorithm>
 
diff --git a/trie.cpp b/trie.cpp
index 4ddf30a61..cdebd09fc 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <random>
 #include "JsonSpiritHeaders.h"
-#include <libethcore/TrieDB.h>
+#include <libdevcrypto/TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
 #include <boost/test/unit_test.hpp>
diff --git a/vm.cpp b/vm.cpp
index 2b75f0b3d..e177855cb 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -22,7 +22,7 @@
 
 #include <fstream>
 #include <cstdint>
-#include <libethential/Log.h>
+#include <libdevcore/Log.h>
 #include <libevmface/Instruction.h>
 #include <libevm/ExtVMFace.h>
 #include <libevm/VM.h>