Move non-cryptopp dependent stuff into devcore.

10 years ago · 05ea9941c9
82 changed files with 82 additions and 83 deletions
--- a/abi/main.cpp
+++ b/abi/main.cpp
@ -26,7 +26,7 @@
 #include "../test/JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethereum/Client.h>
 using namespace std;
 using namespace dev;
--- a/alethzero/DappLoader.cpp
+++ b/alethzero/DappLoader.cpp
@ -29,7 +29,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
 #include <libdevcrypto/CryptoPP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/CommonJS.h>
 #include <libethereum/Client.h>
 #include <libwebthree/WebThree.h>
--- a/alethzero/MainWin.cpp
+++ b/alethzero/MainWin.cpp
@ -44,7 +44,7 @@
 #include <libserpent/funcs.h>
 #include <libserpent/util.h>
 #endif
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethcore/CommonJS.h>
 #include <libethcore/EthashAux.h>
 #include <libethcore/ICAP.h>
--- a/alethzero/NatspecHandler.cpp
+++ b/alethzero/NatspecHandler.cpp
@ -27,7 +27,7 @@
 #include <libdevcore/CommonData.h>
 #include <libdevcore/Exceptions.h>
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethereum/Defaults.h>
 using namespace dev;
--- a/eth/main.cpp
+++ b/eth/main.cpp
@ -29,7 +29,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libevmcore/Instruction.h>
 #include <libdevcore/StructuredLogger.h>
 #include <libethcore/ProofOfWork.h>
--- a/ethminer/MinerAux.h
+++ b/ethminer/MinerAux.h
@ -31,11 +31,11 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libevmcore/Instruction.h>
 #include <libdevcore/StructuredLogger.h>
 #include <libethcore/Exceptions.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/EthashAux.h>
 #include <libethcore/Farm.h>
--- a/ethminer/main.cpp
+++ b/ethminer/main.cpp
@ -27,7 +27,7 @@
 #include <signal.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include "MinerAux.h"
 using namespace std;
 using namespace dev;
--- a/evmjit/libevmjit-cpp/Env.cpp
+++ b/evmjit/libevmjit-cpp/Env.cpp
@ -1,6 +1,6 @@
 #pragma GCC diagnostic ignored "-Wconversion"
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmcore/Params.h>
 #include <libevm/ExtVMFace.h>
 #include <evmjit/DataTypes.h>
--- a/evmjit/libevmjit-cpp/JitVM.cpp
+++ b/evmjit/libevmjit-cpp/JitVM.cpp
@ -4,7 +4,7 @@
 #include "JitVM.h"
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevm/VM.h>
 #include <libevm/VMFactory.h>
 #include <evmjit/libevmjit/ExecutionEngine.h>
--- a/exp/main.cpp
+++ b/exp/main.cpp
@ -41,12 +41,12 @@
 #include <libdevcore/RLP.h>
 #include <libdevcore/TransientDirectory.h>
 #include <libdevcore/CommonIO.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
 #include <libdevcrypto/SecretStore.h>
 #include <libp2p/All.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/Farm.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethereum/All.h>
 #include <libethereum/KeyManager.h>
 #include <libethereum/AccountDiff.h>
--- a/libdevcrypto/FileSystem.cpp
+++ b/libdevcrypto/FileSystem.cpp
@ -22,8 +22,8 @@
 */
 #include "FileSystem.h"
-#include <libdevcore/Common.h>
+#include "Common.h"
-#include <libdevcore/Log.h>
+#include "Log.h"
 #if defined(_WIN32)
 #include <shlobj.h>
--- a/libdevcrypto/FileSystem.h
+++ b/libdevcrypto/FileSystem.h
--- a/libdevcrypto/Hash.cpp
+++ b/libdevcrypto/Hash.cpp
--- a/libdevcrypto/Hash.h
+++ b/libdevcrypto/Hash.h
--- a/libdevcrypto/MemoryDB.cpp
+++ b/libdevcrypto/MemoryDB.cpp
--- a/libdevcrypto/MemoryDB.h
+++ b/libdevcrypto/MemoryDB.h
--- a/libdevcrypto/OverlayDB.cpp
+++ b/libdevcrypto/OverlayDB.cpp
--- a/libdevcrypto/OverlayDB.h
+++ b/libdevcrypto/OverlayDB.h
--- a/libdevcrypto/SHA3.cpp
+++ b/libdevcrypto/SHA3.cpp
@ -26,7 +26,6 @@
 #include <cstring>
 #include <libdevcore/RLP.h>
 #include "picosha2.h"
 #include "CryptoPP.h"
 using namespace std;
 using namespace dev;
