diff --git a/src/language/PugsParser.cpp b/src/language/PugsParser.cpp
index eced83eadc03a601d1c4dd5846cfad5d1636b570..27bc4e1d0b228d2c629f44891f15f23059216d31 100644
--- a/src/language/PugsParser.cpp
+++ b/src/language/PugsParser.cpp
@@ -1,7 +1,6 @@
 #include <language/PugsParser.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTBuilder.hpp>
 #include <language/ast/ASTModulesImporter.hpp>
 #include <language/ast/ASTNode.hpp>
@@ -16,6 +15,7 @@
 #include <language/ast/ASTSymbolTableBuilder.hpp>
 #include <language/utils/ASTDotPrinter.hpp>
 #include <language/utils/ASTPrinter.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/Exceptions.hpp>
 #include <utils/PugsAssert.hpp>
 
diff --git a/src/language/ast/ASTBuilder.cpp b/src/language/ast/ASTBuilder.cpp
index 316c9e6041bfc7ce93f57e822edd071fbc1672a8..b0969abbb5d19f3c55fadf21a1d518621e9b6a7d 100644
--- a/src/language/ast/ASTBuilder.cpp
+++ b/src/language/ast/ASTBuilder.cpp
@@ -3,8 +3,8 @@
 using namespace TAO_PEGTL_NAMESPACE;
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/PugsAssert.hpp>
 
 #include <pegtl/contrib/parse_tree.hpp>
