diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb8c1a49c..3c7a6b533 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 include(EthOptions)
 configure_project(TESTS)
 
-add_subdirectory(libdevcore)
+add_subdirectory(libsolutil)
 add_subdirectory(liblangutil)
 add_subdirectory(libevmasm)
 add_subdirectory(libyul)
diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index 0d17fad18..6bdb48fba 100644
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -211,7 +211,7 @@ for (map<ComplexTypeOne, ComplexTypeTwo>::iterator i = l.begin(); i != l.end();
 
 ## 12. Include Headers
 
-1. Includes should go in increasing order of generality (`libsolidity` -> `libevmasm` -> `libdevcore` -> `boost` -> `STL`).
+1. Includes should go in increasing order of generality (`libsolidity` -> `libevmasm` -> `libsolutil` -> `boost` -> `STL`).
 2. The corresponding `.h` file should be the first include in the respective `.cpp` file.
 3. Insert empty lines between blocks of include files.
 
@@ -226,8 +226,8 @@ Example:
 
 #include <libevmasm/GasMeter.h>
 
-#include <libdevcore/Common.h>
-#include <libdevcore/SHA3.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/SHA3.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/Changelog.md b/Changelog.md
index 4487b30e4..14125c809 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -900,7 +900,7 @@ Features:
  * ABI JSON: Include new field ``stateMutability`` with values ``pure``, ``view``,
    ``nonpayable`` and ``payable``.
  * Analyzer: Experimental partial support for Z3 SMT checker ("SMTChecker").
- * Build System: Shared libraries (``libdevcore``, ``libevmasm``, ``libsolidity``
+ * Build System: Shared libraries (``libsolutil``, ``libevmasm``, ``libsolidity``
    and ``liblll``) are no longer produced during the build process.
  * Code generator: Experimental new implementation of ABI encoder that can
    encode arbitrarily nested arrays ("ABIEncoderV2")
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index de5f46465..9e146be01 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -25,9 +25,9 @@
 
 #include <liblangutil/EVMVersion.h>
 
-#include <libdevcore/Common.h>
-#include <libdevcore/Assertions.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/Keccak256.h>
 
 #include <json/json.h>
 
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index a2104a576..b9b6c4acd 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -17,8 +17,8 @@
 
 #include <libevmasm/AssemblyItem.h>
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/FixedHash.h>
 
 #include <fstream>
 
diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
index b860a3657..31f175103 100644
--- a/libevmasm/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -24,8 +24,8 @@
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Exceptions.h>
 #include <liblangutil/SourceLocation.h>
-#include <libdevcore/Common.h>
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/Assertions.h>
 #include <iostream>
 #include <sstream>
 
diff --git a/libevmasm/BlockDeduplicator.h b/libevmasm/BlockDeduplicator.h
index ecb4bc797..ce12b4bfb 100644
--- a/libevmasm/BlockDeduplicator.h
+++ b/libevmasm/BlockDeduplicator.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <cstddef>
 #include <vector>
diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
index 945768120..747f78f24 100644
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -23,7 +23,7 @@
 
 #include <functional>
 #include <boost/range/adaptor/reversed.hpp>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 #include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/AssemblyItem.h>
 
diff --git a/libevmasm/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
index 1b7a7e168..0e6f6ee36 100644
--- a/libevmasm/CommonSubexpressionEliminator.h
+++ b/libevmasm/CommonSubexpressionEliminator.h
@@ -28,8 +28,8 @@
 #include <set>
 #include <tuple>
 #include <ostream>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/Exceptions.h>
 #include <libevmasm/ExpressionClasses.h>
 #include <libevmasm/SemanticInformation.h>
 #include <libevmasm/KnownState.h>
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
index b6b746231..8e6d991a5 100644
--- a/libevmasm/ConstantOptimiser.cpp
+++ b/libevmasm/ConstantOptimiser.cpp
@@ -22,7 +22,7 @@
 #include <libevmasm/ConstantOptimiser.h>
 #include <libevmasm/Assembly.h>
 #include <libevmasm/GasMeter.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libevmasm/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h
index b46b1936d..a9db47ab1 100644
--- a/libevmasm/ConstantOptimiser.h
+++ b/libevmasm/ConstantOptimiser.h
@@ -25,9 +25,9 @@
 
 #include <liblangutil/EVMVersion.h>
 
-#include <libdevcore/Assertions.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/CommonIO.h>
 
 #include <vector>
 
diff --git a/libevmasm/ControlFlowGraph.h b/libevmasm/ControlFlowGraph.h
index f5bf487c5..a0c2b9632 100644
--- a/libevmasm/ControlFlowGraph.h
+++ b/libevmasm/ControlFlowGraph.h
@@ -25,8 +25,8 @@
 
 #include <vector>
 #include <memory>
-#include <libdevcore/Common.h>
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/Assertions.h>
 #include <libevmasm/ExpressionClasses.h>
 
 namespace solidity::evmasm
diff --git a/libevmasm/Exceptions.h b/libevmasm/Exceptions.h
index f4d4cfa93..e4fadb53c 100644
--- a/libevmasm/Exceptions.h
+++ b/libevmasm/Exceptions.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 namespace solidity::evmasm
 {
diff --git a/libevmasm/ExpressionClasses.h b/libevmasm/ExpressionClasses.h
index 7014cc46d..f9eebabd0 100644
--- a/libevmasm/ExpressionClasses.h
+++ b/libevmasm/ExpressionClasses.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 #include <libevmasm/AssemblyItem.h>
 
 #include <vector>
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index cd781b71d..358d67c3a 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -19,7 +19,7 @@
 
 #include <libevmasm/KnownState.h>
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index 47930fb4e..34fef1642 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -21,8 +21,8 @@
 
 #include <libevmasm/Instruction.h>
 
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/CommonIO.h>
 #include <algorithm>
 #include <functional>
 
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 78146c1e9..511e3cf1b 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -22,8 +22,8 @@
 #pragma once
 
 #include <libevmasm/Exceptions.h>
-#include <libdevcore/Common.h>
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/Assertions.h>
 #include <functional>
 
 namespace solidity::evmasm
diff --git a/libevmasm/KnownState.cpp b/libevmasm/KnownState.cpp
index e8838afa4..b6198e994 100644
--- a/libevmasm/KnownState.cpp
+++ b/libevmasm/KnownState.cpp
@@ -23,7 +23,7 @@
 
 #include <libevmasm/KnownState.h>
 #include <libevmasm/AssemblyItem.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <functional>
 
diff --git a/libevmasm/KnownState.h b/libevmasm/KnownState.h
index 7a9efa13d..a9cc4f201 100644
--- a/libevmasm/KnownState.h
+++ b/libevmasm/KnownState.h
@@ -41,8 +41,8 @@
 #pragma clang diagnostic pop
 #endif // defined(__clang__)
 
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/Exceptions.h>
 #include <libevmasm/ExpressionClasses.h>
 #include <libevmasm/SemanticInformation.h>
 
diff --git a/libevmasm/LinkerObject.cpp b/libevmasm/LinkerObject.cpp
index 2906c9abf..21b213101 100644
--- a/libevmasm/LinkerObject.cpp
+++ b/libevmasm/LinkerObject.cpp
@@ -20,8 +20,8 @@
  */
 
 #include <libevmasm/LinkerObject.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Keccak256.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libevmasm/LinkerObject.h b/libevmasm/LinkerObject.h
index 85439485d..e7a1e9667 100644
--- a/libevmasm/LinkerObject.h
+++ b/libevmasm/LinkerObject.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/FixedHash.h>
 
 namespace solidity::evmasm
 {
diff --git a/libevmasm/RuleList.h b/libevmasm/RuleList.h
index f2daa88ea..812c67002 100644
--- a/libevmasm/RuleList.h
+++ b/libevmasm/RuleList.h
@@ -25,7 +25,7 @@
 #include <libevmasm/Instruction.h>
 #include <libevmasm/SimplificationRule.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/multiprecision/detail/min_max.hpp>
 
diff --git a/libevmasm/SimplificationRule.h b/libevmasm/SimplificationRule.h
index f50090ce4..3e40e25ed 100644
--- a/libevmasm/SimplificationRule.h
+++ b/libevmasm/SimplificationRule.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <libevmasm/Instruction.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 #include <functional>
 
 namespace solidity::evmasm
diff --git a/libevmasm/SimplificationRules.cpp b/libevmasm/SimplificationRules.cpp
index 542e650b8..751153b05 100644
--- a/libevmasm/SimplificationRules.cpp
+++ b/libevmasm/SimplificationRules.cpp
@@ -27,7 +27,7 @@
 #include <libevmasm/Assembly.h>
 #include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/RuleList.h>
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Assertions.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/libevmasm/SimplificationRules.h b/libevmasm/SimplificationRules.h
index 0d02aa15a..72884d32a 100644
--- a/libevmasm/SimplificationRules.h
+++ b/libevmasm/SimplificationRules.h
@@ -26,7 +26,7 @@
 #include <libevmasm/ExpressionClasses.h>
 #include <libevmasm/SimplificationRule.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/noncopyable.hpp>
 
diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
index d4147e050..3acf5afee 100644
--- a/liblangutil/ErrorReporter.h
+++ b/liblangutil/ErrorReporter.h
@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/SourceLocation.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/range/adaptor/filtered.hpp>
 
diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index 93096ad75..de72eba37 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -26,9 +26,9 @@
 #include <utility>
 #include <vector>
 #include <memory>
-#include <libdevcore/Exceptions.h>
-#include <libdevcore/Assertions.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/Exceptions.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/CommonData.h>
 #include <liblangutil/SourceLocation.h>
 
 namespace solidity::langutil
diff --git a/liblangutil/Scanner.h b/liblangutil/Scanner.h
index 8dda74bfc..20dfbf29c 100644
--- a/liblangutil/Scanner.h
+++ b/liblangutil/Scanner.h
@@ -55,8 +55,8 @@
 #include <liblangutil/Token.h>
 #include <liblangutil/CharStream.h>
 #include <liblangutil/SourceLocation.h>
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/CommonData.h>
 
 #include <optional>
 #include <iosfwd>
diff --git a/liblangutil/SourceLocation.h b/liblangutil/SourceLocation.h
index 5f3d637e3..d86dd206a 100644
--- a/liblangutil/SourceLocation.h
+++ b/liblangutil/SourceLocation.h
@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <libdevcore/Assertions.h>
-#include <libdevcore/Common.h> // defines noexcept macro for MSVC
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/Common.h> // defines noexcept macro for MSVC
+#include <libsolutil/Exceptions.h>
 #include <liblangutil/CharStream.h>
 #include <memory>
 #include <string>
diff --git a/liblangutil/SourceReferenceFormatterHuman.h b/liblangutil/SourceReferenceFormatterHuman.h
index a04344a8b..060adc00e 100644
--- a/liblangutil/SourceReferenceFormatterHuman.h
+++ b/liblangutil/SourceReferenceFormatterHuman.h
@@ -23,7 +23,7 @@
 #include <liblangutil/SourceReferenceExtractor.h>
 #include <liblangutil/SourceReferenceFormatter.h> // SourceReferenceFormatterBase
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <ostream>
 #include <sstream>
diff --git a/liblangutil/Token.h b/liblangutil/Token.h
index ee76605fe..ed6cff3e1 100644
--- a/liblangutil/Token.h
+++ b/liblangutil/Token.h
@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/UndefMacros.h>
 
diff --git a/liblll/CodeFragment.cpp b/liblll/CodeFragment.cpp
index e6ae19199..556f3dcf6 100644
--- a/liblll/CodeFragment.cpp
+++ b/liblll/CodeFragment.cpp
@@ -23,7 +23,7 @@
 #include <liblll/CompilerState.h>
 #include <liblll/Parser.h>
 #include <libevmasm/Instruction.h>
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/liblll/CodeFragment.h b/liblll/CodeFragment.h
index c4dff9f6a..894c91821 100644
--- a/liblll/CodeFragment.h
+++ b/liblll/CodeFragment.h
@@ -24,7 +24,7 @@
 #include <liblll/Exceptions.h>
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Assembly.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 namespace boost { namespace spirit { class utree; } }
 namespace sp = boost::spirit;
diff --git a/liblll/Compiler.h b/liblll/Compiler.h
index 23dae8537..8d2989ce5 100644
--- a/liblll/Compiler.h
+++ b/liblll/Compiler.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <liblangutil/EVMVersion.h>
 
diff --git a/liblll/Exceptions.h b/liblll/Exceptions.h
index 25a01a2a8..57fbf6ad3 100644
--- a/liblll/Exceptions.h
+++ b/liblll/Exceptions.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 namespace solidity::lll
 {
diff --git a/liblll/Parser.h b/liblll/Parser.h
index 9dac1baed..424356e0c 100644
--- a/liblll/Parser.h
+++ b/liblll/Parser.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <liblll/Exceptions.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 #include <string>
 #include <vector>
 
diff --git a/libsolc/libsolc.cpp b/libsolc/libsolc.cpp
index 8e8afe899..d216ae8a2 100644
--- a/libsolc/libsolc.cpp
+++ b/libsolc/libsolc.cpp
@@ -24,8 +24,8 @@
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/Version.h>
 #include <libyul/YulString.h>
-#include <libdevcore/Common.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/JSON.h>
 
 #include <cstdlib>
 #include <list>
diff --git a/libsolidity/analysis/ControlFlowAnalyzer.cpp b/libsolidity/analysis/ControlFlowAnalyzer.cpp
index 84088cc42..a774dee61 100644
--- a/libsolidity/analysis/ControlFlowAnalyzer.cpp
+++ b/libsolidity/analysis/ControlFlowAnalyzer.cpp
@@ -18,7 +18,7 @@
 #include <libsolidity/analysis/ControlFlowAnalyzer.h>
 
 #include <liblangutil/SourceLocation.h>
-#include <libdevcore/Algorithms.h>
+#include <libsolutil/Algorithms.h>
 #include <boost/range/algorithm/sort.hpp>
 
 using namespace std;
diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp
index 036511d33..2450778cd 100644
--- a/libsolidity/analysis/DeclarationContainer.cpp
+++ b/libsolidity/analysis/DeclarationContainer.cpp
@@ -24,7 +24,7 @@
 
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/Types.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 7995ae6c9..c2e9124a7 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -25,7 +25,7 @@
 #include <libsolidity/analysis/TypeChecker.h>
 #include <libsolidity/ast/AST.h>
 #include <liblangutil/ErrorReporter.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 #include <boost/algorithm/string.hpp>
 
 using namespace std;
diff --git a/libsolidity/analysis/OverrideChecker.cpp b/libsolidity/analysis/OverrideChecker.cpp
index f401020d1..fc2c8df62 100644
--- a/libsolidity/analysis/OverrideChecker.cpp
+++ b/libsolidity/analysis/OverrideChecker.cpp
@@ -25,7 +25,7 @@
 #include <libsolidity/ast/TypeProvider.h>
 #include <libsolidity/analysis/TypeChecker.h>
 #include <liblangutil/ErrorReporter.h>
-#include <libdevcore/Visitor.h>
+#include <libsolutil/Visitor.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
index 0c3cc4afe..a83c51d3b 100644
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ b/libsolidity/analysis/PostTypeChecker.cpp
@@ -21,7 +21,7 @@
 #include <libsolidity/interface/Version.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SemVerHandler.h>
-#include <libdevcore/Algorithms.h>
+#include <libsolutil/Algorithms.h>
 
 #include <boost/range/adaptor/map.hpp>
 #include <memory>
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index 7c809ad83..889ec4d2d 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -34,7 +34,7 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Exceptions.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/range/adaptor/transformed.hpp>
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index a7f4c8762..e1b289c73 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -31,8 +31,8 @@
 
 #include <liblangutil/ErrorReporter.h>
 
-#include <libdevcore/Algorithms.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/Algorithms.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/cxx11/all_of.hpp>
 #include <boost/algorithm/string/join.hpp>
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index e8065c370..bd48c21a4 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -25,7 +25,7 @@
 #include <libsolidity/ast/ASTVisitor.h>
 #include <libsolidity/ast/AST_accept.h>
 #include <libsolidity/ast/TypeProvider.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 203914bdb..0c36128b0 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -30,7 +30,7 @@
 
 #include <liblangutil/SourceLocation.h>
 #include <libevmasm/Instruction.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <boost/noncopyable.hpp>
 #include <json/json.h>
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index d42a4d8f4..655f3c670 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -26,8 +26,8 @@
 #include <libyul/AsmJsonConverter.h>
 #include <libyul/AsmData.h>
 #include <libyul/AsmPrinter.h>
-#include <libdevcore/JSON.h>
-#include <libdevcore/UTF8.h>
+#include <libsolutil/JSON.h>
+#include <libsolutil/UTF8.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/algorithm/sort.hpp>
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 7e140e9c4..4f596468b 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -25,11 +25,11 @@
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/TypeProvider.h>
 
-#include <libdevcore/Algorithms.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/Keccak256.h>
-#include <libdevcore/UTF8.h>
+#include <libsolutil/Algorithms.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/UTF8.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 13a9c5628..0308fc452 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -27,9 +27,9 @@
 #include <libsolidity/parsing/Token.h>
 #include <liblangutil/Exceptions.h>
 
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/Result.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/Result.h>
 
 #include <boost/rational.hpp>
 
diff --git a/libsolidity/codegen/ABIFunctions.cpp b/libsolidity/codegen/ABIFunctions.cpp
index ea7106ede..df8cacf86 100644
--- a/libsolidity/codegen/ABIFunctions.cpp
+++ b/libsolidity/codegen/ABIFunctions.cpp
@@ -23,9 +23,9 @@
 #include <libsolidity/codegen/ABIFunctions.h>
 
 #include <libsolidity/codegen/CompilerUtils.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Whiskers.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Whiskers.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/adaptor/reversed.hpp>
diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h
index 9abda7aa1..45f16f1f1 100644
--- a/libsolidity/codegen/CompilerContext.h
+++ b/libsolidity/codegen/CompilerContext.h
@@ -32,7 +32,7 @@
 #include <libevmasm/Assembly.h>
 #include <libevmasm/Instruction.h>
 #include <liblangutil/EVMVersion.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <functional>
 #include <ostream>
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index 8d7cfb386..f9a0fbcec 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -28,7 +28,7 @@
 #include <libsolidity/codegen/ArrayUtils.h>
 #include <libsolidity/codegen/LValue.h>
 #include <libevmasm/Instruction.h>
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Whiskers.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index bbe064402..ecf62d29a 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -35,7 +35,7 @@
 
 #include <liblangutil/ErrorReporter.h>
 
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Whiskers.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <algorithm>
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 7e460db9d..921e2ecff 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -29,9 +29,9 @@
 #include <libsolidity/codegen/LValue.h>
 
 #include <libevmasm/GasMeter.h>
-#include <libdevcore/Common.h>
-#include <libdevcore/Keccak256.h>
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/Whiskers.h>
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/range/adaptor/reversed.hpp>
diff --git a/libsolidity/codegen/ExpressionCompiler.h b/libsolidity/codegen/ExpressionCompiler.h
index 2842b7e78..57f198819 100644
--- a/libsolidity/codegen/ExpressionCompiler.h
+++ b/libsolidity/codegen/ExpressionCompiler.h
@@ -28,7 +28,7 @@
 #include <libsolidity/interface/DebugSettings.h>
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/SourceLocation.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <boost/noncopyable.hpp>
 #include <functional>
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 0f62450c9..b06d07182 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -24,9 +24,9 @@
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/codegen/CompilerUtils.h>
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Whiskers.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Whiskers.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/adaptor/reversed.hpp>
diff --git a/libsolidity/codegen/ir/IRGenerationContext.cpp b/libsolidity/codegen/ir/IRGenerationContext.cpp
index 3a2bdb9f0..29fc3aa03 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.cpp
+++ b/libsolidity/codegen/ir/IRGenerationContext.cpp
@@ -23,8 +23,8 @@
 #include <libsolidity/codegen/YulUtilFunctions.h>
 #include <libsolidity/ast/AST.h>
 
-#include <libdevcore/Whiskers.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/Whiskers.h>
+#include <libsolutil/StringUtils.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
index f2710e6ab..3151d4357 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.h
+++ b/libsolidity/codegen/ir/IRGenerationContext.h
@@ -26,7 +26,7 @@
 
 #include <liblangutil/EVMVersion.h>
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <string>
 #include <memory>
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index e004fc173..bd2099c4a 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -32,9 +32,9 @@
 #include <libyul/AssemblyStack.h>
 #include <libyul/Utilities.h>
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Whiskers.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Whiskers.h>
+#include <libsolutil/StringUtils.h>
 
 #include <liblangutil/SourceReferenceFormatter.h>
 
diff --git a/libsolidity/codegen/ir/IRLValue.cpp b/libsolidity/codegen/ir/IRLValue.cpp
index 99b0daa0c..9cbf4e992 100644
--- a/libsolidity/codegen/ir/IRLValue.cpp
+++ b/libsolidity/codegen/ir/IRLValue.cpp
@@ -25,7 +25,7 @@
 #include <libsolidity/codegen/CompilerUtils.h>
 #include <libsolidity/ast/AST.h>
 
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Whiskers.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libsolidity/codegen/ir/IRLValue.h b/libsolidity/codegen/ir/IRLValue.h
index 412ad54f5..7b58416c0 100644
--- a/libsolidity/codegen/ir/IRLValue.h
+++ b/libsolidity/codegen/ir/IRLValue.h
@@ -22,7 +22,7 @@
 
 #include <libsolidity/codegen/YulUtilFunctions.h>
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <string>
 #include <ostream>
diff --git a/libsolidity/formal/CHCSmtLib2Interface.cpp b/libsolidity/formal/CHCSmtLib2Interface.cpp
index b654207e4..1b58b791e 100644
--- a/libsolidity/formal/CHCSmtLib2Interface.cpp
+++ b/libsolidity/formal/CHCSmtLib2Interface.cpp
@@ -17,7 +17,7 @@
 
 #include <libsolidity/formal/CHCSmtLib2Interface.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/libsolidity/formal/CVC4Interface.cpp b/libsolidity/formal/CVC4Interface.cpp
index c2aa8d65b..9aecc2586 100644
--- a/libsolidity/formal/CVC4Interface.cpp
+++ b/libsolidity/formal/CVC4Interface.cpp
@@ -18,7 +18,7 @@
 #include <libsolidity/formal/CVC4Interface.h>
 
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libsolidity/formal/SMTLib2Interface.cpp b/libsolidity/formal/SMTLib2Interface.cpp
index 850bcee69..74529b4c5 100644
--- a/libsolidity/formal/SMTLib2Interface.cpp
+++ b/libsolidity/formal/SMTLib2Interface.cpp
@@ -17,7 +17,7 @@
 
 #include <libsolidity/formal/SMTLib2Interface.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/libsolidity/formal/SMTLib2Interface.h b/libsolidity/formal/SMTLib2Interface.h
index 550b8af7c..17d385cb2 100644
--- a/libsolidity/formal/SMTLib2Interface.h
+++ b/libsolidity/formal/SMTLib2Interface.h
@@ -21,8 +21,8 @@
 
 #include <libsolidity/interface/ReadFile.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/Common.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/FixedHash.h>
 
 #include <boost/noncopyable.hpp>
 #include <cstdio>
diff --git a/libsolidity/formal/SMTPortfolio.h b/libsolidity/formal/SMTPortfolio.h
index 1cd1e6f89..7799f2268 100644
--- a/libsolidity/formal/SMTPortfolio.h
+++ b/libsolidity/formal/SMTPortfolio.h
@@ -20,7 +20,7 @@
 
 #include <libsolidity/formal/SolverInterface.h>
 #include <libsolidity/interface/ReadFile.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <boost/noncopyable.hpp>
 #include <map>
diff --git a/libsolidity/formal/SolverInterface.h b/libsolidity/formal/SolverInterface.h
index 3afb0c468..512be65bb 100644
--- a/libsolidity/formal/SolverInterface.h
+++ b/libsolidity/formal/SolverInterface.h
@@ -20,8 +20,8 @@
 #include <libsolidity/ast/Types.h>
 #include <libsolidity/interface/ReadFile.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/Common.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/Exceptions.h>
 
 #include <boost/noncopyable.hpp>
 #include <cstdio>
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index 90cf33a63..a2475b337 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -19,7 +19,7 @@
 
 #include <libsolidity/ast/TypeProvider.h>
 #include <libsolidity/ast/Types.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 #include <memory>
 
 using namespace std;
diff --git a/libsolidity/formal/Z3CHCInterface.cpp b/libsolidity/formal/Z3CHCInterface.cpp
index 05b0a2032..c64da2edc 100644
--- a/libsolidity/formal/Z3CHCInterface.cpp
+++ b/libsolidity/formal/Z3CHCInterface.cpp
@@ -18,7 +18,7 @@
 #include <libsolidity/formal/Z3CHCInterface.h>
 
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libsolidity/formal/Z3Interface.cpp b/libsolidity/formal/Z3Interface.cpp
index 679dda43e..20150c337 100644
--- a/libsolidity/formal/Z3Interface.cpp
+++ b/libsolidity/formal/Z3Interface.cpp
@@ -18,7 +18,7 @@
 #include <libsolidity/formal/Z3Interface.h>
 
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 using namespace std;
 using namespace solidity::frontend::smt;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index e6d50f7e4..7c64d0df3 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -58,9 +58,9 @@
 
 #include <libevmasm/Exceptions.h>
 
-#include <libdevcore/SwarmHash.h>
-#include <libdevcore/IpfsHash.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/SwarmHash.h>
+#include <libsolutil/IpfsHash.h>
+#include <libsolutil/JSON.h>
 
 #include <json/json.h>
 
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 80249ec5c..0e9ffaff1 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -35,8 +35,8 @@
 
 #include <libevmasm/LinkerObject.h>
 
-#include <libdevcore/Common.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/FixedHash.h>
 
 #include <boost/noncopyable.hpp>
 #include <json/json.h>
diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp
index 8e6827ed0..7282b1598 100644
--- a/libsolidity/interface/GasEstimator.cpp
+++ b/libsolidity/interface/GasEstimator.cpp
@@ -29,7 +29,7 @@
 #include <libevmasm/ControlFlowGraph.h>
 #include <libevmasm/KnownState.h>
 #include <libevmasm/PathGasMeter.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <functional>
 #include <map>
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index a942c74be..3a86914d1 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -27,8 +27,8 @@
 #include <libyul/Exceptions.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 #include <libevmasm/Instruction.h>
-#include <libdevcore/JSON.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/JSON.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/algorithm/cxx11/any_of.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/libsolidity/interface/Version.cpp b/libsolidity/interface/Version.cpp
index f00192861..412750bc8 100644
--- a/libsolidity/interface/Version.cpp
+++ b/libsolidity/interface/Version.cpp
@@ -23,8 +23,8 @@
 #include <libsolidity/interface/Version.h>
 
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Common.h>
 #include <solidity/BuildInfo.h>
 #include <string>
 
diff --git a/libsolidity/interface/Version.h b/libsolidity/interface/Version.h
index 60d624a3c..f2b1ad429 100644
--- a/libsolidity/interface/Version.h
+++ b/libsolidity/interface/Version.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 #include <string>
 
 namespace solidity::frontend
diff --git a/libdevcore/Algorithms.h b/libsolutil/Algorithms.h
similarity index 100%
rename from libdevcore/Algorithms.h
rename to libsolutil/Algorithms.h
diff --git a/libdevcore/AnsiColorized.h b/libsolutil/AnsiColorized.h
similarity index 100%
rename from libdevcore/AnsiColorized.h
rename to libsolutil/AnsiColorized.h
diff --git a/libdevcore/Assertions.h b/libsolutil/Assertions.h
similarity index 97%
rename from libdevcore/Assertions.h
rename to libsolutil/Assertions.h
index f74991651..c0c330835 100644
--- a/libdevcore/Assertions.h
+++ b/libsolutil/Assertions.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 namespace solidity::util
 {
diff --git a/libdevcore/CMakeLists.txt b/libsolutil/CMakeLists.txt
similarity index 100%
rename from libdevcore/CMakeLists.txt
rename to libsolutil/CMakeLists.txt
diff --git a/libdevcore/Common.h b/libsolutil/Common.h
similarity index 99%
rename from libdevcore/Common.h
rename to libsolutil/Common.h
index 4075ce153..35bd37fe8 100644
--- a/libdevcore/Common.h
+++ b/libsolutil/Common.h
@@ -37,7 +37,7 @@
 #pragma warning(disable:3682) //call through incomplete class
 #endif
 
-#include <libdevcore/vector_ref.h>
+#include <libsolutil/vector_ref.h>
 
 #include <boost/version.hpp>
 #if (BOOST_VERSION < 106500)
diff --git a/libdevcore/CommonData.cpp b/libsolutil/CommonData.cpp
similarity index 96%
rename from libdevcore/CommonData.cpp
rename to libsolutil/CommonData.cpp
index d6104861b..2024a1b1f 100644
--- a/libdevcore/CommonData.cpp
+++ b/libsolutil/CommonData.cpp
@@ -19,11 +19,11 @@
  * @date 2014
  */
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Exceptions.h>
-#include <libdevcore/Assertions.h>
-#include <libdevcore/Keccak256.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Exceptions.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/FixedHash.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/libdevcore/CommonData.h b/libsolutil/CommonData.h
similarity index 99%
rename from libdevcore/CommonData.h
rename to libsolutil/CommonData.h
index d9566a2fe..c7c9d80e3 100644
--- a/libdevcore/CommonData.h
+++ b/libsolutil/CommonData.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <iterator>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <vector>
 #include <type_traits>
diff --git a/libdevcore/CommonIO.cpp b/libsolutil/CommonIO.cpp
similarity index 98%
rename from libdevcore/CommonIO.cpp
rename to libsolutil/CommonIO.cpp
index ee7f5ead4..0eca85720 100644
--- a/libdevcore/CommonIO.cpp
+++ b/libsolutil/CommonIO.cpp
@@ -19,8 +19,8 @@
  * @date 2014
  */
 
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/Assertions.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/Assertions.h>
 
 #include <boost/filesystem.hpp>
 
diff --git a/libdevcore/CommonIO.h b/libsolutil/CommonIO.h
similarity index 98%
rename from libdevcore/CommonIO.h
rename to libsolutil/CommonIO.h
index 52232be14..15291df33 100644
--- a/libdevcore/CommonIO.h
+++ b/libsolutil/CommonIO.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 #include <boost/filesystem.hpp>
 #include <sstream>
 #include <string>
diff --git a/libdevcore/Exceptions.cpp b/libsolutil/Exceptions.cpp
similarity index 97%
rename from libdevcore/Exceptions.cpp
rename to libsolutil/Exceptions.cpp
index e0e0c4bd8..94b40f634 100644
--- a/libdevcore/Exceptions.cpp
+++ b/libsolutil/Exceptions.cpp
@@ -15,7 +15,7 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 using namespace std;
 using namespace solidity::util;
diff --git a/libdevcore/Exceptions.h b/libsolutil/Exceptions.h
similarity index 100%
rename from libdevcore/Exceptions.h
rename to libsolutil/Exceptions.h
diff --git a/libdevcore/FixedHash.h b/libsolutil/FixedHash.h
similarity index 99%
rename from libdevcore/FixedHash.h
rename to libsolutil/FixedHash.h
index 3a9ebdcc8..90c0ab4dc 100644
--- a/libdevcore/FixedHash.h
+++ b/libsolutil/FixedHash.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/functional/hash.hpp>
 #include <boost/io/ios_state.hpp>
diff --git a/libdevcore/IndentedWriter.cpp b/libsolutil/IndentedWriter.cpp
similarity index 95%
rename from libdevcore/IndentedWriter.cpp
rename to libsolutil/IndentedWriter.cpp
index 11bf869eb..884b50e9c 100644
--- a/libdevcore/IndentedWriter.cpp
+++ b/libsolutil/IndentedWriter.cpp
@@ -19,8 +19,8 @@
  * Indented text writer.
  */
 
-#include <libdevcore/IndentedWriter.h>
-#include <libdevcore/Assertions.h>
+#include <libsolutil/IndentedWriter.h>
+#include <libsolutil/Assertions.h>
 
 using namespace std;
 using namespace solidity::util;
diff --git a/libdevcore/IndentedWriter.h b/libsolutil/IndentedWriter.h
similarity index 97%
rename from libdevcore/IndentedWriter.h
rename to libsolutil/IndentedWriter.h
index 1f56ce8a3..29ecc4f6d 100644
--- a/libdevcore/IndentedWriter.h
+++ b/libsolutil/IndentedWriter.h
@@ -24,7 +24,7 @@
 #include <vector>
 #include <string>
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 namespace solidity::util
 {
diff --git a/libdevcore/InvertibleMap.h b/libsolutil/InvertibleMap.h
similarity index 100%
rename from libdevcore/InvertibleMap.h
rename to libsolutil/InvertibleMap.h
diff --git a/libdevcore/IpfsHash.cpp b/libsolutil/IpfsHash.cpp
similarity index 93%
rename from libdevcore/IpfsHash.cpp
rename to libsolutil/IpfsHash.cpp
index 246854038..d6a511a24 100644
--- a/libdevcore/IpfsHash.cpp
+++ b/libsolutil/IpfsHash.cpp
@@ -15,12 +15,12 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <libdevcore/IpfsHash.h>
+#include <libsolutil/IpfsHash.h>
 
-#include <libdevcore/Assertions.h>
-#include <libdevcore/Exceptions.h>
-#include <libdevcore/picosha2.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/Exceptions.h>
+#include <libsolutil/picosha2.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libdevcore/IpfsHash.h b/libsolutil/IpfsHash.h
similarity index 97%
rename from libdevcore/IpfsHash.h
rename to libsolutil/IpfsHash.h
index 1a9638005..555b35961 100644
--- a/libdevcore/IpfsHash.h
+++ b/libsolutil/IpfsHash.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <string>
 
diff --git a/libdevcore/JSON.cpp b/libsolutil/JSON.cpp
similarity index 98%
rename from libdevcore/JSON.cpp
rename to libsolutil/JSON.cpp
index 0fdbcd411..c66aab9b2 100644
--- a/libdevcore/JSON.cpp
+++ b/libsolutil/JSON.cpp
@@ -19,9 +19,9 @@
  * @date 2018
  */
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 #include <boost/algorithm/string/replace.hpp>
 
diff --git a/libdevcore/JSON.h b/libsolutil/JSON.h
similarity index 100%
rename from libdevcore/JSON.h
rename to libsolutil/JSON.h
diff --git a/libdevcore/Keccak256.cpp b/libsolutil/Keccak256.cpp
similarity index 99%
rename from libdevcore/Keccak256.cpp
rename to libsolutil/Keccak256.cpp
index e0df05cd6..d9e9363f6 100644
--- a/libdevcore/Keccak256.cpp
+++ b/libsolutil/Keccak256.cpp
@@ -19,7 +19,7 @@
  * @date 2014
  */
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <cstdint>
 #include <cstdio>
diff --git a/libdevcore/Keccak256.h b/libsolutil/Keccak256.h
similarity index 97%
rename from libdevcore/Keccak256.h
rename to libsolutil/Keccak256.h
index eeba453c9..7135e55c0 100644
--- a/libdevcore/Keccak256.h
+++ b/libsolutil/Keccak256.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <string>
 
diff --git a/libdevcore/Result.h b/libsolutil/Result.h
similarity index 100%
rename from libdevcore/Result.h
rename to libsolutil/Result.h
diff --git a/libdevcore/StringUtils.cpp b/libsolutil/StringUtils.cpp
similarity index 99%
rename from libdevcore/StringUtils.cpp
rename to libsolutil/StringUtils.cpp
index 004e9cdb2..a5b0149c2 100644
--- a/libdevcore/StringUtils.cpp
+++ b/libsolutil/StringUtils.cpp
@@ -21,7 +21,7 @@
  * String routines
  */
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 #include <algorithm>
 #include <string>
 #include <vector>
diff --git a/libdevcore/StringUtils.h b/libsolutil/StringUtils.h
similarity index 99%
rename from libdevcore/StringUtils.h
rename to libsolutil/StringUtils.h
index 72668031a..98158aa6d 100644
--- a/libdevcore/StringUtils.h
+++ b/libsolutil/StringUtils.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <vector>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 namespace solidity::util
 {
diff --git a/libdevcore/SwarmHash.cpp b/libsolutil/SwarmHash.cpp
similarity index 97%
rename from libdevcore/SwarmHash.cpp
rename to libsolutil/SwarmHash.cpp
index 388bb8f0d..4cfc0fe66 100644
--- a/libdevcore/SwarmHash.cpp
+++ b/libsolutil/SwarmHash.cpp
@@ -17,9 +17,9 @@
 /** @file SwarmHash.cpp
  */
 
-#include <libdevcore/SwarmHash.h>
+#include <libsolutil/SwarmHash.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libdevcore/SwarmHash.h b/libsolutil/SwarmHash.h
similarity index 96%
rename from libdevcore/SwarmHash.h
rename to libsolutil/SwarmHash.h
index 52c779811..3905b2f5f 100644
--- a/libdevcore/SwarmHash.h
+++ b/libsolutil/SwarmHash.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <string>
 
diff --git a/libdevcore/UTF8.cpp b/libsolutil/UTF8.cpp
similarity index 98%
rename from libdevcore/UTF8.cpp
rename to libsolutil/UTF8.cpp
index 98ee8904c..a7d55af6c 100644
--- a/libdevcore/UTF8.cpp
+++ b/libsolutil/UTF8.cpp
@@ -21,7 +21,7 @@
  * UTF-8 related helpers
  */
 
-#include <libdevcore/UTF8.h>
+#include <libsolutil/UTF8.h>
 
 namespace solidity::util
 {
diff --git a/libdevcore/UTF8.h b/libsolutil/UTF8.h
similarity index 100%
rename from libdevcore/UTF8.h
rename to libsolutil/UTF8.h
diff --git a/libdevcore/Visitor.h b/libsolutil/Visitor.h
similarity index 100%
rename from libdevcore/Visitor.h
rename to libsolutil/Visitor.h
diff --git a/libdevcore/Whiskers.cpp b/libsolutil/Whiskers.cpp
similarity index 98%
rename from libdevcore/Whiskers.cpp
rename to libsolutil/Whiskers.cpp
index a40398086..208719d43 100644
--- a/libdevcore/Whiskers.cpp
+++ b/libsolutil/Whiskers.cpp
@@ -21,9 +21,9 @@
  * Moustache-like templates.
  */
 
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Whiskers.h>
 
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Assertions.h>
 
 #include <regex>
 
diff --git a/libdevcore/Whiskers.h b/libsolutil/Whiskers.h
similarity index 99%
rename from libdevcore/Whiskers.h
rename to libsolutil/Whiskers.h
index 04020d6ff..0165429fb 100644
--- a/libdevcore/Whiskers.h
+++ b/libsolutil/Whiskers.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 #include <string>
 #include <map>
diff --git a/libdevcore/picosha2.h b/libsolutil/picosha2.h
similarity index 100%
rename from libdevcore/picosha2.h
rename to libsolutil/picosha2.h
diff --git a/libdevcore/vector_ref.h b/libsolutil/vector_ref.h
similarity index 100%
rename from libdevcore/vector_ref.h
rename to libsolutil/vector_ref.h
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
index d71e57254..4af0380cd 100644
--- a/libyul/AsmJsonConverter.cpp
+++ b/libyul/AsmJsonConverter.cpp
@@ -22,7 +22,7 @@
 #include <libyul/AsmJsonConverter.h>
 #include <libyul/AsmData.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 839c5c0df..ac9ccce76 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -24,7 +24,7 @@
 #include <libyul/Exceptions.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index 718dfc15d..eb894f0a1 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -24,7 +24,7 @@
 #include <libyul/AsmData.h>
 #include <libyul/Exceptions.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/libyul/AsmScope.h b/libyul/AsmScope.h
index adb0fba98..a452e04ba 100644
--- a/libyul/AsmScope.h
+++ b/libyul/AsmScope.h
@@ -24,7 +24,7 @@
 
 #include <libyul/YulString.h>
 
-#include <libdevcore/Visitor.h>
+#include <libsolutil/Visitor.h>
 
 #include <functional>
 #include <memory>
diff --git a/libyul/AsmScopeFiller.cpp b/libyul/AsmScopeFiller.cpp
index 46b868d91..3a8e548b8 100644
--- a/libyul/AsmScopeFiller.cpp
+++ b/libyul/AsmScopeFiller.cpp
@@ -27,7 +27,7 @@
 
 #include <liblangutil/ErrorReporter.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/libyul/Exceptions.h b/libyul/Exceptions.h
index a627610fb..9bb6a5d04 100644
--- a/libyul/Exceptions.h
+++ b/libyul/Exceptions.h
@@ -20,8 +20,8 @@
 
 #pragma once
 
-#include <libdevcore/Exceptions.h>
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Exceptions.h>
+#include <libsolutil/Assertions.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 64408230e..4006f6d81 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -23,8 +23,8 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/Exceptions.h>
 
-#include <libdevcore/Visitor.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/Visitor.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/algorithm/string/replace.hpp>
 
diff --git a/libyul/Object.h b/libyul/Object.h
index 7bcb70921..d7926d8bb 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -23,7 +23,7 @@
 #include <libyul/AsmDataForward.h>
 #include <libyul/YulString.h>
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <memory>
 #include <set>
diff --git a/libyul/ObjectParser.h b/libyul/ObjectParser.h
index 14ce80f07..1bd9d956f 100644
--- a/libyul/ObjectParser.h
+++ b/libyul/ObjectParser.h
@@ -27,7 +27,7 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/ParserBase.h>
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <memory>
 
diff --git a/libyul/Utilities.cpp b/libyul/Utilities.cpp
index b6951decb..dfe72b05e 100644
--- a/libyul/Utilities.cpp
+++ b/libyul/Utilities.cpp
@@ -23,8 +23,8 @@
 #include <libyul/AsmData.h>
 #include <libyul/Exceptions.h>
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/FixedHash.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/libyul/Utilities.h b/libyul/Utilities.h
index 9198e46ca..8b4547be3 100644
--- a/libyul/Utilities.h
+++ b/libyul/Utilities.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 #include <libyul/AsmDataForward.h>
 
 namespace solidity::yul
diff --git a/libyul/backends/evm/AbstractAssembly.h b/libyul/backends/evm/AbstractAssembly.h
index de83a1e9a..9187bb88d 100644
--- a/libyul/backends/evm/AbstractAssembly.h
+++ b/libyul/backends/evm/AbstractAssembly.h
@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/CommonData.h>
 
 #include <functional>
 #include <memory>
diff --git a/libyul/backends/evm/AsmCodeGen.cpp b/libyul/backends/evm/AsmCodeGen.cpp
index 94c4fad64..a864b0a09 100644
--- a/libyul/backends/evm/AsmCodeGen.cpp
+++ b/libyul/backends/evm/AsmCodeGen.cpp
@@ -32,7 +32,7 @@
 
 #include <liblangutil/SourceLocation.h>
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <memory>
 #include <functional>
diff --git a/libyul/backends/evm/ConstantOptimiser.cpp b/libyul/backends/evm/ConstantOptimiser.cpp
index 83003144f..d8399d095 100644
--- a/libyul/backends/evm/ConstantOptimiser.cpp
+++ b/libyul/backends/evm/ConstantOptimiser.cpp
@@ -25,7 +25,7 @@
 #include <libyul/AsmData.h>
 #include <libyul/Utilities.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <variant>
 
diff --git a/libyul/backends/evm/ConstantOptimiser.h b/libyul/backends/evm/ConstantOptimiser.h
index 97ce9879f..7423b5270 100644
--- a/libyul/backends/evm/ConstantOptimiser.h
+++ b/libyul/backends/evm/ConstantOptimiser.h
@@ -28,7 +28,7 @@
 
 #include <liblangutil/SourceLocation.h>
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <tuple>
 #include <map>
diff --git a/libyul/backends/evm/EVMMetrics.cpp b/libyul/backends/evm/EVMMetrics.cpp
index 43c2a3cf5..4d1103578 100644
--- a/libyul/backends/evm/EVMMetrics.cpp
+++ b/libyul/backends/evm/EVMMetrics.cpp
@@ -28,8 +28,8 @@
 #include <libevmasm/Instruction.h>
 #include <libevmasm/GasMeter.h>
 
-#include <libdevcore/Visitor.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/Visitor.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/backends/wasm/BinaryTransform.cpp b/libyul/backends/wasm/BinaryTransform.cpp
index 5ea09e9e4..8abd2b080 100644
--- a/libyul/backends/wasm/BinaryTransform.cpp
+++ b/libyul/backends/wasm/BinaryTransform.cpp
@@ -21,7 +21,7 @@
 #include <libyul/backends/wasm/BinaryTransform.h>
 
 #include <libyul/Exceptions.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/libyul/backends/wasm/BinaryTransform.h b/libyul/backends/wasm/BinaryTransform.h
index 6c9128489..d4e4375c2 100644
--- a/libyul/backends/wasm/BinaryTransform.h
+++ b/libyul/backends/wasm/BinaryTransform.h
@@ -22,7 +22,7 @@
 
 #include <libyul/backends/wasm/WasmAST.h>
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 #include <vector>
 #include <stack>
diff --git a/libyul/backends/wasm/TextTransform.cpp b/libyul/backends/wasm/TextTransform.cpp
index 72b6d01c1..3edeb9365 100644
--- a/libyul/backends/wasm/TextTransform.cpp
+++ b/libyul/backends/wasm/TextTransform.cpp
@@ -20,7 +20,7 @@
 
 #include <libyul/backends/wasm/TextTransform.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/libyul/backends/wasm/WasmObjectCompiler.cpp b/libyul/backends/wasm/WasmObjectCompiler.cpp
index a6683b5ab..52d485a7f 100644
--- a/libyul/backends/wasm/WasmObjectCompiler.cpp
+++ b/libyul/backends/wasm/WasmObjectCompiler.cpp
@@ -27,7 +27,7 @@
 #include <libyul/Object.h>
 #include <libyul/Exceptions.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace solidity;
 using namespace solidity::yul;
diff --git a/libyul/backends/wasm/WasmObjectCompiler.h b/libyul/backends/wasm/WasmObjectCompiler.h
index 8c93aba64..c5932a976 100644
--- a/libyul/backends/wasm/WasmObjectCompiler.h
+++ b/libyul/backends/wasm/WasmObjectCompiler.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 #include <tuple>
-#include <libdevcore/Common.h>     // solidity::bytes
+#include <libsolutil/Common.h>     // solidity::bytes
 
 namespace solidity::yul
 {
diff --git a/libyul/backends/wasm/WordSizeTransform.cpp b/libyul/backends/wasm/WordSizeTransform.cpp
index d1867a2e8..79df8be9a 100644
--- a/libyul/backends/wasm/WordSizeTransform.cpp
+++ b/libyul/backends/wasm/WordSizeTransform.cpp
@@ -21,7 +21,7 @@
 #include <libyul/Dialect.h>
 #include <libyul/optimiser/NameDisplacer.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <array>
 #include <map>
diff --git a/libyul/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp
index 99868d27f..16f257818 100644
--- a/libyul/optimiser/ASTCopier.cpp
+++ b/libyul/optimiser/ASTCopier.cpp
@@ -24,7 +24,7 @@
 
 #include <libyul/AsmData.h>
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/BlockFlattener.cpp b/libyul/optimiser/BlockFlattener.cpp
index 804d6ea77..02e4c42f5 100644
--- a/libyul/optimiser/BlockFlattener.cpp
+++ b/libyul/optimiser/BlockFlattener.cpp
@@ -16,8 +16,8 @@
 */
 #include <libyul/optimiser/BlockFlattener.h>
 #include <libyul/AsmData.h>
-#include <libdevcore/Visitor.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/Visitor.h>
+#include <libsolutil/CommonData.h>
 #include <functional>
 
 using namespace std;
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
index 0c6c04a1c..a878db601 100644
--- a/libyul/optimiser/BlockHasher.cpp
+++ b/libyul/optimiser/BlockHasher.cpp
@@ -21,7 +21,7 @@
 #include <libyul/optimiser/BlockHasher.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
 #include <libyul/Utilities.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/CallGraphGenerator.h b/libyul/optimiser/CallGraphGenerator.h
index 89895e410..2a05c7564 100644
--- a/libyul/optimiser/CallGraphGenerator.h
+++ b/libyul/optimiser/CallGraphGenerator.h
@@ -22,7 +22,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 
-#include <libdevcore/InvertibleMap.h>
+#include <libsolutil/InvertibleMap.h>
 
 #include <map>
 #include <optional>
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
index 3cd92283a..858ac8999 100644
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -19,8 +19,8 @@
 #include <libyul/AsmData.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Visitor.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Visitor.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ConditionalSimplifier.h b/libyul/optimiser/ConditionalSimplifier.h
index 9f0cd6b34..18f8a74b2 100644
--- a/libyul/optimiser/ConditionalSimplifier.h
+++ b/libyul/optimiser/ConditionalSimplifier.h
@@ -19,7 +19,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/Dialect.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
index 6670034d0..f11079032 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.cpp
+++ b/libyul/optimiser/ConditionalUnsimplifier.cpp
@@ -19,8 +19,8 @@
 #include <libyul/AsmData.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Visitor.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Visitor.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ConditionalUnsimplifier.h b/libyul/optimiser/ConditionalUnsimplifier.h
index 0b5be9bfd..116ab2536 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.h
+++ b/libyul/optimiser/ConditionalUnsimplifier.h
@@ -19,7 +19,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/Dialect.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index df5ead104..8af8e6bb0 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -20,8 +20,8 @@
 #include <libyul/AsmData.h>
 #include <libyul/Utilities.h>
 #include <libyul/Dialect.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Visitor.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Visitor.h>
 
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <boost/algorithm/cxx11/any_of.hpp>
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index e1874088d..db1517f59 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -28,7 +28,7 @@
 #include <libyul/AsmData.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/algorithm_ext/erase.hpp>
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index 64de71a14..45f41bea8 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -31,7 +31,7 @@
 // TODO avoid
 #include <libevmasm/Instruction.h>
 
-#include <libdevcore/InvertibleMap.h>
+#include <libsolutil/InvertibleMap.h>
 
 #include <map>
 #include <set>
diff --git a/libyul/optimiser/EquivalentFunctionCombiner.cpp b/libyul/optimiser/EquivalentFunctionCombiner.cpp
index 894563678..d62768a25 100644
--- a/libyul/optimiser/EquivalentFunctionCombiner.cpp
+++ b/libyul/optimiser/EquivalentFunctionCombiner.cpp
@@ -20,7 +20,7 @@
 
 #include <libyul/optimiser/EquivalentFunctionCombiner.h>
 #include <libyul/AsmData.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp
index 4558a1c87..ba38fa86e 100644
--- a/libyul/optimiser/ExpressionJoiner.cpp
+++ b/libyul/optimiser/ExpressionJoiner.cpp
@@ -26,7 +26,7 @@
 #include <libyul/Exceptions.h>
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 0653eb9a7..da3056057 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -25,7 +25,7 @@
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
index 94c107da9..d95e11a81 100644
--- a/libyul/optimiser/ExpressionSplitter.cpp
+++ b/libyul/optimiser/ExpressionSplitter.cpp
@@ -27,7 +27,7 @@
 #include <libyul/AsmData.h>
 #include <libyul/Dialect.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.cpp b/libyul/optimiser/ForLoopConditionIntoBody.cpp
index 81f038cbf..a45b33635 100644
--- a/libyul/optimiser/ForLoopConditionIntoBody.cpp
+++ b/libyul/optimiser/ForLoopConditionIntoBody.cpp
@@ -18,7 +18,7 @@
 #include <libyul/optimiser/ForLoopConditionIntoBody.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/AsmData.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ForLoopConditionOutOfBody.cpp b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
index 1d8291cf7..fc7d48d62 100644
--- a/libyul/optimiser/ForLoopConditionOutOfBody.cpp
+++ b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
@@ -19,7 +19,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/AsmData.h>
 #include <libyul/Utilities.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ForLoopInitRewriter.cpp b/libyul/optimiser/ForLoopInitRewriter.cpp
index 60a901e1d..163a999cd 100644
--- a/libyul/optimiser/ForLoopInitRewriter.cpp
+++ b/libyul/optimiser/ForLoopInitRewriter.cpp
@@ -16,7 +16,7 @@
 */
 #include <libyul/optimiser/ForLoopInitRewriter.h>
 #include <libyul/AsmData.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 #include <functional>
 
 using namespace std;
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 487e16db0..4b72e4ad9 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -30,8 +30,8 @@
 #include <libyul/Exceptions.h>
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Visitor.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Visitor.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 
diff --git a/libyul/optimiser/FunctionHoister.cpp b/libyul/optimiser/FunctionHoister.cpp
index b3e8c32f7..303cf1fb3 100644
--- a/libyul/optimiser/FunctionHoister.cpp
+++ b/libyul/optimiser/FunctionHoister.cpp
@@ -24,7 +24,7 @@
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index d71e1ec25..398c2f213 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -25,7 +25,7 @@
 #include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/Semantics.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <variant>
 
diff --git a/libyul/optimiser/LoopInvariantCodeMotion.cpp b/libyul/optimiser/LoopInvariantCodeMotion.cpp
index ed176dc8b..b7d7874c2 100644
--- a/libyul/optimiser/LoopInvariantCodeMotion.cpp
+++ b/libyul/optimiser/LoopInvariantCodeMotion.cpp
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/AsmData.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <utility>
 
diff --git a/libyul/optimiser/MainFunction.cpp b/libyul/optimiser/MainFunction.cpp
index ab58fb374..e91cadb4d 100644
--- a/libyul/optimiser/MainFunction.cpp
+++ b/libyul/optimiser/MainFunction.cpp
@@ -26,7 +26,7 @@
 
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
index b470a7286..bcd723464 100644
--- a/libyul/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@@ -28,8 +28,8 @@
 #include <libevmasm/Instruction.h>
 #include <libevmasm/GasMeter.h>
 
-#include <libdevcore/Visitor.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/Visitor.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/OptimizerUtilities.cpp b/libyul/optimiser/OptimizerUtilities.cpp
index 19d6e2406..132301696 100644
--- a/libyul/optimiser/OptimizerUtilities.cpp
+++ b/libyul/optimiser/OptimizerUtilities.cpp
@@ -22,7 +22,7 @@
 
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/range/algorithm_ext/erase.hpp>
 
diff --git a/libyul/optimiser/OptimizerUtilities.h b/libyul/optimiser/OptimizerUtilities.h
index 153cd7b7e..01bb7dae6 100644
--- a/libyul/optimiser/OptimizerUtilities.h
+++ b/libyul/optimiser/OptimizerUtilities.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 #include <libyul/AsmDataForward.h>
 
 namespace solidity::yul
diff --git a/libyul/optimiser/RedundantAssignEliminator.cpp b/libyul/optimiser/RedundantAssignEliminator.cpp
index faa040f31..236a27fb0 100644
--- a/libyul/optimiser/RedundantAssignEliminator.cpp
+++ b/libyul/optimiser/RedundantAssignEliminator.cpp
@@ -24,7 +24,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/range/algorithm_ext/erase.hpp>
 
diff --git a/libyul/optimiser/SSAReverser.cpp b/libyul/optimiser/SSAReverser.cpp
index 03593c2e9..a4373fb66 100644
--- a/libyul/optimiser/SSAReverser.cpp
+++ b/libyul/optimiser/SSAReverser.cpp
@@ -17,7 +17,7 @@
 #include <libyul/optimiser/SSAReverser.h>
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/AsmData.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <variant>
 
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index fbd3cdd10..91454b9ee 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -25,7 +25,7 @@
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index 8c6cab95f..1e2dcb104 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -27,8 +27,8 @@
 
 #include <libevmasm/SemanticInformation.h>
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Algorithms.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Algorithms.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index 25443e129..866fcb90e 100644
--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -25,7 +25,7 @@
 #include <libyul/AsmDataForward.h>
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/noncopyable.hpp>
 
diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
index c4dcd6bee..836169701 100644
--- a/libyul/optimiser/StructuralSimplifier.cpp
+++ b/libyul/optimiser/StructuralSimplifier.cpp
@@ -18,8 +18,8 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/AsmData.h>
 #include <libyul/Utilities.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Visitor.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Visitor.h>
 
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <boost/algorithm/cxx11/any_of.hpp>
diff --git a/libyul/optimiser/StructuralSimplifier.h b/libyul/optimiser/StructuralSimplifier.h
index ab17d1b1a..8b9df5beb 100644
--- a/libyul/optimiser/StructuralSimplifier.h
+++ b/libyul/optimiser/StructuralSimplifier.h
@@ -19,7 +19,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/DataFlowAnalyzer.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libdevcore/Common.h>
+#include <libsolutil/Common.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index ba0ca07a9..6cf592f8a 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -64,7 +64,7 @@
 #include <libyul/backends/wasm/WasmDialect.h>
 #include <libyul/backends/evm/NoOutputAssembly.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
index 3af7ccf01..1ce5da7d1 100644
--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@@ -24,7 +24,7 @@
 #include <libyul/AsmData.h>
 #include <libyul/Utilities.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/VarDeclInitializer.cpp b/libyul/optimiser/VarDeclInitializer.cpp
index 36fe07a91..bad601f0e 100644
--- a/libyul/optimiser/VarDeclInitializer.cpp
+++ b/libyul/optimiser/VarDeclInitializer.cpp
@@ -18,8 +18,8 @@
 #include <libyul/optimiser/VarDeclInitializer.h>
 #include <libyul/AsmData.h>
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Visitor.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Visitor.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/lllc/main.cpp b/lllc/main.cpp
index b04d58eef..75d193e23 100644
--- a/lllc/main.cpp
+++ b/lllc/main.cpp
@@ -24,8 +24,8 @@
 #include <iostream>
 #include <clocale>
 #include <liblll/Compiler.h>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/CommonData.h>
 #include <libevmasm/Instruction.h>
 #include <solidity/BuildInfo.h>
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index e81efa1d4..af5d45179 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -44,10 +44,10 @@
 #include <liblangutil/SourceReferenceFormatter.h>
 #include <liblangutil/SourceReferenceFormatterHuman.h>
 
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/JSON.h>
 
 #include <memory>
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 609f9f047..223cf4e5f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,20 +24,20 @@ set(contracts_sources
 )
 detect_stray_source_files("${contracts_sources}" "contracts/")
 
-set(libdevcore_sources
-    libdevcore/Checksum.cpp
-    libdevcore/CommonData.cpp
-    libdevcore/IndentedWriter.cpp
-    libdevcore/IpfsHash.cpp
-    libdevcore/IterateReplacing.cpp
-    libdevcore/JSON.cpp
-    libdevcore/Keccak256.cpp
-    libdevcore/StringUtils.cpp
-    libdevcore/SwarmHash.cpp
-    libdevcore/UTF8.cpp
-    libdevcore/Whiskers.cpp
+set(libsolutil_sources
+    libsolutil/Checksum.cpp
+    libsolutil/CommonData.cpp
+    libsolutil/IndentedWriter.cpp
+    libsolutil/IpfsHash.cpp
+    libsolutil/IterateReplacing.cpp
+    libsolutil/JSON.cpp
+    libsolutil/Keccak256.cpp
+    libsolutil/StringUtils.cpp
+    libsolutil/SwarmHash.cpp
+    libsolutil/UTF8.cpp
+    libsolutil/Whiskers.cpp
 )
-detect_stray_source_files("${libdevcore_sources}" "libdevcore/")
+detect_stray_source_files("${libsolutil_sources}" "libsolutil/")
 
 set(libevmasm_sources
     libevmasm/Assembler.cpp
@@ -151,7 +151,7 @@ detect_stray_source_files("${libyul_sources}" "libyul/")
 
 add_executable(soltest ${sources}
     ${contracts_sources}
-    ${libdevcore_sources}
+    ${libsolutil_sources}
     ${liblangutil_sources}
     ${libevmasm_sources}
     ${libyul_sources}
diff --git a/test/Common.cpp b/test/Common.cpp
index ddbb25739..1cd5c3e13 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -17,7 +17,7 @@
 
 #include <test/Common.h>
 
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Assertions.h>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 
diff --git a/test/Common.h b/test/Common.h
index bf65627ca..88b75507a 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 #include <liblangutil/EVMVersion.h>
 
 #include <boost/filesystem/path.hpp>
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 49cb5808f..fd5394fb5 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -25,10 +25,10 @@
 
 #include <libevmasm/GasMeter.h>
 
-#include <libdevcore/Exceptions.h>
-#include <libdevcore/Assertions.h>
-#include <libdevcore/Keccak256.h>
-#include <libdevcore/picosha2.h>
+#include <libsolutil/Exceptions.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/picosha2.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/test/EVMHost.h b/test/EVMHost.h
index 31e08e411..1e3540012 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -27,7 +27,7 @@
 
 #include <liblangutil/EVMVersion.h>
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 namespace solidity::test
 {
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index 528ee6a88..51d73284b 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -26,7 +26,7 @@
 
 #include <test/evmc/evmc.hpp>
 
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 #include <boost/test/framework.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
index 9f4150525..33301b6f2 100644
--- a/test/ExecutionFramework.h
+++ b/test/ExecutionFramework.h
@@ -29,8 +29,8 @@
 
 #include <liblangutil/EVMVersion.h>
 
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/Keccak256.h>
 
 #include <functional>
 
diff --git a/test/Metadata.cpp b/test/Metadata.cpp
index 12a5d3aae..cf61c4c99 100644
--- a/test/Metadata.cpp
+++ b/test/Metadata.cpp
@@ -21,9 +21,9 @@
 
 #include <string>
 #include <iostream>
-#include <libdevcore/Assertions.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/Assertions.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/JSON.h>
 #include <test/Metadata.h>
 
 using namespace std;
diff --git a/test/Metadata.h b/test/Metadata.h
index f769f438f..f032f1d1f 100644
--- a/test/Metadata.h
+++ b/test/Metadata.h
@@ -19,7 +19,7 @@
  * Metadata processing helpers.
  */
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <map>
 #include <optional>
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
index e8b47c38d..01dc51e7c 100644
--- a/test/TestCase.cpp
+++ b/test/TestCase.cpp
@@ -17,7 +17,7 @@
 
 #include <test/TestCase.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/cxx11/none_of.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 30a36c58c..f03c9fbb9 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -20,7 +20,7 @@
  * Tests for the assembler.
  */
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <libevmasm/Assembly.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/test/liblll/Compiler.cpp b/test/liblll/Compiler.cpp
index 3f9c4eceb..3c60e7ee9 100644
--- a/test/liblll/Compiler.cpp
+++ b/test/liblll/Compiler.cpp
@@ -22,7 +22,7 @@
 
 #include <test/Options.h>
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <liblll/Compiler.h>
 
diff --git a/test/libsolidity/ABIJsonTest.cpp b/test/libsolidity/ABIJsonTest.cpp
index 4f41725ce..daaee026c 100644
--- a/test/libsolidity/ABIJsonTest.cpp
+++ b/test/libsolidity/ABIJsonTest.cpp
@@ -23,8 +23,8 @@
 #include <test/Options.h>
 
 #include <libsolidity/interface/CompilerStack.h>
-#include <libdevcore/JSON.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/JSON.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 673e30b92..c42daf14c 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -17,7 +17,7 @@
 
 #include <test/libsolidity/ASTJSONTest.h>
 #include <test/Options.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 #include <liblangutil/SourceReferenceFormatterHuman.h>
 #include <libsolidity/ast/ASTJsonConverter.h>
 #include <libsolidity/interface/CompilerStack.h>
diff --git a/test/libsolidity/ASTJSONTest.h b/test/libsolidity/ASTJSONTest.h
index 01e9895a8..92658edd6 100644
--- a/test/libsolidity/ASTJSONTest.h
+++ b/test/libsolidity/ASTJSONTest.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 #include <test/TestCase.h>
 
 #include <iosfwd>
diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 003953e70..a76af1081 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -29,7 +29,7 @@
 
 #include <liblangutil/Scanner.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/libsolidity/ErrorCheck.cpp b/test/libsolidity/ErrorCheck.cpp
index 0c57d525f..1f51006ed 100644
--- a/test/libsolidity/ErrorCheck.cpp
+++ b/test/libsolidity/ErrorCheck.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <test/libsolidity/ErrorCheck.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 #include <string>
 #include <set>
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index c3f842f6f..d3312d7e4 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -20,7 +20,7 @@
 
 #include <test/libsolidity/SolidityExecutionFramework.h>
 #include <liblangutil/EVMVersion.h>
-#include <libdevcore/IpfsHash.h>
+#include <libsolutil/IpfsHash.h>
 #include <libevmasm/GasMeter.h>
 
 #include <cmath>
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index e7b7f325c..c29608b5c 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -17,8 +17,8 @@
 
 #include <test/libsolidity/GasTest.h>
 #include <test/Options.h>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/JSON.h>
 #include <liblangutil/SourceReferenceFormatterHuman.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/test/libsolidity/LibSolc.cpp b/test/libsolidity/LibSolc.cpp
index cb4f8d2cc..9802e37c2 100644
--- a/test/libsolidity/LibSolc.cpp
+++ b/test/libsolidity/LibSolc.cpp
@@ -21,7 +21,7 @@
 
 #include <string>
 #include <boost/test/unit_test.hpp>
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <libsolidity/interface/ReadFile.h>
 #include <libsolidity/interface/Version.h>
 #include <libsolc/libsolc.h>
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index ba5261675..e8bf69348 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -23,9 +23,9 @@
 #include <test/Options.h>
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/Version.h>
-#include <libdevcore/SwarmHash.h>
-#include <libdevcore/IpfsHash.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/SwarmHash.h>
+#include <libsolutil/IpfsHash.h>
+#include <libsolutil/JSON.h>
 
 using namespace std;
 
diff --git a/test/libsolidity/SMTCheckerJSONTest.cpp b/test/libsolidity/SMTCheckerJSONTest.cpp
index 7758a2437..cee5b560a 100644
--- a/test/libsolidity/SMTCheckerJSONTest.cpp
+++ b/test/libsolidity/SMTCheckerJSONTest.cpp
@@ -18,8 +18,8 @@
 #include <test/libsolidity/SMTCheckerJSONTest.h>
 #include <test/Options.h>
 #include <libsolidity/interface/StandardCompiler.h>
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/JSON.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/test/libsolidity/SMTCheckerJSONTest.h b/test/libsolidity/SMTCheckerJSONTest.h
index 8d40c1ee8..b5d199e7d 100644
--- a/test/libsolidity/SMTCheckerJSONTest.h
+++ b/test/libsolidity/SMTCheckerJSONTest.h
@@ -19,7 +19,7 @@
 
 #include <test/libsolidity/SyntaxTest.h>
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 
 #include <string>
 
diff --git a/test/libsolidity/SemanticTest.h b/test/libsolidity/SemanticTest.h
index b885b1565..680e03316 100644
--- a/test/libsolidity/SemanticTest.h
+++ b/test/libsolidity/SemanticTest.h
@@ -20,7 +20,7 @@
 #include <test/libsolidity/AnalysisFramework.h>
 #include <test/TestCase.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <iosfwd>
 #include <string>
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index e8d29755b..df89fb3f9 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -31,7 +31,7 @@
 
 #include <libevmasm/Assembly.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 3baa740b4..e5e82d392 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -26,7 +26,7 @@
 
 #include <libsolidity/ast/AST.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index d59b59685..965bfc7c8 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -22,10 +22,10 @@
 
 #include <test/Options.h>
 #include <string>
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <libsolidity/interface/CompilerStack.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 using namespace solidity::langutil;
 
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
index 0701b8187..debec99b7 100644
--- a/test/libsolidity/SolidityTypes.cpp
+++ b/test/libsolidity/SolidityTypes.cpp
@@ -23,7 +23,7 @@
 #include <libsolidity/ast/Types.h>
 #include <libsolidity/ast/TypeProvider.h>
 #include <libsolidity/ast/AST.h>
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 8b354d9a3..31c37060a 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -23,7 +23,7 @@
 #include <boost/test/unit_test.hpp>
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/Version.h>
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <test/Metadata.h>
 
 using namespace std;
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index a231a951f..0a1752f10 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -20,7 +20,7 @@
 #include <test/libsolidity/AnalysisFramework.h>
 #include <test/TestCase.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <iosfwd>
 #include <string>
diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
index c91231521..751318f9c 100644
--- a/test/libsolidity/util/BytesUtils.cpp
+++ b/test/libsolidity/util/BytesUtils.cpp
@@ -22,7 +22,7 @@
 
 #include <liblangutil/Common.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/test/libsolidity/util/BytesUtils.h b/test/libsolidity/util/BytesUtils.h
index 99e33055e..e97aa90c9 100644
--- a/test/libsolidity/util/BytesUtils.h
+++ b/test/libsolidity/util/BytesUtils.h
@@ -16,7 +16,7 @@
 
 #include <test/libsolidity/util/SoltestTypes.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 namespace solidity::frontend::test
 {
diff --git a/test/libsolidity/util/ContractABIUtils.h b/test/libsolidity/util/ContractABIUtils.h
index 2c9ce0da2..0e56c98e5 100644
--- a/test/libsolidity/util/ContractABIUtils.h
+++ b/test/libsolidity/util/ContractABIUtils.h
@@ -18,7 +18,7 @@
 
 #include <test/libsolidity/util/SoltestErrors.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <json/json.h>
 
diff --git a/test/libsolidity/util/SoltestErrors.h b/test/libsolidity/util/SoltestErrors.h
index a9a7e88e0..f895e706b 100644
--- a/test/libsolidity/util/SoltestErrors.h
+++ b/test/libsolidity/util/SoltestErrors.h
@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include <libdevcore/AnsiColorized.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/AnsiColorized.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Exceptions.h>
 
 namespace solidity::frontend::test
 {
diff --git a/test/libsolidity/util/SoltestTypes.h b/test/libsolidity/util/SoltestTypes.h
index 8b2bed9a4..0fec97eb1 100644
--- a/test/libsolidity/util/SoltestTypes.h
+++ b/test/libsolidity/util/SoltestTypes.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include <libdevcore/AnsiColorized.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/AnsiColorized.h>
+#include <libsolutil/CommonData.h>
 #include <libsolidity/ast/Types.h>
 
 namespace solidity::frontend::test
diff --git a/test/libsolidity/util/TestFileParser.h b/test/libsolidity/util/TestFileParser.h
index 1e6fbf21a..a10bb1114 100644
--- a/test/libsolidity/util/TestFileParser.h
+++ b/test/libsolidity/util/TestFileParser.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 #include <libsolidity/ast/Types.h>
 #include <liblangutil/Exceptions.h>
 #include <test/libsolidity/util/SoltestTypes.h>
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 5cf48f88d..ac7a92a08 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -17,7 +17,7 @@
 #include <test/libsolidity/util/BytesUtils.h>
 #include <test/libsolidity/util/ContractABIUtils.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/algorithm/string/replace.hpp>
 
diff --git a/test/libsolidity/util/TestFunctionCall.h b/test/libsolidity/util/TestFunctionCall.h
index 4717f9903..baa0990b1 100644
--- a/test/libsolidity/util/TestFunctionCall.h
+++ b/test/libsolidity/util/TestFunctionCall.h
@@ -19,8 +19,8 @@
 
 #include <libsolidity/ast/Types.h>
 #include <liblangutil/Exceptions.h>
-#include <libdevcore/AnsiColorized.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/AnsiColorized.h>
+#include <libsolutil/CommonData.h>
 
 #include <json/json.h>
 
diff --git a/test/libdevcore/Checksum.cpp b/test/libsolutil/Checksum.cpp
similarity index 98%
rename from test/libdevcore/Checksum.cpp
rename to test/libsolutil/Checksum.cpp
index a306e45cc..e813f7bfb 100644
--- a/test/libdevcore/Checksum.cpp
+++ b/test/libsolutil/Checksum.cpp
@@ -18,8 +18,8 @@
  * Unit tests for the address checksum.
  */
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/Exceptions.h>
 
 
 #include <test/Options.h>
diff --git a/test/libdevcore/CommonData.cpp b/test/libsolutil/CommonData.cpp
similarity index 98%
rename from test/libdevcore/CommonData.cpp
rename to test/libsolutil/CommonData.cpp
index 5f6e744e4..e2687b53b 100644
--- a/test/libdevcore/CommonData.cpp
+++ b/test/libsolutil/CommonData.cpp
@@ -18,9 +18,9 @@
  * Unit tests for the StringUtils routines.
  */
 
-#include <libdevcore/Common.h>
-#include <libdevcore/CommonData.h>
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/FixedHash.h>
 #include <libsolidity/ast/Types.h> // for IntegerType
 
 #include <test/Options.h>
diff --git a/test/libdevcore/IndentedWriter.cpp b/test/libsolutil/IndentedWriter.cpp
similarity index 97%
rename from test/libdevcore/IndentedWriter.cpp
rename to test/libsolutil/IndentedWriter.cpp
index bde910d13..3f7c31c02 100644
--- a/test/libdevcore/IndentedWriter.cpp
+++ b/test/libsolutil/IndentedWriter.cpp
@@ -18,7 +18,7 @@
  * Unit tests for IndentedWriter.
  */
 
-#include <libdevcore/IndentedWriter.h>
+#include <libsolutil/IndentedWriter.h>
 
 #include <test/Options.h>
 
diff --git a/test/libdevcore/IpfsHash.cpp b/test/libsolutil/IpfsHash.cpp
similarity index 98%
rename from test/libdevcore/IpfsHash.cpp
rename to test/libsolutil/IpfsHash.cpp
index ee7baad1c..bb82f7b5c 100644
--- a/test/libdevcore/IpfsHash.cpp
+++ b/test/libsolutil/IpfsHash.cpp
@@ -18,7 +18,7 @@
  * Unit tests for the ipfs hash computation routine.
  */
 
-#include <libdevcore/IpfsHash.h>
+#include <libsolutil/IpfsHash.h>
 
 #include <test/Options.h>
 
diff --git a/test/libdevcore/IterateReplacing.cpp b/test/libsolutil/IterateReplacing.cpp
similarity index 98%
rename from test/libdevcore/IterateReplacing.cpp
rename to test/libsolutil/IterateReplacing.cpp
index c17dacdc0..ebd82c9c7 100644
--- a/test/libdevcore/IterateReplacing.cpp
+++ b/test/libsolutil/IterateReplacing.cpp
@@ -18,7 +18,7 @@
  * Unit tests for the iterateReplacing function
  */
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <test/Options.h>
 
diff --git a/test/libdevcore/JSON.cpp b/test/libsolutil/JSON.cpp
similarity index 98%
rename from test/libdevcore/JSON.cpp
rename to test/libsolutil/JSON.cpp
index 33886333a..176d3027a 100644
--- a/test/libdevcore/JSON.cpp
+++ b/test/libsolutil/JSON.cpp
@@ -19,7 +19,7 @@
  * Unit tests for JSON.h.
  */
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 
 #include <test/Options.h>
 
diff --git a/test/libdevcore/Keccak256.cpp b/test/libsolutil/Keccak256.cpp
similarity index 98%
rename from test/libdevcore/Keccak256.cpp
rename to test/libsolutil/Keccak256.cpp
index ac97b6edd..4bb3bddd6 100644
--- a/test/libdevcore/Keccak256.cpp
+++ b/test/libsolutil/Keccak256.cpp
@@ -17,7 +17,7 @@
 /**
  * Unit tests for keccak256.
  */
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/libdevcore/StringUtils.cpp b/test/libsolutil/StringUtils.cpp
similarity index 98%
rename from test/libdevcore/StringUtils.cpp
rename to test/libsolutil/StringUtils.cpp
index 14551bbeb..3b977e0f6 100644
--- a/test/libdevcore/StringUtils.cpp
+++ b/test/libsolutil/StringUtils.cpp
@@ -18,9 +18,9 @@
  * Unit tests for the StringUtils routines.
  */
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/StringUtils.h>
 
 #include <libsolidity/ast/Types.h>  // for IntegerType
 
diff --git a/test/libdevcore/SwarmHash.cpp b/test/libsolutil/SwarmHash.cpp
similarity index 98%
rename from test/libdevcore/SwarmHash.cpp
rename to test/libsolutil/SwarmHash.cpp
index 8aa34fe7a..03c5af5f7 100644
--- a/test/libdevcore/SwarmHash.cpp
+++ b/test/libsolutil/SwarmHash.cpp
@@ -18,11 +18,11 @@
  * Unit tests for the swarm hash computation routine.
  */
 
-#include <libdevcore/SwarmHash.h>
+#include <libsolutil/SwarmHash.h>
 
 #include <test/Options.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 using namespace std;
 
diff --git a/test/libdevcore/UTF8.cpp b/test/libsolutil/UTF8.cpp
similarity index 98%
rename from test/libdevcore/UTF8.cpp
rename to test/libsolutil/UTF8.cpp
index aadb54987..8bb49e9a4 100644
--- a/test/libdevcore/UTF8.cpp
+++ b/test/libsolutil/UTF8.cpp
@@ -18,8 +18,8 @@
  * Unit tests for UTF-8 validation.
  */
 
-#include <libdevcore/CommonData.h>
-#include <libdevcore/UTF8.h>
+#include <libsolutil/CommonData.h>
+#include <libsolutil/UTF8.h>
 
 #include <test/Options.h>
 
diff --git a/test/libdevcore/Whiskers.cpp b/test/libsolutil/Whiskers.cpp
similarity index 99%
rename from test/libdevcore/Whiskers.cpp
rename to test/libsolutil/Whiskers.cpp
index 56341e6ce..293ffedfd 100644
--- a/test/libdevcore/Whiskers.cpp
+++ b/test/libsolutil/Whiskers.cpp
@@ -18,7 +18,7 @@
  * Unit tests for the mini moustache class.
  */
 
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Whiskers.h>
 
 #include <test/Options.h>
 
diff --git a/test/libyul/EwasmTranslationTest.cpp b/test/libyul/EwasmTranslationTest.cpp
index cd5ce7623..a5e01d286 100644
--- a/test/libyul/EwasmTranslationTest.cpp
+++ b/test/libyul/EwasmTranslationTest.cpp
@@ -31,7 +31,7 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
index 6577f7383..d7a184dc4 100644
--- a/test/libyul/FunctionSideEffects.cpp
+++ b/test/libyul/FunctionSideEffects.cpp
@@ -19,7 +19,7 @@
 #include <test/Options.h>
 #include <test/libyul/Common.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <libyul/SideEffects.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
@@ -27,7 +27,7 @@
 #include <libyul/Object.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/test/libyul/FunctionSideEffects.h b/test/libyul/FunctionSideEffects.h
index 829a17c2e..b35994b00 100644
--- a/test/libyul/FunctionSideEffects.h
+++ b/test/libyul/FunctionSideEffects.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 #include <test/TestCase.h>
 
 #include <iosfwd>
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index e7c87a708..7472b124f 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -17,7 +17,7 @@
 
 #include <test/libyul/ObjectCompilerTest.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <libyul/AssemblyStack.h>
 
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index 8818206fa..939fa2e1e 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -29,7 +29,7 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index fb3f8360d..053b7772e 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -70,7 +70,7 @@
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
 
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/test/tools/IsolTestOptions.cpp b/test/tools/IsolTestOptions.cpp
index 0921c5927..b8ae70a63 100644
--- a/test/tools/IsolTestOptions.cpp
+++ b/test/tools/IsolTestOptions.cpp
@@ -20,7 +20,7 @@
 
 #include <test/tools/IsolTestOptions.h>
 
-#include <libdevcore/Assertions.h>
+#include <libsolutil/Assertions.h>
 
 #include <boost/filesystem.hpp>
 
diff --git a/test/tools/afl_fuzzer.cpp b/test/tools/afl_fuzzer.cpp
index ed1318b6b..1ca5428e1 100644
--- a/test/tools/afl_fuzzer.cpp
+++ b/test/tools/afl_fuzzer.cpp
@@ -20,7 +20,7 @@
 
 #include <test/tools/fuzzer_common.h>
 
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 
 #include <boost/program_options.hpp>
 
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index ab6ab3cbb..f66c2e841 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -17,7 +17,7 @@
 
 #include <test/tools/fuzzer_common.h>
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 #include <libevmasm/Assembly.h>
 #include <libevmasm/ConstantOptimiser.h>
 #include <libsolc/libsolc.h>
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 6ce05d592..d96091dcb 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -15,8 +15,8 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/AnsiColorized.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/AnsiColorized.h>
 
 #include <test/Common.h>
 #include <test/tools/IsolTestOptions.h>
diff --git a/test/tools/ossfuzz/abiV2FuzzerCommon.h b/test/tools/ossfuzz/abiV2FuzzerCommon.h
index 5027302e8..3094fbdc1 100644
--- a/test/tools/ossfuzz/abiV2FuzzerCommon.h
+++ b/test/tools/ossfuzz/abiV2FuzzerCommon.h
@@ -7,7 +7,7 @@
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 namespace solidity::test::abiv2fuzzer
 {
diff --git a/test/tools/ossfuzz/protoToAbiV2.h b/test/tools/ossfuzz/protoToAbiV2.h
index 94f37631f..f75f5d7e4 100644
--- a/test/tools/ossfuzz/protoToAbiV2.h
+++ b/test/tools/ossfuzz/protoToAbiV2.h
@@ -2,10 +2,10 @@
 
 #include <test/tools/ossfuzz/abiV2Proto.pb.h>
 
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/Keccak256.h>
-#include <libdevcore/StringUtils.h>
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/StringUtils.h>
+#include <libsolutil/Whiskers.h>
 
 #include <liblangutil/Exceptions.h>
 
diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index b0a2a6d44..bf152052b 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -20,7 +20,7 @@
 
 #include <libyul/Exceptions.h>
 
-#include <libdevcore/StringUtils.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/cxx11/all_of.hpp>
 #include <boost/algorithm/string/classification.hpp>
diff --git a/test/tools/ossfuzz/protoToYul.h b/test/tools/ossfuzz/protoToYul.h
index ff0f4ddfd..43058f45c 100644
--- a/test/tools/ossfuzz/protoToYul.h
+++ b/test/tools/ossfuzz/protoToYul.h
@@ -27,9 +27,9 @@
 
 #include <test/tools/ossfuzz/yulProto.pb.h>
 
-#include <libdevcore/Common.h>
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/Whiskers.h>
+#include <libsolutil/Common.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/Whiskers.h>
 
 namespace solidity::yul::test::yul_fuzzer
 {
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index 8156143b6..b4211dfc9 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -27,8 +27,8 @@
 #include <liblangutil/EVMVersion.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/CommonData.h>
 
 #include <test/tools/ossfuzz/yulFuzzerCommon.h>
 
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 65067d101..d60b63b10 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -27,7 +27,7 @@
 
 #include <libevmasm/Instruction.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index 35fc1a6da..02104178b 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -22,7 +22,7 @@
 
 #include <libyul/AsmDataForward.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <vector>
 
diff --git a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
index 419b73d10..7abd43112 100644
--- a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
+++ b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
@@ -27,7 +27,7 @@
 
 #include <libevmasm/Instruction.h>
 
-#include <libdevcore/Keccak256.h>
+#include <libsolutil/Keccak256.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
index fc73bd020..c6819743c 100644
--- a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
+++ b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
@@ -22,7 +22,7 @@
 
 #include <libyul/AsmDataForward.h>
 
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonData.h>
 
 #include <vector>
 
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index b1edacc9b..4d28633f6 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -31,7 +31,7 @@
 
 #include <liblangutil/Exceptions.h>
 
-#include <libdevcore/FixedHash.h>
+#include <libsolutil/FixedHash.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/algorithm/cxx11/all_of.hpp>
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 1cd871e41..ab0386165 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -23,10 +23,10 @@
 #include <libyul/AsmDataForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
-#include <libdevcore/FixedHash.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/FixedHash.h>
+#include <libsolutil/CommonData.h>
 
-#include <libdevcore/Exceptions.h>
+#include <libsolutil/Exceptions.h>
 
 #include <map>
 
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 3a9b19721..67b34a784 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -18,7 +18,7 @@
  * Interactive yul optimizer
  */
 
-#include <libdevcore/CommonIO.h>
+#include <libsolutil/CommonIO.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
 #include <libyul/AsmAnalysis.h>
@@ -66,7 +66,7 @@
 
 #include <libyul/backends/evm/EVMDialect.h>
 
-#include <libdevcore/JSON.h>
+#include <libsolutil/JSON.h>
 
 #include <boost/program_options.hpp>
 
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index c18a6c322..1e82fba7f 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -32,8 +32,8 @@
 #include <liblangutil/EVMVersion.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libdevcore/CommonIO.h>
-#include <libdevcore/CommonData.h>
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/CommonData.h>
 
 #include <boost/program_options.hpp>