--- a/libdevcrypto/SHA3.h
+++ b/libdevcrypto/SHA3.h
--- a/libdevcrypto/TrieCommon.cpp
+++ b/libdevcrypto/TrieCommon.cpp
--- a/libdevcrypto/TrieCommon.h
+++ b/libdevcrypto/TrieCommon.h
--- a/libdevcrypto/TrieDB.cpp
+++ b/libdevcrypto/TrieDB.cpp
--- a/libdevcrypto/TrieDB.h
+++ b/libdevcrypto/TrieDB.h
@ -30,7 +30,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/Exceptions.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "MemoryDB.h"
 #include "OverlayDB.h"
 #include "TrieCommon.h"
--- a/libdevcrypto/TrieHash.cpp
+++ b/libdevcrypto/TrieHash.cpp
@ -20,9 +20,9 @@
 */
 #include "TrieHash.h"
-#include <libdevcrypto/TrieCommon.h>
+#include <libdevcore/TrieCommon.h>
-#include <libdevcrypto/TrieDB.h>	// @TODO replace ASAP!
+#include <libdevcore/TrieDB.h>	// @TODO replace ASAP!
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/Common.h>
 using namespace std;
 using namespace dev;
--- a/libdevcrypto/TrieHash.h
+++ b/libdevcrypto/TrieHash.h
--- a/libdevcrypto/picosha2.h
+++ b/libdevcrypto/picosha2.h
--- a/libdevcrypto/Common.cpp
+++ b/libdevcrypto/Common.cpp
@ -26,9 +26,9 @@
 #include <thread>
 #include <mutex>
 #include <libdevcore/Guards.h>
-#include "SHA3.h"
+#include <libdevcore/SHA3.h>
 #include <libdevcore/FileSystem.h>
 #include "AES.h"
 #include "FileSystem.h"
 #include "CryptoPP.h"
 using namespace std;
 using namespace dev;
--- a/libdevcrypto/CryptoPP.h
+++ b/libdevcrypto/CryptoPP.h
@ -49,7 +49,7 @@
 #include <cryptopp/dsa.h>
 #pragma warning(pop)
 #pragma GCC diagnostic pop
-#include "SHA3.h"
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 namespace dev
--- a/libdevcrypto/ECDHE.cpp
+++ b/libdevcrypto/ECDHE.cpp
@ -19,9 +19,9 @@
 * @date 2014
 */
 #include "SHA3.h"
 #include "CryptoPP.h"
 #include "ECDHE.h"
 #include <libdevcore/SHA3.h>
 #include "CryptoPP.h"
 using namespace std;
 using namespace dev;
--- a/libdevcrypto/SecretStore.cpp
+++ b/libdevcrypto/SecretStore.cpp
@ -25,9 +25,9 @@
 #include <boost/filesystem.hpp>
 #include <libdevcore/Log.h>
 #include <libdevcore/Guards.h>
 #include <libdevcore/SHA3.h>
 #include <libdevcore/FileSystem.h>
 #include <test/JsonSpiritHeaders.h>
 #include "SHA3.h"
 #include "FileSystem.h"
 using namespace std;
 using namespace dev;
 namespace js = json_spirit;