diff --git a/src/language/ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp b/src/language/ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp
index 96cfcfa5292c32f18a53b3a75d24bf34275d1e3e..cda5d08cd26517038b3fa6969191806a68ccea3e 100644
--- a/src/language/ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp
+++ b/src/language/ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp
@@ -1,10 +1,10 @@
 #include <language/ast/ASTNodeBuiltinFunctionExpressionBuilder.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNodeDataTypeFlattener.hpp>
 #include <language/ast/ASTNodeNaturalConversionChecker.hpp>
 #include <language/node_processor/BuiltinFunctionProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 PUGS_INLINE std::unique_ptr<IFunctionArgumentConverter>
 ASTNodeBuiltinFunctionExpressionBuilder::_getArgumentConverter(const ASTNodeDataType& parameter_type,
diff --git a/src/language/ast/ASTNodeDataTypeBuilder.cpp b/src/language/ast/ASTNodeDataTypeBuilder.cpp
index d660534b97d37c29cdb205d9ca74d3ad0f94ac82..7d82af439ef54c8881215b7faf9000f89f34b1db 100644
--- a/src/language/ast/ASTNodeDataTypeBuilder.cpp
+++ b/src/language/ast/ASTNodeDataTypeBuilder.cpp
@@ -1,9 +1,9 @@
 #include <language/ast/ASTNodeDataTypeBuilder.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNodeNaturalConversionChecker.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/PugsAssert.hpp>
 
 ASTNodeDataType
diff --git a/src/language/ast/ASTNodeDataTypeFlattener.cpp b/src/language/ast/ASTNodeDataTypeFlattener.cpp
index 7c3fc9d7e3a695a638e94424d8b317ea6476427b..f19ed6667be11f429e9ab08e24ea33e264323cdb 100644
--- a/src/language/ast/ASTNodeDataTypeFlattener.cpp
+++ b/src/language/ast/ASTNodeDataTypeFlattener.cpp
@@ -1,8 +1,8 @@
 #include <language/ast/ASTNodeDataTypeFlattener.hpp>
 
-#include <language/FunctionTable.hpp>
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
+#include <language/utils/FunctionTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 ASTNodeDataTypeFlattener::ASTNodeDataTypeFlattener(ASTNode& node, FlattenedDataTypeList& flattened_datatype_list)
 {
diff --git a/src/language/ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp b/src/language/ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp
index f7081ba0f5f41dbb1f3954574bc6cae0128a435e..5eb2ed3b0defeb35d47cd6f8e6812f2f82319883 100644
--- a/src/language/ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp
+++ b/src/language/ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp
@@ -1,8 +1,8 @@
 #include <language/ast/ASTNodeFunctionEvaluationExpressionBuilder.hpp>
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNodeBuiltinFunctionExpressionBuilder.hpp>
 #include <language/ast/ASTNodeFunctionExpressionBuilder.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 ASTNodeFunctionEvaluationExpressionBuilder::ASTNodeFunctionEvaluationExpressionBuilder(ASTNode& node)
 {
diff --git a/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp b/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp
index 6983a69173c11813992969c7b4c36df716b049fe..3518ced841e0e996d55d437ee8d1f680397bb2c4 100644
--- a/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp
+++ b/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp
@@ -1,12 +1,12 @@
 #include <language/ast/ASTNodeFunctionExpressionBuilder.hpp>
 
-#include <language/FunctionTable.hpp>
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNodeDataTypeFlattener.hpp>
 #include <language/ast/ASTNodeNaturalConversionChecker.hpp>
 #include <language/node_processor/FunctionProcessor.hpp>
 #include <language/node_processor/TupleToVectorProcessor.hpp>
+#include <language/utils/FunctionTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename SymbolType>
 std::unique_ptr<IFunctionArgumentConverter>
diff --git a/src/language/ast/ASTSymbolInitializationChecker.cpp b/src/language/ast/ASTSymbolInitializationChecker.cpp
index 5e8b04e937c9d54340c474205fc3643513e17aa4..b68e6d05a5872c95c546b108ad6ef8c9256e1965 100644
--- a/src/language/ast/ASTSymbolInitializationChecker.cpp
+++ b/src/language/ast/ASTSymbolInitializationChecker.cpp
@@ -1,7 +1,7 @@
 #include <language/ast/ASTSymbolInitializationChecker.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 void
 ASTSymbolInitializationChecker::_checkSymbolInitialization(ASTNode& node)
diff --git a/src/language/ast/ASTSymbolTableBuilder.cpp b/src/language/ast/ASTSymbolTableBuilder.cpp
index 98d40669bac87a0c31ee37918fb7bfcf52ba8627..2c8f4850a5cd477eac43fb43c30d6eb0d7cca671 100644
--- a/src/language/ast/ASTSymbolTableBuilder.cpp
+++ b/src/language/ast/ASTSymbolTableBuilder.cpp
@@ -1,7 +1,7 @@
 #include <language/ast/ASTSymbolTableBuilder.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 void
 ASTSymbolTableBuilder::buildSymbolTable(ASTNode& n, std::shared_ptr<SymbolTable>& symbol_table)
diff --git a/src/language/ast/ASTSymbolTableBuilder.hpp b/src/language/ast/ASTSymbolTableBuilder.hpp
index 881712b850f2ea8072acd9ad5cb2db30272a7293..7929f7ab1ea43296bc3e56295e0df6e3b3ad9f9f 100644
--- a/src/language/ast/ASTSymbolTableBuilder.hpp
+++ b/src/language/ast/ASTSymbolTableBuilder.hpp
@@ -1,8 +1,8 @@
 #ifndef AST_SYMBOL_TABLE_BUILDER_HPP
 #define AST_SYMBOL_TABLE_BUILDER_HPP
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 class ASTSymbolTableBuilder
 {
diff --git a/src/language/modules/MeshModule.cpp b/src/language/modules/MeshModule.cpp
index 9f8b1029f23ecfb5cd1568956fc96c005ee6dce2..f0fce9aaba03ce5274b1809cd5db081d52aaaba5 100644
--- a/src/language/modules/MeshModule.cpp
+++ b/src/language/modules/MeshModule.cpp
@@ -1,10 +1,10 @@
 #include <language/modules/MeshModule.hpp>
 
-#include <language/FunctionTable.hpp>
-#include <language/PugsFunctionAdapter.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/ExecutionPolicy.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/FunctionTable.hpp>
+#include <language/utils/PugsFunctionAdapter.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <language/utils/TypeDescriptor.hpp>
 #include <mesh/Connectivity.hpp>
 #include <mesh/GmshReader.hpp>
diff --git a/src/language/modules/ModuleRepository.cpp b/src/language/modules/ModuleRepository.cpp
index a6c0805ea78f5c0d952bdcea1648e255fed59e87..30ad1914a77d9659360e3793e35704109f2f27a8 100644
--- a/src/language/modules/ModuleRepository.cpp
+++ b/src/language/modules/ModuleRepository.cpp
@@ -1,11 +1,11 @@
 #include <language/modules/ModuleRepository.hpp>
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/modules/MathModule.hpp>
 #include <language/modules/MeshModule.hpp>
 #include <language/modules/VTKModule.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/PugsAssert.hpp>
 
 void
diff --git a/src/language/node_processor/ASTNodeExpressionListProcessor.hpp b/src/language/node_processor/ASTNodeExpressionListProcessor.hpp
index 38bb0d340a6c2708ef937c67ddd02a8a754bf308..e75992ee7e5670e948a9c064a76b0610f4b75cf4 100644
--- a/src/language/node_processor/ASTNodeExpressionListProcessor.hpp
+++ b/src/language/node_processor/ASTNodeExpressionListProcessor.hpp
@@ -2,8 +2,8 @@
 #define AST_NODE_EXPRESSION_LIST_PROCESSOR_HPP
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 #include <vector>
 
diff --git a/src/language/node_processor/AffectationProcessor.hpp b/src/language/node_processor/AffectationProcessor.hpp
index 89cf704125fa88ac345a8246dec4605059e0544a..bd0431e5da9424d9bb184d7976caa1c30be1770a 100644
--- a/src/language/node_processor/AffectationProcessor.hpp
+++ b/src/language/node_processor/AffectationProcessor.hpp
@@ -2,8 +2,8 @@
 #define AFFECTATION_PROCESSOR_HPP
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename Op>
 struct AffOp;
diff --git a/src/language/node_processor/FunctionProcessor.hpp b/src/language/node_processor/FunctionProcessor.hpp
index 72161aedafbb64861800e57a06f1d1cf953554b7..0542f138c31f65be4d7cb3eb76d25cd7af41ef1b 100644
--- a/src/language/node_processor/FunctionProcessor.hpp
+++ b/src/language/node_processor/FunctionProcessor.hpp
@@ -1,12 +1,12 @@
 #ifndef FUNCTION_PROCESSOR_HPP
 #define FUNCTION_PROCESSOR_HPP
 
-#include <language/FunctionTable.hpp>
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/ASTNodeExpressionListProcessor.hpp>
 #include <language/node_processor/FunctionArgumentConverter.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/FunctionTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename ReturnType, typename ExpressionValueType>
 class FunctionExpressionProcessor final : public INodeProcessor
diff --git a/src/language/node_processor/IncDecExpressionProcessor.hpp b/src/language/node_processor/IncDecExpressionProcessor.hpp
index 2b63b6f3788aaed76782086e72bd4dc00f890fea..9e50106e5c531e8f5cd3dcd546bf131570c499c6 100644
--- a/src/language/node_processor/IncDecExpressionProcessor.hpp
+++ b/src/language/node_processor/IncDecExpressionProcessor.hpp
@@ -2,9 +2,9 @@
 #define INC_DEC_EXPRESSION_PROCESSOR_HPP
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename Op>
 struct IncDecOp;
diff --git a/src/language/node_processor/LocalNameProcessor.hpp b/src/language/node_processor/LocalNameProcessor.hpp
index be6ea4f4cdc78e8113af701b24c6d2f794d998b1..51d442b266288360c1d5f6fe000ba72fa7057cb9 100644
--- a/src/language/node_processor/LocalNameProcessor.hpp
+++ b/src/language/node_processor/LocalNameProcessor.hpp
@@ -1,9 +1,9 @@
 #ifndef LOCAL_NODE_PROCESSOR_HPP
 #define LOCAL_NODE_PROCESSOR_HPP
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 class LocalNameProcessor final : public INodeProcessor
 {
diff --git a/src/language/node_processor/NameProcessor.hpp b/src/language/node_processor/NameProcessor.hpp
index 70dfac0d5461581a4eadea15c58750becd1e1e85..53fee78ef7f1b9232100bbec8d3a7327c64d2078 100644
--- a/src/language/node_processor/NameProcessor.hpp
+++ b/src/language/node_processor/NameProcessor.hpp
@@ -1,9 +1,9 @@
 #ifndef NODE_PROCESSOR_HPP
 #define NODE_PROCESSOR_HPP
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 class NameProcessor final : public INodeProcessor
 {
diff --git a/src/language/node_processor/UnaryExpressionProcessor.hpp b/src/language/node_processor/UnaryExpressionProcessor.hpp
index e62facdf7c5f50dc4c0b67315bbef3e7ea033d4a..c99c7f2dd828583c7dad8048338e68d26c807be2 100644
--- a/src/language/node_processor/UnaryExpressionProcessor.hpp
+++ b/src/language/node_processor/UnaryExpressionProcessor.hpp
@@ -2,8 +2,8 @@
 #define UNARY_EXPRESSION_PROCESSOR_HPP
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename Op>
 struct UnaryOp;
diff --git a/src/language/utils/ASTNodeDataTypeTraits.hpp b/src/language/utils/ASTNodeDataTypeTraits.hpp
index 90dff3af8377a044eb32abfafdffee16b664e854..44d40a771edc24c189331a491d3ac0652708f4fa 100644
--- a/src/language/utils/ASTNodeDataTypeTraits.hpp
+++ b/src/language/utils/ASTNodeDataTypeTraits.hpp
@@ -2,8 +2,8 @@
 #define AST_NODE_DATA_TYPE_TRAITS_H
 
 #include <algebra/TinyVector.hpp>
-#include <language/FunctionSymbolId.hpp>
 #include <language/ast/ASTNodeDataType.hpp>
+#include <language/utils/FunctionSymbolId.hpp>
 
 template <typename T>
 inline ASTNodeDataType ast_node_data_type_from = ASTNodeDataType::undefined_t;
diff --git a/src/language/utils/BuiltinFunctionEmbedder.hpp b/src/language/utils/BuiltinFunctionEmbedder.hpp
index c833762c62e139b8cfd7daf9a1d1def1d279d86e..3a921fb5baf947f1fdbe0510e544fcf9eb121ca7 100644
--- a/src/language/utils/BuiltinFunctionEmbedder.hpp
+++ b/src/language/utils/BuiltinFunctionEmbedder.hpp
@@ -1,11 +1,11 @@
 #ifndef BUILTIN_FUNCTION_EMBEDDER_HPP
 #define BUILTIN_FUNCTION_EMBEDDER_HPP
 
-#include <language/FunctionTable.hpp>
 #include <language/ast/ASTNodeDataType.hpp>
 #include <language/utils/ASTNodeDataTypeTraits.hpp>
 #include <language/utils/DataHandler.hpp>
 #include <language/utils/DataVariant.hpp>
+#include <language/utils/FunctionTable.hpp>
 #include <utils/Demangle.hpp>
 #include <utils/Exceptions.hpp>
 #include <utils/PugsTraits.hpp>
diff --git a/src/language/utils/DataVariant.hpp b/src/language/utils/DataVariant.hpp
index 8c6667d51c74b6937e7f21c4462ad3d4cb976a92..1ca8a869d0b63348a735e1f5aa0c43fa2a32d80a 100644
--- a/src/language/utils/DataVariant.hpp
+++ b/src/language/utils/DataVariant.hpp
@@ -2,8 +2,8 @@
 #define DATA_VARIANT_HPP
 
 #include <algebra/TinyVector.hpp>
-#include <language/FunctionSymbolId.hpp>
 #include <language/utils/EmbeddedData.hpp>
+#include <language/utils/FunctionSymbolId.hpp>
 #include <utils/PugsAssert.hpp>
 
 #include <tuple>
diff --git a/src/language/EmbedderTable.hpp b/src/language/utils/EmbedderTable.hpp
similarity index 100%
rename from src/language/EmbedderTable.hpp
rename to src/language/utils/EmbedderTable.hpp
diff --git a/src/language/FunctionSymbolId.hpp b/src/language/utils/FunctionSymbolId.hpp
similarity index 100%
rename from src/language/FunctionSymbolId.hpp
rename to src/language/utils/FunctionSymbolId.hpp
diff --git a/src/language/FunctionTable.hpp b/src/language/utils/FunctionTable.hpp
similarity index 100%
rename from src/language/FunctionTable.hpp
rename to src/language/utils/FunctionTable.hpp
diff --git a/src/language/PugsFunctionAdapter.hpp b/src/language/utils/PugsFunctionAdapter.hpp
similarity index 99%
rename from src/language/PugsFunctionAdapter.hpp
rename to src/language/utils/PugsFunctionAdapter.hpp
index e110dd4efbdb037e2f648a752dfc00fa02abcf9a..33e844ec886c08d16e049e71a38c93476a7dd697 100644
--- a/src/language/PugsFunctionAdapter.hpp
+++ b/src/language/utils/PugsFunctionAdapter.hpp
@@ -1,12 +1,12 @@
 #ifndef PUGS_FUNCTION_ADAPTER_HPP
 #define PUGS_FUNCTION_ADAPTER_HPP
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/ast/ASTNodeDataType.hpp>
 #include <language/node_processor/ExecutionPolicy.hpp>
 #include <language/utils/ASTNodeDataTypeTraits.hpp>
 #include <language/utils/RuntimeError.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/Array.hpp>
 #include <utils/Exceptions.hpp>
 #include <utils/PugsMacros.hpp>
diff --git a/src/language/SymbolTable.hpp b/src/language/utils/SymbolTable.hpp
similarity index 98%
rename from src/language/SymbolTable.hpp
rename to src/language/utils/SymbolTable.hpp
index 52866783b9122a6d32b6d36a423cc8c690b2f969..957251371b7393caebf0ce445c528d57a962fc1f 100644
--- a/src/language/SymbolTable.hpp
+++ b/src/language/utils/SymbolTable.hpp
@@ -1,10 +1,10 @@
 #ifndef SYMBOL_TABLE_HPP
 #define SYMBOL_TABLE_HPP
 
-#include <language/EmbedderTable.hpp>
-#include <language/FunctionTable.hpp>
 #include <language/ast/ASTNodeDataType.hpp>
 #include <language/utils/DataVariant.hpp>
+#include <language/utils/EmbedderTable.hpp>
+#include <language/utils/FunctionTable.hpp>
 #include <utils/PugsMacros.hpp>
 
 #include <pegtl/position.hpp>
diff --git a/tests/test_ASTModulesImporter.cpp b/tests/test_ASTModulesImporter.cpp
index 5d4d0f5b89768980143c1e969665dd61f8fc5cdc..7ac28918aec2110eefe734b67bf73da2a55ea952 100644
--- a/tests/test_ASTModulesImporter.cpp
+++ b/tests/test_ASTModulesImporter.cpp
@@ -1,11 +1,11 @@
 #include <catch2/catch.hpp>
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTBuilder.hpp>
 #include <language/ast/ASTModulesImporter.hpp>
 #include <language/ast/ASTNodeExpressionBuilder.hpp>
 #include <language/ast/ASTNodeTypeCleaner.hpp>
 #include <language/utils/ASTPrinter.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 #include <pegtl/string_input.hpp>
 
diff --git a/tests/test_BuiltinFunctionEmbedderTable.cpp b/tests/test_BuiltinFunctionEmbedderTable.cpp
index 1388f97c2a4d043ff6f2246c6c003493c0a4acc0..09b9d7c1f7beafa7ef26cfd288f4a8746b530e0c 100644
--- a/tests/test_BuiltinFunctionEmbedderTable.cpp
+++ b/tests/test_BuiltinFunctionEmbedderTable.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch.hpp>
 
-#include <language/EmbedderTable.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/EmbedderTable.hpp>
 
 // clazy:excludeall=non-pod-global-static
 
diff --git a/tests/test_FunctionTable.cpp b/tests/test_FunctionTable.cpp
index d1734d9dc8326d767b5e199fa16ee8c93ba6f859..c6ae9ab2f856457aaff70aaf2e35146661fde1b0 100644
--- a/tests/test_FunctionTable.cpp
+++ b/tests/test_FunctionTable.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
 
-#include <language/FunctionTable.hpp>
+#include <language/utils/FunctionTable.hpp>
 
 // clazy:excludeall=non-pod-global-static
 
diff --git a/tests/test_SymbolTable.cpp b/tests/test_SymbolTable.cpp
index e8e6a82100c140c4f74f9cf162a55180f44f0a6a..f7155a4eec5270c30f94323f67c61cad000dbf0b 100644
--- a/tests/test_SymbolTable.cpp
+++ b/tests/test_SymbolTable.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch.hpp>
 
-#include <language/SymbolTable.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 #include <pegtl/internal/iterator.hpp>