--- a/libdevcrypto/SecretStore.h
+++ b/libdevcrypto/SecretStore.h
@ -24,8 +24,8 @@
 #include <functional>
 #include <mutex>
 #include <libdevcore/FixedHash.h>
 #include <libdevcore/FileSystem.h>
 #include "Common.h"
 #include "FileSystem.h"
 namespace dev
 {
--- a/libethcore/ABI.h
+++ b/libethcore/ABI.h
@ -24,7 +24,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/FixedHash.h>
 #include <libdevcore/CommonData.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 namespace dev
 {
--- a/libethcore/BlockInfo.cpp
+++ b/libethcore/BlockInfo.cpp
@ -21,8 +21,8 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
-#include <libdevcrypto/TrieHash.h>
+#include <libdevcore/TrieHash.h>
 #include <libethcore/Common.h>
 #include <libethcore/Params.h>
 #include "EthashAux.h"
--- a/libethcore/Common.cpp
+++ b/libethcore/Common.cpp
@ -23,7 +23,7 @@
 #include <random>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <libdevcore/Base64.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Exceptions.h"
 #include "ProofOfWork.h"
 using namespace std;
--- a/libethcore/Ethash.cpp
+++ b/libethcore/Ethash.cpp
@ -34,7 +34,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonIO.h>
 #include <libdevcrypto/CryptoPP.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethash/ethash.h>
 #include <libethash/internal.h>
 #if ETH_ETHASHCL || !ETH_TRUE
--- a/libethcore/EthashAux.cpp
+++ b/libethcore/EthashAux.cpp
@ -31,8 +31,8 @@
 #include <libdevcore/Guards.h>
 #include <libdevcore/Log.h>
 #include <libdevcrypto/CryptoPP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethash/internal.h>
 #include "BlockInfo.h"
 #include "Exceptions.h"
--- a/libethcore/ICAP.cpp
+++ b/libethcore/ICAP.cpp
@ -23,7 +23,7 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string.hpp>
 #include <libdevcore/Base64.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Exceptions.h"
 #include "ABI.h"
 using namespace std;
--- a/libethereum/Account.h
+++ b/libethereum/Account.h
@ -23,8 +23,8 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 namespace dev
 {
--- a/libethereum/BlockChain.cpp
+++ b/libethereum/BlockChain.cpp
@ -33,7 +33,7 @@
 #include <libdevcore/Assertions.h>
 #include <libdevcore/RLP.h>
 #include <libdevcore/StructuredLogger.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethcore/Exceptions.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/BlockInfo.h>
--- a/libethereum/CachedAddressState.cpp
+++ b/libethereum/CachedAddressState.cpp
@ -22,7 +22,7 @@
 #include "CachedAddressState.h"
 #include <libdevcrypto/Common.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
 #include "Account.h"
 using namespace std;
 using namespace dev;
--- a/libethereum/CanonBlockChain.cpp
+++ b/libethereum/CanonBlockChain.cpp
@ -25,7 +25,7 @@
 #include <boost/filesystem.hpp>
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libethcore/Exceptions.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/BlockInfo.h>
--- a/libethereum/Defaults.cpp
+++ b/libethereum/Defaults.cpp
@ -21,7 +21,7 @@
 #include "Defaults.h"
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
--- a/libethereum/KeyManager.h
+++ b/libethereum/KeyManager.h
@ -24,7 +24,7 @@
 #include <functional>
 #include <mutex>
 #include <libdevcrypto/SecretStore.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 namespace dev
 {
--- a/libethereum/LogFilter.cpp
+++ b/libethereum/LogFilter.cpp
@ -21,7 +21,7 @@
 #include "LogFilter.h"
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "State.h"
 using namespace std;
 using namespace dev;
--- a/libethereum/Precompiled.cpp
+++ b/libethereum/Precompiled.cpp
@ -22,8 +22,8 @@
 #include "Precompiled.h"
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
-#include <libdevcrypto/Hash.h>
+#include <libdevcore/Hash.h>
 #include <libdevcrypto/Common.h>
 #include <libethcore/Common.h>
 #include <libevmcore/Params.h>
--- a/libethereum/State.cpp
+++ b/libethereum/State.cpp
@ -29,7 +29,7 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/Assertions.h>
 #include <libdevcore/StructuredLogger.h>
-#include <libdevcrypto/TrieHash.h>
+#include <libdevcore/TrieHash.h>
 #include <libevmcore/Instruction.h>
 #include <libethcore/Exceptions.h>
 #include <libevm/VMFactory.h>
--- a/libethereum/State.h
+++ b/libethereum/State.h
@ -25,7 +25,7 @@
 #include <unordered_map>
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
 #include <libethcore/Exceptions.h>
 #include <libethcore/BlockInfo.h>
 #include <libethcore/ProofOfWork.h>
--- a/libethereum/Transaction.h
+++ b/libethereum/Transaction.h
@ -22,7 +22,7 @@
 #pragma once
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/Common.h>
 #include <libevmcore/Params.h>
 namespace dev
--- a/libethereum/Utility.cpp
+++ b/libethereum/Utility.cpp
@ -23,7 +23,7 @@
 #include <boost/regex.hpp>
 #include <libethcore/Common.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 using namespace std;
 using namespace dev;
 using namespace dev::eth;
--- a/libevm/ExtVMFace.h
+++ b/libevm/ExtVMFace.h
@ -26,7 +26,7 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/CommonData.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmcore/Instruction.h>
 #include <libethcore/Common.h>
 #include <libethcore/BlockInfo.h>
--- a/libevm/SmartVM.cpp
+++ b/libevm/SmartVM.cpp
@ -21,7 +21,7 @@
 #include "SmartVM.h"
 #include <unordered_map>
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <evmjit/JIT.h>
 #include <evmjit/libevmjit-cpp/Utils.h>
 #include "VMFactory.h"
--- a/libevm/VM.h
+++ b/libevm/VM.h
@ -25,7 +25,7 @@
 #include <libdevcore/Exceptions.h>
 #include <libethcore/Common.h>
 #include <libevmcore/Instruction.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/BlockInfo.h>
 #include <libevmcore/Params.h>
 #include "VMFace.h"
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@ -23,7 +23,7 @@
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/AssemblyItem.h>
--- a/libevmasm/KnownState.cpp
+++ b/libevmasm/KnownState.cpp
@ -23,7 +23,7 @@
 #include "KnownState.h"
 #include <functional>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmasm/AssemblyItem.h>
 using namespace std;
--- a/libp2p/Host.cpp
+++ b/libp2p/Host.cpp
@ -31,7 +31,7 @@
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/StructuredLogger.h>
 #include <libethcore/Exceptions.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include "Session.h"
 #include "Common.h"
 #include "Capability.h"
--- a/libp2p/UDP.h
+++ b/libp2p/UDP.h
@ -29,7 +29,7 @@
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
 #include "Common.h"
--- a/libsolidity/AST.cpp
+++ b/libsolidity/AST.cpp
@ -28,7 +28,7 @@
 #include <libsolidity/Exceptions.h>
 #include <libsolidity/AST_accept.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 using namespace std;
--- a/libsolidity/CompilerStack.cpp
+++ b/libsolidity/CompilerStack.cpp
@ -31,7 +31,7 @@
 #include <libsolidity/CompilerStack.h>
 #include <libsolidity/InterfaceHandler.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 using namespace std;
--- a/libsolidity/ExpressionCompiler.cpp
+++ b/libsolidity/ExpressionCompiler.cpp
@ -24,7 +24,7 @@
 #include <numeric>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libdevcore/Common.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/ExpressionCompiler.h>
 #include <libsolidity/CompilerContext.h>
--- a/libsolidity/Types.cpp
+++ b/libsolidity/Types.cpp
@ -25,7 +25,7 @@
 #include <boost/range/adaptor/reversed.hpp>
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/CommonData.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libsolidity/Utils.h>
 #include <libsolidity/AST.h>
--- a/libtestutils/Common.cpp
+++ b/libtestutils/Common.cpp
@ -23,7 +23,7 @@
 #include <boost/filesystem.hpp>
 #include <libdevcore/CommonData.h>
 #include <libdevcore/CommonIO.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include "Common.h"
 using namespace std;
--- a/libweb3jsonrpc/WebThreeStubServer.cpp
+++ b/libweb3jsonrpc/WebThreeStubServer.cpp
@ -26,7 +26,7 @@
 #include <boost/filesystem.hpp>
 #include <libwebthree/WebThree.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include "WebThreeStubServer.h"
 using namespace std;
--- a/libwhisper/Common.cpp
+++ b/libwhisper/Common.cpp
@ -21,7 +21,7 @@
 #include "Common.h"
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Message.h"
 using namespace std;
 using namespace dev;
--- a/libwhisper/Interface.h
+++ b/libwhisper/Interface.h
@ -29,7 +29,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 #include "Message.h"
--- a/libwhisper/Message.h
+++ b/libwhisper/Message.h
@ -30,7 +30,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
 #include <libdevcrypto/Common.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 namespace dev
--- a/libwhisper/WhisperHost.h
+++ b/libwhisper/WhisperHost.h
@ -30,7 +30,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcore/Worker.h>
 #include <libdevcore/Guards.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 #include "WhisperPeer.h"
 #include "Interface.h"
--- a/libwhisper/WhisperPeer.h
+++ b/libwhisper/WhisperPeer.h
@ -29,7 +29,7 @@
 #include <libdevcore/RLP.h>
 #include <libdevcore/Guards.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "Common.h"
 #include "Message.h"
--- a/mix/FileIo.cpp
+++ b/mix/FileIo.cpp
@ -34,7 +34,7 @@
 #include <libdevcrypto/CryptoPP.h>
 #include <libdevcrypto/Common.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include "FileIo.h"
 using namespace dev;
--- a/mix/QFunctionDefinition.cpp
+++ b/mix/QFunctionDefinition.cpp
@ -20,7 +20,7 @@
 */
 #include <libsolidity/AST.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libdevcore/Exceptions.h>
 #include "QVariableDeclaration.h"
 #include "QFunctionDefinition.h"
--- a/neth/main.cpp
+++ b/neth/main.cpp
@ -29,7 +29,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim_all.hpp>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libevmcore/Instruction.h>
 #include <libdevcore/StructuredLogger.h>
 #include <libevm/VM.h>
--- a/rlp/main.cpp
+++ b/rlp/main.cpp
@ -25,7 +25,7 @@
 #include "../test/JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
 #include <libdevcore/RLP.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 using namespace std;
 using namespace dev;
 namespace js = json_spirit;
--- a/test/deprecated/main.cpp
+++ b/test/deprecated/main.cpp
@ -20,7 +20,7 @@
 * Main test functions.
 */
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
--- a/test/libdevcrypto/MemTrie.cpp
+++ b/test/libdevcrypto/MemTrie.cpp
@ -21,8 +21,8 @@
 #include "MemTrie.h"
-#include <libdevcrypto/TrieCommon.h>
+#include <libdevcore/TrieCommon.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libethcore/Common.h>
 using namespace std;
 using namespace dev;
--- a/test/libdevcrypto/crypto.cpp
+++ b/test/libdevcrypto/crypto.cpp
@ -28,7 +28,7 @@
 #include <libdevcore/Log.h>
 #include <libethereum/Transaction.h>
 #include <boost/test/unit_test.hpp>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libdevcrypto/ECDHE.h>
 #include <libdevcrypto/CryptoPP.h>
--- a/test/libdevcrypto/hexPrefix.cpp
+++ b/test/libdevcrypto/hexPrefix.cpp
@ -27,7 +27,7 @@
 #include "../JsonSpiritHeaders.h"
 #include <libdevcore/Log.h>
 #include <libdevcore/CommonIO.h>
-#include <libdevcrypto/TrieCommon.h>
+#include <libdevcore/TrieCommon.h>
 #include "../TestHelper.h"
 using namespace std;
--- a/test/libdevcrypto/trie.cpp
+++ b/test/libdevcrypto/trie.cpp
@ -27,8 +27,8 @@
 #include "../JsonSpiritHeaders.h"
 #include <libdevcore/CommonIO.h>
-#include <libdevcrypto/TrieDB.h>
+#include <libdevcore/TrieDB.h>
-#include <libdevcrypto/TrieHash.h>
+#include <libdevcore/TrieHash.h>
 #include "MemTrie.h"
 #include "../TestHelper.h"
--- a/test/libethereum/blockchain.cpp
+++ b/test/libethereum/blockchain.cpp
@ -21,7 +21,7 @@
 */
 #include <boost/filesystem.hpp>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <libdevcore/TransientDirectory.h>
 #include <libethereum/CanonBlockChain.h>
 #include <test/TestHelper.h>
--- a/test/libp2p/rlpx.cpp
+++ b/test/libp2p/rlpx.cpp
@ -27,7 +27,7 @@
 #include <libdevcore/Log.h>
 #include <libethereum/Transaction.h>
 #include <boost/test/unit_test.hpp>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libdevcrypto/ECDHE.h>
 #include <libdevcrypto/CryptoPP.h>
 #include <libp2p/RLPxHandshake.h>
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@ -24,7 +24,7 @@
 #include <string>
 #include <tuple>
 #include <boost/test/unit_test.hpp>
-#include <libdevcrypto/Hash.h>
+#include <libdevcore/Hash.h>
 #include <test/libsolidity/solidityExecutionFramework.h>
 using namespace std;
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@ -23,7 +23,7 @@
 #include <string>
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>
 #include <libsolidity/NameAndTypeResolver.h>
--- a/third/MainWin.cpp
+++ b/third/MainWin.cpp
@ -32,7 +32,7 @@
 #include <QtCore/QtCore>
 #include <libserpent/funcs.h>
 #include <libserpent/util.h>
-#include <libdevcrypto/FileSystem.h>
+#include <libdevcore/FileSystem.h>
 #include <liblll/Compiler.h>
 #include <liblll/CodeFragment.h>
 #include <libevm/VM.h>