diff --git a/ets2panda/aot/main.cpp b/ets2panda/aot/main.cpp
index 510014c943a54b1d10bf95bda850eed19bf6c41b..749e2f5f60324ba1681b97f089602b79a2b68347 100644
--- a/ets2panda/aot/main.cpp
+++ b/ets2panda/aot/main.cpp
@@ -16,8 +16,8 @@
 #include "bytecode_optimizer/bytecodeopt_options.h"
 #include "bytecode_optimizer/optimize_bytecode.h"
 #include "compiler/compiler_logger.h"
-#include "mem/arena_allocator.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "es2panda.h"
 #include "util/arktsconfig.h"
 #include "util/diagnosticEngine.h"
@@ -25,7 +25,7 @@
 #include "util/options.h"
 #include "util/plugin.h"
 #include "util/perfMetrics.h"
-#include "libpandabase/os/stacktrace.h"
+#include "../libarkbase/os/stacktrace.h"
 #include "generated/diagnostic.h"
 
 #include <iostream>
diff --git a/ets2panda/ast_verifier/ASTVerifier.h b/ets2panda/ast_verifier/ASTVerifier.h
index 9aaa1aecc3e55d08feea243f73b2f6329e0b46f7..e43a92fe1956e706d3cfc2e8af32b29642dbd210 100644
--- a/ets2panda/ast_verifier/ASTVerifier.h
+++ b/ets2panda/ast_verifier/ASTVerifier.h
@@ -50,7 +50,7 @@
 #include "parser/program/program.h"
 #include "util/ustring.h"
 #include "util/options.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/variable.h"
 #include "public/public.h"
 
diff --git a/ets2panda/ast_verifier/invariantBase.h b/ets2panda/ast_verifier/invariantBase.h
index 7ce416e98a5af28bf4147724c1564974a61ba691..b30fe6337545b778a894049a18caf4b8d5272e05 100644
--- a/ets2panda/ast_verifier/invariantBase.h
+++ b/ets2panda/ast_verifier/invariantBase.h
@@ -18,7 +18,7 @@
 
 #include "generated/options.h"
 #include "ir/astNode.h"
-#include "utils/json_builder.h"
+#include "../libarkbase/utils/json_builder.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/bindings/native/src/win-dynamic-node.cpp b/ets2panda/bindings/native/src/win-dynamic-node.cpp
index 85bb3cb4da61e7cde2ee782aefb8d404b7c9bb18..461b961fe82171d3aa695ceb93e6be1170ca660a 100644
--- a/ets2panda/bindings/native/src/win-dynamic-node.cpp
+++ b/ets2panda/bindings/native/src/win-dynamic-node.cpp
@@ -16,7 +16,7 @@
 #include <cstdlib>
 #include <windows.h>
 #include "node_api.h"
-#include <macros.h>
+#include <../libarkbase/macros.h>
 
 #define NAPI_CDECL __cdecl
 
diff --git a/ets2panda/checker/ets/aliveAnalyzer.h b/ets2panda/checker/ets/aliveAnalyzer.h
index ade9092244b8a53dccd3e3c4844aa41f813fd6ea..f400e9035605a71d5323c9ec23e7b62743f33b5e 100644
--- a/ets2panda/checker/ets/aliveAnalyzer.h
+++ b/ets2panda/checker/ets/aliveAnalyzer.h
@@ -19,7 +19,7 @@
 #include "checker/ETSchecker.h"
 #include "checker/ets/baseAnalyzer.h"
 
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 class AstNode;
diff --git a/ets2panda/checker/ets/assignAnalyzer.h b/ets2panda/checker/ets/assignAnalyzer.h
index 621a24ba9e18239450879b044fd7fa70b0bf1823..96ca6df537d42c06d2af8ee056ff63f9fa0e1649 100644
--- a/ets2panda/checker/ets/assignAnalyzer.h
+++ b/ets2panda/checker/ets/assignAnalyzer.h
@@ -19,7 +19,7 @@
 #include "checker/ETSchecker.h"
 #include "checker/ets/baseAnalyzer.h"
 
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 class AstNode;
diff --git a/ets2panda/checker/ets/baseAnalyzer.h b/ets2panda/checker/ets/baseAnalyzer.h
index 8599c5d00a4cf3d9ed0b8b8b11b719a40f323683..943e8a5d3f144d00262625efe272970bc19d2fdc 100644
--- a/ets2panda/checker/ets/baseAnalyzer.h
+++ b/ets2panda/checker/ets/baseAnalyzer.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CHECKER_ETS_BASE_ANALYZER_H
 #define ES2PANDA_COMPILER_CHECKER_ETS_BASE_ANALYZER_H
 
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "util/enumbitops.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/checker/ets/function_helpers.h b/ets2panda/checker/ets/function_helpers.h
index 2ed4c6b430b254b5237d17726eaa2200711f2c37..6321eebe5bcf04795784d0df3876f5743e9d236d 100644
--- a/ets2panda/checker/ets/function_helpers.h
+++ b/ets2panda/checker/ets/function_helpers.h
@@ -40,7 +40,7 @@
 #include "ir/statements/whileStatement.h"
 #include "ir/ts/tsTypeParameterInstantiation.h"
 #include "parser/program/program.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "util/helpers.h"
 #include "util/language.h"
 #include "varbinder/declaration.h"
diff --git a/ets2panda/checker/ts/destructuringContext.h b/ets2panda/checker/ts/destructuringContext.h
index 5721379cc42fe4f8214bfbc9adfb2bd168206235..5994ba742f765b7e70b06328eeb5acfed1658d06 100644
--- a/ets2panda/checker/ts/destructuringContext.h
+++ b/ets2panda/checker/ts/destructuringContext.h
@@ -19,7 +19,7 @@
 #include "checker/TSchecker.h"
 #include "ir/expression.h"
 
-#include <macros.h>
+#include <../libarkbase/macros.h>
 
 namespace ark::es2panda::ir {
 class Expression;
diff --git a/ets2panda/checker/ts/typeElaborationContext.h b/ets2panda/checker/ts/typeElaborationContext.h
index d89fa406cb635aa3e5744148a7ee4c4c07452aa0..4391819152506338dae8475f3869d7bac4d950fc 100644
--- a/ets2panda/checker/ts/typeElaborationContext.h
+++ b/ets2panda/checker/ts/typeElaborationContext.h
@@ -19,7 +19,7 @@
 #include "checker/TSchecker.h"
 #include "ir/expression.h"
 
-#include <macros.h>
+#include <../libarkbase/macros.h>
 
 namespace ark::es2panda::ir {
 class Expression;
diff --git a/ets2panda/compiler/core/compileQueue.h b/ets2panda/compiler/core/compileQueue.h
index 7bc948033b789a599bd49c62855efe59c8e2e059..360968adf0b795da1212463920f8bc9920f81bcd 100644
--- a/ets2panda/compiler/core/compileQueue.h
+++ b/ets2panda/compiler/core/compileQueue.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_COMPILER_CORE_COMPILE_QUEUE_H
 
 #include "util/es2pandaMacros.h"
-#include "os/thread.h"
+#include "../libarkbase/os/thread.h"
 #include "es2panda.h"
 #include "compiler/core/compileJob.h"
 #include "util/diagnostic.h"
diff --git a/ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp b/ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp
index 42a8564a0f471dba25abffa9631c5a5f93992493..5743b72a223a4aa1ae93e282966eeef7dbaa84f6 100644
--- a/ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp
@@ -24,7 +24,7 @@
 #include "lexer/token/number.h"
 #include "util/es2pandaMacros.h"
 #include "checker/ETSchecker.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::compiler {
 
diff --git a/ets2panda/compiler/lowering/ets/arrayLiteralLowering.h b/ets2panda/compiler/lowering/ets/arrayLiteralLowering.h
index ef2d297553936570d3aef6c83324410b76ce9e51..2b1d088547fa2086adf3f1c96f210f86e164c5a3 100644
--- a/ets2panda/compiler/lowering/ets/arrayLiteralLowering.h
+++ b/ets2panda/compiler/lowering/ets/arrayLiteralLowering.h
@@ -22,7 +22,7 @@
 #include "ir/ets/etsNewArrayInstanceExpression.h"
 #include "ir/ts/tsArrayType.h"
 #include "parser/ETSparser.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/ETSBinder.h"
 
 namespace ark::es2panda::compiler {
diff --git a/ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp b/ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp
index abd8401d58e559c36a883568ff437cd53e8fd8ca..2ecbe8776b53daa2e67ce35962fc366ed44d5dca 100644
--- a/ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp
@@ -24,7 +24,7 @@
 #include "ir/expressions/identifier.h"
 #include "ir/statements/ifStatement.h"
 #include "ir/ts/tsAsExpression.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "parser/ETSparser.h"
 #include "util.h"
 #include "util/ustring.h"
diff --git a/ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp b/ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp
index d67d756deceebd7f5d7d3e67d53a450935e89c2a..08a86bdb0a38ab2e683a14e6efe78e4777ceddf4 100644
--- a/ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp
+++ b/ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp
@@ -15,7 +15,7 @@
 
 #include "compiler/lowering/ets/exportAnonymousConst.h"
 #include "compiler/lowering/util.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 
 namespace ark::es2panda::compiler {
 
diff --git a/ets2panda/compiler/lowering/ets/objectIterator.cpp b/ets2panda/compiler/lowering/ets/objectIterator.cpp
index c3136f256e52160a0174d63b0f35d44e74cd005e..981ad037f18dc6d5ce52a4ff3f2b417be733d495 100644
--- a/ets2panda/compiler/lowering/ets/objectIterator.cpp
+++ b/ets2panda/compiler/lowering/ets/objectIterator.cpp
@@ -32,7 +32,7 @@
 #include "objectIterator.h"
 
 #include "generated/signatures.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "parser/ETSparser.h"
 #include "compiler/lowering/util.h"
 #include "compiler/lowering/scopesInit/scopesInitPhase.h"
diff --git a/ets2panda/compiler/lowering/ets/stringComparison.cpp b/ets2panda/compiler/lowering/ets/stringComparison.cpp
index 056f7b216c20997f2aeb304ab72775088c6b9390..5098da52d8480981cc37f0bbecebd3bd60bc2467 100644
--- a/ets2panda/compiler/lowering/ets/stringComparison.cpp
+++ b/ets2panda/compiler/lowering/ets/stringComparison.cpp
@@ -17,7 +17,7 @@
 #include "stringComparison.h"
 #include "checker/ETSchecker.h"
 #include "parser/parserImpl.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "compiler/lowering/scopesInit/scopesInitPhase.h"
 #include "compiler/lowering/util.h"
 
diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp
index 1aaced464c532f04aa6bacb6cf8da99fa1347f62..b3d4cd1e3b0b10070bbdafa0e7fcc04d98062840 100644
--- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp
+++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp
@@ -30,7 +30,7 @@
 #include "ir/statements/blockStatement.h"
 #include "util/helpers.h"
 #include "util/ustring.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "generated/diagnostic.h"
 
 namespace ark::es2panda::compiler {
diff --git a/ets2panda/compiler/lowering/phase.h b/ets2panda/compiler/lowering/phase.h
index 63c3e493f413c60c1113510a05d91575cc0c8feb..ba06a0d428ee98e79575955f4aac9481adca2066 100644
--- a/ets2panda/compiler/lowering/phase.h
+++ b/ets2panda/compiler/lowering/phase.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_LOWERING_PHASE_H
 #define ES2PANDA_COMPILER_LOWERING_PHASE_H
 
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "parser/program/program.h"
 #include "public/public.h"
 #include "phase_id.h"
diff --git a/ets2panda/declgen_ets2ts/declgenEts2Ts.h b/ets2panda/declgen_ets2ts/declgenEts2Ts.h
index 81f29c2a6b40cd8685395fe69f0ffdc5955df2e7..4be8a12e6553ad581f5a374e553373d13f00902c 100644
--- a/ets2panda/declgen_ets2ts/declgenEts2Ts.h
+++ b/ets2panda/declgen_ets2ts/declgenEts2Ts.h
@@ -18,8 +18,8 @@
 
 #include "parser/program/program.h"
 #include "checker/ETSchecker.h"
-#include "libpandabase/os/file.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/os/file.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "util/options.h"
 #include "util/diagnosticEngine.h"
 #include "isolatedDeclgenChecker.h"
diff --git a/ets2panda/declgen_ets2ts/isolatedDeclgenChecker.cpp b/ets2panda/declgen_ets2ts/isolatedDeclgenChecker.cpp
index 052a88c503698af2d4ca656745d7ee8a94b5dc94..393a886c97f0e099e07208d5ba5be6dcb9a9f4e6 100644
--- a/ets2panda/declgen_ets2ts/isolatedDeclgenChecker.cpp
+++ b/ets2panda/declgen_ets2ts/isolatedDeclgenChecker.cpp
@@ -16,8 +16,8 @@
 #include "isolatedDeclgenChecker.h"
 
 #include "es2panda.h"
-#include "clang.h"
-#include "utils/logger.h"
+#include "../libarkbase/clang.h"
+#include "../libarkbase/utils/logger.h"
 
 namespace ark::es2panda::declgen {
 using AstNodePtr = ir::AstNode *;
diff --git a/ets2panda/declgen_ets2ts/isolatedDeclgenChecker.h b/ets2panda/declgen_ets2ts/isolatedDeclgenChecker.h
index 3769b90ea17fdca60ec41d6f97dab4f71ad514b2..f049065006170ddb92818d33ff1c4a450ca02f28 100644
--- a/ets2panda/declgen_ets2ts/isolatedDeclgenChecker.h
+++ b/ets2panda/declgen_ets2ts/isolatedDeclgenChecker.h
@@ -16,7 +16,7 @@
 #define ES2PANDA_CHECKER_ISOLATED_DECLGEN_CHECKER_H
 
 #include <string>
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "checker/checker.h"
 
 namespace ark::es2panda::declgen {
diff --git a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h
index 4d01ef2e30664d65fa490ffd00bc7bd4c2bcb745..b89c1b96634bec1e9b65e9e53d41c98a3b2dbe95 100644
--- a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h
+++ b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h
@@ -18,7 +18,7 @@
 
 #include "ir/base/classDefinition.h"
 #include "util/ustring.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::panda_file {
 class ClassDataAccessor;
diff --git a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h
index fe5e9ac7d38d534a0d016ac881f0e619639ff43e..eb47ee00027c828c6ba8c2849e4c9d46ad62bf04 100644
--- a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h
+++ b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_EVALUATE_DEBUG_INFO_DESERIALIZER_H
 #define ES2PANDA_EVALUATE_DEBUG_INFO_DESERIALIZER_H
 
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "libpandafile/debug_info_extractor.h"
 #include "libpandafile/file.h"
 
diff --git a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h
index 7a1c5d6305126ec86a9db865397e15a3af3ca88d..da0cc95372ff7caf4a0a474df0ce21ea68f576fb 100644
--- a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h
+++ b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h
@@ -19,7 +19,7 @@
 #include "util/ustring.h"
 #include "ir/astNodeFlags.h"
 #include "generated/signatures.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::panda_file {
 class ClassDataAccessor;
diff --git a/ets2panda/evaluate/entityDeclarator.h b/ets2panda/evaluate/entityDeclarator.h
index 234d3007fbcce6c7a3162a946567ff88c3f87832..4a5f78f5766677ae8d1d3a33bc00553bb7966f18 100644
--- a/ets2panda/evaluate/entityDeclarator.h
+++ b/ets2panda/evaluate/entityDeclarator.h
@@ -19,7 +19,7 @@
 #include "checker/ETSchecker.h"
 #include "evaluate/proxyProgramsCache.h"
 #include "evaluate/helpers.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::parser {
 class Program;
diff --git a/ets2panda/evaluate/evaluateContext.h b/ets2panda/evaluate/evaluateContext.h
index 848719954f6edb5ae62a15d6b74a3640109257e4..f384eb67d3a3cabe3cc026be4dcc0915129fdfb5 100644
--- a/ets2panda/evaluate/evaluateContext.h
+++ b/ets2panda/evaluate/evaluateContext.h
@@ -19,7 +19,7 @@
 #include "util/ustring.h"
 #include "util/options.h"
 
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "libpandafile/debug_info_extractor.h"
 #include "libpandafile/file.h"
 
diff --git a/ets2panda/evaluate/importExportTable.h b/ets2panda/evaluate/importExportTable.h
index 35f00ca3bb11d1b15741480524b7b2e13566d5b3..5859348a3c2b39a8c892f017ec681bffd4c2c16b 100644
--- a/ets2panda/evaluate/importExportTable.h
+++ b/ets2panda/evaluate/importExportTable.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_EVALUATE_IMPORT_EXPORT_TABLE_H
 #define ES2PANDA_EVALUATE_IMPORT_EXPORT_TABLE_H
 
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::evaluate {
 
diff --git a/ets2panda/evaluate/irCheckHelper.h b/ets2panda/evaluate/irCheckHelper.h
index 01b034fd873d99cb7b570f8e3fc7565116a4a462..f246598d2acc4852e9666857d429ef72807a544b 100644
--- a/ets2panda/evaluate/irCheckHelper.h
+++ b/ets2panda/evaluate/irCheckHelper.h
@@ -16,8 +16,8 @@
 #ifndef ES2PANDA_EVALUATE_NON_RECURSIVE_IR_CHECKER_H
 #define ES2PANDA_EVALUATE_NON_RECURSIVE_IR_CHECKER_H
 
-#include "libpandabase/mem/arena_allocator.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::checker {
 class ETSChecker;
diff --git a/ets2panda/evaluate/pathResolver.h b/ets2panda/evaluate/pathResolver.h
index e678a2240af0ac88f5e596a4463b01c992df5ae4..0d9ad949ae4c885b7cb27ffd2611e325916c07f6 100644
--- a/ets2panda/evaluate/pathResolver.h
+++ b/ets2panda/evaluate/pathResolver.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_EVALUATE_PATH_RESOLVER_H
 #define ES2PANDA_EVALUATE_PATH_RESOLVER_H
 
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::evaluate {
 
diff --git a/ets2panda/evaluate/proxyProgramsCache.h b/ets2panda/evaluate/proxyProgramsCache.h
index 59211afa91e1aaf16eaf719b927ab3476e57e82e..d26343080337e64617c6f7948add684dd1a58f0f 100644
--- a/ets2panda/evaluate/proxyProgramsCache.h
+++ b/ets2panda/evaluate/proxyProgramsCache.h
@@ -18,8 +18,8 @@
 
 #include "util/ustring.h"
 
-#include "libpandabase/mem/arena_allocator.h"
-#include "libpandabase/utils/arena_containers.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::parser {
 class Program;
diff --git a/ets2panda/ir/base/scriptFunction.cpp b/ets2panda/ir/base/scriptFunction.cpp
index 71fe36ba69d9ead1439534435835a77178d1bcfd..9246ad0d421e6bc3108c2e2e3639d155068c6c72 100644
--- a/ets2panda/ir/base/scriptFunction.cpp
+++ b/ets2panda/ir/base/scriptFunction.cpp
@@ -20,8 +20,8 @@
 #include "compiler/core/pandagen.h"
 #include "ir/astDump.h"
 #include "ir/srcDump.h"
-#include "mem/arena_allocator.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 
diff --git a/ets2panda/ir/ets/etsModule.cpp b/ets2panda/ir/ets/etsModule.cpp
index 4891a53166698946c5d4127c5b5516ef41841d92..fd81632c78f3a972c804069c8610e3b01820b6f7 100644
--- a/ets2panda/ir/ets/etsModule.cpp
+++ b/ets2panda/ir/ets/etsModule.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "etsModule.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 
diff --git a/ets2panda/ir/irnode.h b/ets2panda/ir/irnode.h
index 84f269da1f3a6988cc6c3effb51e17278f6a8b0b..82f498b24abec43094d817f52dfed6ba79749b84 100644
--- a/ets2panda/ir/irnode.h
+++ b/ets2panda/ir/irnode.h
@@ -22,7 +22,7 @@
 #include "lexer/token/sourceLocation.h"
 #include "util/es2pandaMacros.h"
 #include "util/ustring.h"
-#include "utils/span.h"
+#include "../libarkbase/utils/span.h"
 
 #include <cstdint>
 #include <list>
diff --git a/ets2panda/ir/module/importDeclaration.cpp b/ets2panda/ir/module/importDeclaration.cpp
index 161970f5f50147e5d86bb4768247e8a9f2df32ff..93bf19b4568f4d3ac74ecf640f5a97414a3960d6 100644
--- a/ets2panda/ir/module/importDeclaration.cpp
+++ b/ets2panda/ir/module/importDeclaration.cpp
@@ -20,7 +20,7 @@
 #include "compiler/core/pandagen.h"
 #include "ir/astDump.h"
 #include "ir/srcDump.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 
diff --git a/ets2panda/ir/statements/blockStatement.cpp b/ets2panda/ir/statements/blockStatement.cpp
index abbe7d12b09e925f5b0f41b78027bab834556bc6..46f8ad8657baed9ef7050f886325a709f03dde22 100644
--- a/ets2panda/ir/statements/blockStatement.cpp
+++ b/ets2panda/ir/statements/blockStatement.cpp
@@ -22,7 +22,7 @@
 #include "checker/ETSchecker.h"
 #include "ir/astDump.h"
 #include "ir/srcDump.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 void BlockStatement::TransformChildren(const NodeTransformer &cb, std::string_view const transformationName)
diff --git a/ets2panda/ir/statements/blockStatement.h b/ets2panda/ir/statements/blockStatement.h
index e47670c06112b0b5b3f3b784ce961bebdcb6d0ca..059ee7720a4a1fcf11dba5533dadf0f65f4f548f 100644
--- a/ets2panda/ir/statements/blockStatement.h
+++ b/ets2panda/ir/statements/blockStatement.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_IR_STATEMENT_BLOCK_STATEMENT_H
 
 #include "ir/statement.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::checker {
 class ETSAnalyzer;
diff --git a/ets2panda/ir/statements/variableDeclaration.cpp b/ets2panda/ir/statements/variableDeclaration.cpp
index adbe853c541c2bd7ec89bbdbb15de828f6b06f90..8005fc00580eb18d1a1ec173f61d3587499772d9 100644
--- a/ets2panda/ir/statements/variableDeclaration.cpp
+++ b/ets2panda/ir/statements/variableDeclaration.cpp
@@ -19,7 +19,7 @@
 #include "checker/ETSchecker.h"
 #include "compiler/core/ETSGen.h"
 #include "compiler/core/pandagen.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 
diff --git a/ets2panda/ir/ts/tsEnumDeclaration.cpp b/ets2panda/ir/ts/tsEnumDeclaration.cpp
index c3d9c28f0209d0d046394dcbf88c44e6614bb9fb..f2f8dfc0455d8008f0be7134f141cf1f0f7ff9ef 100644
--- a/ets2panda/ir/ts/tsEnumDeclaration.cpp
+++ b/ets2panda/ir/ts/tsEnumDeclaration.cpp
@@ -22,7 +22,7 @@
 #include "util/helpers.h"
 #include "ir/astDump.h"
 #include "ir/srcDump.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 
diff --git a/ets2panda/ir/ts/tsInterfaceDeclaration.cpp b/ets2panda/ir/ts/tsInterfaceDeclaration.cpp
index 4455a8b7764190e5cef66af761cd7fd5d742f193..125dd6d593b24d31fff5f8a126deb2f71dfbb45b 100644
--- a/ets2panda/ir/ts/tsInterfaceDeclaration.cpp
+++ b/ets2panda/ir/ts/tsInterfaceDeclaration.cpp
@@ -16,7 +16,7 @@
 #include "tsInterfaceDeclaration.h"
 
 #include "util/es2pandaMacros.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/declaration.h"
 #include "varbinder/variable.h"
 #include "checker/TSchecker.h"
diff --git a/ets2panda/ir/ts/tsTypeParameter.cpp b/ets2panda/ir/ts/tsTypeParameter.cpp
index 4a8d2538091f49b1c2581e45882b1b64083a07af..e969d045a97516659400348adef01c08613a2f6c 100644
--- a/ets2panda/ir/ts/tsTypeParameter.cpp
+++ b/ets2panda/ir/ts/tsTypeParameter.cpp
@@ -22,7 +22,7 @@
 #include "ir/srcDump.h"
 #include "ir/typeNode.h"
 #include "ir/expressions/identifier.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::ir {
 
diff --git a/ets2panda/lexer/keywordsUtil.h b/ets2panda/lexer/keywordsUtil.h
index 7c852b69754f8c99303f1e436e84702445be9d95..aaee764496d0389c98f55e7f7cf4c25f9a93d8a0 100644
--- a/ets2panda/lexer/keywordsUtil.h
+++ b/ets2panda/lexer/keywordsUtil.h
@@ -22,7 +22,7 @@
 #include "generated/tokenType.h"
 #include "util/es2pandaMacros.h"
 #include "util/ustring.h"
-#include "utils/span.h"
+#include "../libarkbase/utils/span.h"
 
 namespace ark::es2panda::lexer {
 class Lexer;
diff --git a/ets2panda/lexer/templates/keywords.h.erb b/ets2panda/lexer/templates/keywords.h.erb
index 97f76fe537c23832148d86a7689e89b9cd056240..9ce494bbcfa8e9f5630b19081918c132e2f0f287 100644
--- a/ets2panda/lexer/templates/keywords.h.erb
+++ b/ets2panda/lexer/templates/keywords.h.erb
@@ -19,7 +19,7 @@
 #define ES2PANDA_LEXER_KEYWORDS_H
 
 #include "lexer/keywordsBase.h"
-#include "utils/span.h"
+#include "../libarkbase/utils/span.h"
 
 // NOLINTBEGIN(readability-identifier-naming)
 
diff --git a/ets2panda/lexer/token/sourceLocation.h b/ets2panda/lexer/token/sourceLocation.h
index b6557e4d6320509ddfce93860c717d38ec5a289e..df0cc78f1eec2fd5ebb4694ae0230ce4e3216ce5 100644
--- a/ets2panda/lexer/token/sourceLocation.h
+++ b/ets2panda/lexer/token/sourceLocation.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_LEXER_TOKEN_SOURCE_LOCATION_H
 #define ES2PANDA_LEXER_TOKEN_SOURCE_LOCATION_H
 
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include <cstddef>
 #include <cstdint>
 #include <vector>
diff --git a/ets2panda/lsp/include/create_type_help_items.h b/ets2panda/lsp/include/create_type_help_items.h
index 6ac398db55a56381914df290a44fd3d633f9dd14..554b90275d6b2dd2015c844ad3e34bcd0dcbb4d2 100644
--- a/ets2panda/lsp/include/create_type_help_items.h
+++ b/ets2panda/lsp/include/create_type_help_items.h
@@ -20,7 +20,7 @@
 #include <string>
 #include "ir/astNode.h"
 #include "lexer/token/sourceLocation.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include <checker/checker.h>
 #include <checker/typeChecker/TypeChecker.h>
 #include <utility>
diff --git a/ets2panda/lsp/src/classifier.cpp b/ets2panda/lsp/src/classifier.cpp
index bd8d8a0ae9341a2ad04e7d667527bd601cb2fe8c..e373884ec72eaf69e023de39d73327efe462dad4 100644
--- a/ets2panda/lsp/src/classifier.cpp
+++ b/ets2panda/lsp/src/classifier.cpp
@@ -23,11 +23,11 @@
 #include "internal_api.h"
 #include "ir/astNode.h"
 #include "lexer/lexer.h"
-#include "macros.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/macros.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "public/es2panda_lib.h"
 #include "public/public.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/declaration.h"
 
 namespace ark::es2panda::lsp {
diff --git a/ets2panda/lsp/src/create_type_help_items.cpp b/ets2panda/lsp/src/create_type_help_items.cpp
index e9c53ba8421aba2c0c54e582310d6e5fd39360ce..1ff0423b94646d0158860ce1b3650be7dffa62bb 100644
--- a/ets2panda/lsp/src/create_type_help_items.cpp
+++ b/ets2panda/lsp/src/create_type_help_items.cpp
@@ -16,7 +16,7 @@
 #include "create_type_help_items.h"
 #include <iostream>
 #include <string>
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::lsp {
 
diff --git a/ets2panda/lsp/src/get_adjusted_location.cpp b/ets2panda/lsp/src/get_adjusted_location.cpp
index 4bb625026e40f09073692956c035918f20c3ede2..f5bf00d5d57e52ad5c9255eb6595706039a2bd9f 100644
--- a/ets2panda/lsp/src/get_adjusted_location.cpp
+++ b/ets2panda/lsp/src/get_adjusted_location.cpp
@@ -21,7 +21,7 @@
 #include "public/es2panda_lib.h"
 #include "public/public.h"
 #include "ir/astNodeFlags.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "util/options.h"
 
 using ark::es2panda::ir::AstNode;
diff --git a/ets2panda/lsp/src/get_class_property_info.cpp b/ets2panda/lsp/src/get_class_property_info.cpp
index 750d24fd84f4b49791d7adb62b786f544bea7554..377e3390a7c90828a20d50292306744d7a3d9342 100644
--- a/ets2panda/lsp/src/get_class_property_info.cpp
+++ b/ets2panda/lsp/src/get_class_property_info.cpp
@@ -24,7 +24,7 @@
 
 #include "get_class_property_info.h"
 #include "compiler/lowering/util.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 
 namespace ark::es2panda::lsp {
 
diff --git a/ets2panda/lsp/src/inlay_hints.cpp b/ets2panda/lsp/src/inlay_hints.cpp
index 3a89585a1d727513d6428d5fbe9979621ac25bca..eb236d815e94a0e5cc695c33cf8e9642b15df06f 100644
--- a/ets2panda/lsp/src/inlay_hints.cpp
+++ b/ets2panda/lsp/src/inlay_hints.cpp
@@ -20,7 +20,7 @@
 #include "public/public.h"
 #include "internal_api.h"
 #include "cancellation_token.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::lsp {
 
diff --git a/ets2panda/lsp/src/internal_api.cpp b/ets2panda/lsp/src/internal_api.cpp
index efeee45bfdd104574816e7f79e2a52bbcbfff958..0bec326a9791a6b246e6c90901f94dc659f25c9d 100644
--- a/ets2panda/lsp/src/internal_api.cpp
+++ b/ets2panda/lsp/src/internal_api.cpp
@@ -23,10 +23,10 @@
 #include "compiler/lowering/util.h"
 #include "ir/astNode.h"
 #include "lexer/token/sourceLocation.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "public/es2panda_lib.h"
 #include "public/public.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "formatting/formatting.h"
 #include "code_fix_provider.h"
 #include "get_class_property_info.h"
diff --git a/ets2panda/lsp/src/rename.cpp b/ets2panda/lsp/src/rename.cpp
index f4e385c428329ef862ee2f8ef1faecd162fe2fdd..0af05824c262ade3a821df4edab43283bed509f7 100644
--- a/ets2panda/lsp/src/rename.cpp
+++ b/ets2panda/lsp/src/rename.cpp
@@ -15,7 +15,7 @@
 
 #include "rename.h"
 #include "get_adjusted_location.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "lexer/token/letters.h"
 #include "compiler/lowering/util.h"
 #include "public/public.h"
diff --git a/ets2panda/lsp/src/signature_help.cpp b/ets2panda/lsp/src/signature_help.cpp
index 58a726287f413e54d0020a927636592cbe8c46ac..170242f15b820adfb1652ddce1a5e5922f0ba980 100644
--- a/ets2panda/lsp/src/signature_help.cpp
+++ b/ets2panda/lsp/src/signature_help.cpp
@@ -15,7 +15,7 @@
 
 #include "signature_help.h"
 #include "internal_api.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include <cstddef>
 #include <iostream>
 #include <optional>
diff --git a/ets2panda/lsp/src/signature_help_items.cpp b/ets2panda/lsp/src/signature_help_items.cpp
index 01f5fc651ff81fb26db7972a8094c9d683facca6..45193efc6ec6a74d9220afa5b29cc98d772d942c 100644
--- a/ets2panda/lsp/src/signature_help_items.cpp
+++ b/ets2panda/lsp/src/signature_help_items.cpp
@@ -17,7 +17,7 @@
 #include <optional>
 #include <string>
 #include <vector>
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace ark::es2panda::lsp {
 
diff --git a/ets2panda/lsp/src/suggestion_diagnostics.cpp b/ets2panda/lsp/src/suggestion_diagnostics.cpp
index ae94deae2ec25755f8b6ded790026c46a1549fa3..80078be6dcfc0db23908a91ba8a8109b79b271bb 100644
--- a/ets2panda/lsp/src/suggestion_diagnostics.cpp
+++ b/ets2panda/lsp/src/suggestion_diagnostics.cpp
@@ -15,7 +15,7 @@
 
 #include "suggestion_diagnostics.h"
 #include "internal_api.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include <memory>
 #include <unordered_map>
 #include <vector>
diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp
index 2a7ea152f1d0c42814411b6665fbd1e30fd2b4d0..d81c06e80e21bc9bdeb1deb63e66e9170602e1d1 100644
--- a/ets2panda/parser/ETSparser.cpp
+++ b/ets2panda/parser/ETSparser.cpp
@@ -25,7 +25,7 @@
 #include "util/helpers.h"
 #include "util/language.h"
 #include "util/options.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/varbinder.h"
 #include "varbinder/ETSBinder.h"
 #include "lexer/lexer.h"
diff --git a/ets2panda/parser/ETSparserClasses.cpp b/ets2panda/parser/ETSparserClasses.cpp
index 0876670671b173530cbb9ac165104505fbe085ef..debbbfb55dfc2395df551659d7c0b0b9b5012f0e 100644
--- a/ets2panda/parser/ETSparserClasses.cpp
+++ b/ets2panda/parser/ETSparserClasses.cpp
@@ -22,7 +22,7 @@
 #include "parser/parserStatusContext.h"
 #include "util/helpers.h"
 #include "util/language.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/varbinder.h"
 #include "varbinder/ETSBinder.h"
 #include "lexer/lexer.h"
diff --git a/ets2panda/parser/ETSparserEnums.cpp b/ets2panda/parser/ETSparserEnums.cpp
index b38077398cc5b70edba573d32ea6928b9ff8dbd3..ee56b8640405d1cbd224167133e9e42b9ccc29b0 100644
--- a/ets2panda/parser/ETSparserEnums.cpp
+++ b/ets2panda/parser/ETSparserEnums.cpp
@@ -22,7 +22,7 @@
 #include "parser/parserStatusContext.h"
 #include "util/helpers.h"
 #include "util/language.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/varbinder.h"
 #include "varbinder/ETSBinder.h"
 #include "lexer/lexer.h"
diff --git a/ets2panda/parser/ETSparserNamespaces.cpp b/ets2panda/parser/ETSparserNamespaces.cpp
index 50240599974741629a8b0ec7b6ceb6b993125256..2824a4ab575b78acabd64213956499b7b2387fd5 100644
--- a/ets2panda/parser/ETSparserNamespaces.cpp
+++ b/ets2panda/parser/ETSparserNamespaces.cpp
@@ -17,7 +17,7 @@
 #include "lexer/lexer.h"
 #include "ir/astNode.h"
 #include "ir/ets/etsModule.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "util/errorRecovery.h"
 #include "generated/diagnostic.h"
 
diff --git a/ets2panda/parser/ETSparserStatements.cpp b/ets2panda/parser/ETSparserStatements.cpp
index 3a3bcf9294d53d5659622ed6731eaba11bc2beb7..2b5830cbddbf3473c5dbc115a4e1abff2009a523 100644
--- a/ets2panda/parser/ETSparserStatements.cpp
+++ b/ets2panda/parser/ETSparserStatements.cpp
@@ -20,7 +20,7 @@
 #include "parser/parserFlags.h"
 #include "util/errorRecovery.h"
 #include "util/helpers.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/varbinder.h"
 #include "varbinder/ETSBinder.h"
 #include "lexer/lexer.h"
diff --git a/ets2panda/parser/ETSparserTypes.cpp b/ets2panda/parser/ETSparserTypes.cpp
index 946e7611eda6860a9524045f088f7a7dd09d57ef..831055f76c2e8094a7fe8b19a25f12da022473d8 100644
--- a/ets2panda/parser/ETSparserTypes.cpp
+++ b/ets2panda/parser/ETSparserTypes.cpp
@@ -21,7 +21,7 @@
 #include "parser/parserStatusContext.h"
 #include "util/helpers.h"
 #include "util/language.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "varbinder/varbinder.h"
 #include "varbinder/ETSBinder.h"
 #include "lexer/lexer.h"
diff --git a/ets2panda/parser/context/classPrivateContext.h b/ets2panda/parser/context/classPrivateContext.h
index 8533f4633b05d46cd43355aa75c74201867bac85..64e2834c4477590c108d5cccbe9aaf6de1524dc1 100644
--- a/ets2panda/parser/context/classPrivateContext.h
+++ b/ets2panda/parser/context/classPrivateContext.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_PARSER_CONTEXT_CLASS_PRIVATE_CONTEXT_H
 #define ES2PANDA_PARSER_CONTEXT_CLASS_PRIVATE_CONTEXT_H
 
-#include <macros.h>
+#include <../libarkbase/macros.h>
 #include "util/enumbitops.h"
 #include "util/ustring.h"
 
diff --git a/ets2panda/parser/program/entityNameVisitor.h b/ets2panda/parser/program/entityNameVisitor.h
index e8f64ffc46900ce165d1f94ac2c7ace714da9649..70528292a397f4c84e742c6dbf7e8d43fc7488fc 100644
--- a/ets2panda/parser/program/entityNameVisitor.h
+++ b/ets2panda/parser/program/entityNameVisitor.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_PARSER_PROGRAM_ENTITY_NAME_VISITOR_H
 #define ES2PANDA_PARSER_PROGRAM_ENTITY_NAME_VISITOR_H
 
-#include "libpandabase/mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "util/es2pandaMacros.h"
 #include "ir/visitor/IterateAstVisitor.h"
 #include "util/ustring.h"
diff --git a/ets2panda/parser/program/program.cpp b/ets2panda/parser/program/program.cpp
index 572ce976dc019b2b7e56d904c9303874ed1e8ce9..39cf0da59291ce37dd754c317ad3e88beacebbff 100644
--- a/ets2panda/parser/program/program.cpp
+++ b/ets2panda/parser/program/program.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "program.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "public/public.h"
 
 #include "compiler/core/CFG.h"
diff --git a/ets2panda/parser/program/program.h b/ets2panda/parser/program/program.h
index c29543942cadcf88358a2ac9db0e08e8f34a4169..1da6f176e4be166f64df3e426d1347c9a6b9136a 100644
--- a/ets2panda/parser/program/program.h
+++ b/ets2panda/parser/program/program.h
@@ -17,8 +17,8 @@
 #define ES2PANDA_PARSER_INCLUDE_PROGRAM_H
 
 #include "util/es2pandaMacros.h"
-#include "mem/pool_manager.h"
-#include "os/filesystem.h"
+#include "../libarkbase/mem/pool_manager.h"
+#include "../libarkbase/os/filesystem.h"
 #include "util/ustring.h"
 #include "util/path.h"
 #include "util/importPathManager.h"
diff --git a/ets2panda/public/public.h b/ets2panda/public/public.h
index 447555838c53bf6dd661dc53420aa198c2bd0335..a140fee88785a0b5831fa604da0b834ff62692e6 100644
--- a/ets2panda/public/public.h
+++ b/ets2panda/public/public.h
@@ -20,7 +20,7 @@
 #include "public/es2panda_lib.h"
 
 #include "assembler/assembly-program.h"
-#include "libpandabase/mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 
 #include "compiler/core/compileQueue.h"
 #include "parser/ETSparser.h"
diff --git a/ets2panda/test/depanalyzer/path_getter.h.erb b/ets2panda/test/depanalyzer/path_getter.h.erb
index 245be2c3a9be01287f3dd65e1cebc8b8453d42ad..97aeddecccdfb7d06a6e701e0bbc4d245b62f70b 100644
--- a/ets2panda/test/depanalyzer/path_getter.h.erb
+++ b/ets2panda/test/depanalyzer/path_getter.h.erb
@@ -16,7 +16,7 @@
 #ifndef PANDA_PATH_GETTER
 #define PANDA_PATH_GETTER
 
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "util/path.h"
 #include <string>
 
diff --git a/ets2panda/test/depanalyzer/test.cpp b/ets2panda/test/depanalyzer/test.cpp
index e3bfa34aac3803d9a34052179ef26bf1aa4f3b90..156129d282b8e0f9a88b998578628f85e55e86b3 100644
--- a/ets2panda/test/depanalyzer/test.cpp
+++ b/ets2panda/test/depanalyzer/test.cpp
@@ -17,9 +17,9 @@
 #include <vector>
 
 #include "driver/dependency_analyzer/dep_analyzer.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "path_getter.h"
-#include "os/filesystem.h"
+#include "../libarkbase/os/filesystem.h"
 
 namespace {
 
diff --git a/ets2panda/test/unit/annotations/annotations_emit_test.h b/ets2panda/test/unit/annotations/annotations_emit_test.h
index 5b1ea0f04a6b43cf1c0f76291a07bf80154390a8..4579b8d7c1c108a9e5b0deda43fcba89c1abdc4c 100644
--- a/ets2panda/test/unit/annotations/annotations_emit_test.h
+++ b/ets2panda/test/unit/annotations/annotations_emit_test.h
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 #include "annotation.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "util/options.h"
 #include <cstddef>
 #include <iostream>
diff --git a/ets2panda/test/unit/ast_dumper_test.cpp b/ets2panda/test/unit/ast_dumper_test.cpp
index f7e590006198100678f9644e1c3154b0c02eb02e..38d2c0629d7933d367f2c058b76513eb3b7ff957 100644
--- a/ets2panda/test/unit/ast_dumper_test.cpp
+++ b/ets2panda/test/unit/ast_dumper_test.cpp
@@ -15,19 +15,19 @@
 
 #include <gtest/gtest.h>
 #include <algorithm>
-#include "macros.h"
+#include "../libarkbase/macros.h"
 
 #include "assembler/assembly-program.h"
 #include "ir/astDump.h"
 #include "ir/expressions/literals/stringLiteral.h"
 #include "bytecode_optimizer/bytecodeopt_options.h"
 #include "compiler/compiler_logger.h"
-#include "mem/arena_allocator.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "es2panda.h"
 #include "util/arktsconfig.h"
 #include "util/generateBin.h"
-#include "libpandabase/mem/mem.h"
+#include "../libarkbase/mem/mem.h"
 #include "test/utils/panda_executable_path_getter.h"
 #include "test/utils/asm_test.h"
 
diff --git a/ets2panda/test/unit/checker_test.cpp b/ets2panda/test/unit/checker_test.cpp
index ba6e08165eb4b64ca9114985fc19ecc273cd8351..47a2f74e9af33a03aab0fe227987d039cb7cbaa4 100644
--- a/ets2panda/test/unit/checker_test.cpp
+++ b/ets2panda/test/unit/checker_test.cpp
@@ -14,7 +14,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "test/utils/ast_verifier_test.h"
 
 using CheckerTest = test::utils::AstVerifierTest;
diff --git a/ets2panda/test/unit/declgen/test_ets2ts_isolated_declgen.cpp b/ets2panda/test/unit/declgen/test_ets2ts_isolated_declgen.cpp
index 8cb169287b75912e5e550b4c69bde35999274b05..a6d59b10797aa3337c8bf0c22cca9a0efb27171f 100644
--- a/ets2panda/test/unit/declgen/test_ets2ts_isolated_declgen.cpp
+++ b/ets2panda/test/unit/declgen/test_ets2ts_isolated_declgen.cpp
@@ -17,7 +17,7 @@
 #include <ostream>
 #include <string>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "./util.h"
diff --git a/ets2panda/test/unit/declgen/util.cpp b/ets2panda/test/unit/declgen/util.cpp
index ed872305b2279f5809c8ce6679cd7f676bf84279..66465490917ee8621275e1a126662d8d65bdcba6 100644
--- a/ets2panda/test/unit/declgen/util.cpp
+++ b/ets2panda/test/unit/declgen/util.cpp
@@ -20,7 +20,7 @@
 #include <ostream>
 #include <fstream>
 #include <string>
-#include "macros.h"
+#include "../libarkbase/macros.h"
 
 static es2panda_Impl *g_implPtr = nullptr;
 
diff --git a/ets2panda/test/unit/declgen/util.h b/ets2panda/test/unit/declgen/util.h
index d4c678d9ad0556a6a67130c617b508050b548348..c15a0235718733a39ce9233b812065490bf7f490 100644
--- a/ets2panda/test/unit/declgen/util.h
+++ b/ets2panda/test/unit/declgen/util.h
@@ -22,7 +22,7 @@
 #include <map>
 #include <vector>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 
diff --git a/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h b/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h
index c5310786f98a09fa512e9b11a5db6a52adf9f83c..29b188f1f0a211231f1816b3c5640d8e2e6dcc3c 100644
--- a/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h
+++ b/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h
@@ -30,10 +30,10 @@
 #include "compiler/optimizer/ir/inst.h"
 #include "compiler/optimizer/ir/ir_constructor.h"
 #include "compiler/optimizer/optimizations/regalloc/reg_alloc_linear_scan.h"
-#include "libpandabase/utils/logger.h"
-#include "libpandabase/utils/utils.h"
-#include "mem/arena_allocator.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/utils/logger.h"
+#include "../libarkbase/utils/utils.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "optimizer/ir/inst.h"
 #include "bytecode_optimizer/reg_acc_alloc.h"
 #include "bytecode_optimizer/optimize_bytecode.h"
diff --git a/ets2panda/test/unit/extern_flag_test.cpp b/ets2panda/test/unit/extern_flag_test.cpp
index 85b3fd21adfed71a70e7a3bb921a0010fdd8b93d..c13f49c3065d262c4c7aa649ab7c6e0cecb3141a 100644
--- a/ets2panda/test/unit/extern_flag_test.cpp
+++ b/ets2panda/test/unit/extern_flag_test.cpp
@@ -17,9 +17,9 @@
 
 #include "assembler/assembly-program.h"
 #include "generated/signatures.h"
-#include "libpandabase/mem/mem.h"
-#include "macros.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/mem.h"
+#include "../libarkbase/macros.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "util/options.h"
 #include "test/utils/asm_test.h"
 
diff --git a/ets2panda/test/unit/globalETSObjectType_test.cpp b/ets2panda/test/unit/globalETSObjectType_test.cpp
index 9100fabbe57acc8e3f563cbbcea65f48b62343fb..eea8b6f10b4f5f32682c40f44001bf9b71daa460 100644
--- a/ets2panda/test/unit/globalETSObjectType_test.cpp
+++ b/ets2panda/test/unit/globalETSObjectType_test.cpp
@@ -23,8 +23,8 @@
 #include "compiler/core/regSpiller.h"
 #include "compiler/lowering/phase.h"
 #include "es2panda.h"
-#include "mem/arena_allocator.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "public/public.h"
 #include "util/arktsconfig.h"
 #include "util/generateBin.h"
diff --git a/ets2panda/test/unit/lowerings/scopes_initialization.cpp b/ets2panda/test/unit/lowerings/scopes_initialization.cpp
index 1c82aeed87a9433ae34306838724b64a7aea4296..6e9cd34e3010955e433de059725b53193d2bd21d 100644
--- a/ets2panda/test/unit/lowerings/scopes_initialization.cpp
+++ b/ets2panda/test/unit/lowerings/scopes_initialization.cpp
@@ -15,7 +15,7 @@
 
 #include <gtest/gtest.h>
 #include <algorithm>
-#include "macros.h"
+#include "../libarkbase/macros.h"
 
 #include "test/utils/node_creator.h"
 #include "test/utils/scope_init_test.h"
diff --git a/ets2panda/test/unit/lsp/create_type_help_items_test.cpp b/ets2panda/test/unit/lsp/create_type_help_items_test.cpp
index e27206f69bc2aeb7dae3c41e2f6d23c6a662d92d..12a4da836d17fd92b6ec8a9e7bdceab5763ab114 100644
--- a/ets2panda/test/unit/lsp/create_type_help_items_test.cpp
+++ b/ets2panda/test/unit/lsp/create_type_help_items_test.cpp
@@ -22,7 +22,7 @@
 #include "ir/astNode.h"
 #include "lsp/include/internal_api.h"
 #include "public/es2panda_lib.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 namespace {
 
diff --git a/ets2panda/test/unit/plugin/CMakeLists.txt b/ets2panda/test/unit/plugin/CMakeLists.txt
index 672aff08e47fc7bb6d04a499fb451dc6d7bcff1e..35a4949637bc68dbf25cb20ea2bb25fb7d911218 100644
--- a/ets2panda/test/unit/plugin/CMakeLists.txt
+++ b/ets2panda/test/unit/plugin/CMakeLists.txt
@@ -134,7 +134,6 @@ foreach(TEST_DATA IN ITEMS ${PLUGIN_TESTS})
     endif()
     panda_target_include_directories(${TEST_NAME}
         PRIVATE ${ES2PANDA_PATH}
-        PRIVATE ${PANDA_ROOT}/libpandafile
         PRIVATE ${PANDA_ROOT}/assembler
         PRIVATE ${OUTPUT_DIR}
         PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp
index b700c046a91a6e21bd812c47bcf96d1afc9fd211..f3510811c94caf7033e59325432406e1bc694342 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp
@@ -17,7 +17,7 @@
 #include <ostream>
 #include <string>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_call_lambda.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_call_lambda.cpp
index 1b04bf65389f3465af1bccb22f446424c1dba193..e942a52a2c368fd7aa98844a19bd819a077cc8a4 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_call_lambda.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_call_lambda.cpp
@@ -18,7 +18,7 @@
 #include <ostream>
 #include <string>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_func.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_func.cpp
index a9d86e8b6bb8170a925dafd841ae51ea7c18f6ac..38c71cbd60b9168a76b57e1b90eb4568814c6346 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_func.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_func.cpp
@@ -18,7 +18,7 @@
 #include <ostream>
 #include <string>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp
index bd890b99a673fd98af063fa6f219dfe251535fee..5ed1fbae9619b9468e9a7f71daef6192e43c4240 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp
@@ -18,7 +18,7 @@
 #include <ostream>
 #include <string>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_checker_type.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_checker_type.cpp
index c1b46d007545bee56ac58ac2bf225f7b04c634e0..305ab47155b73fb0d1c48d5648935011bb5ae4c3 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_checker_type.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_checker_type.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_annotation.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_annotation.cpp
index 19cc7b5504957829548d6ab9d4e0b9bef212ba6d..b6a1dc2992183d7b90f139de980ac216770b08e7 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_annotation.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_annotation.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_import.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_import.cpp
index d7953251363888edd9d08f7f54812ceba7388633..2864828a94fc98d327006bf07223e387c6d8fa33 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_import.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_import.cpp
@@ -18,11 +18,11 @@
 #include <ostream>
 #include <string>
 #include <vector>
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "util.h"
 #include "public/es2panda_lib.h"
 #include "ir/ets/etsImportDeclaration.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 // NOLINTBEGIN
 
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_interface_declaration.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_interface_declaration.cpp
index 00b9274ebfdeb7abf313064a7af306dc06b2afba..27dd439a46d758c305f5140e7541dd53f7c0f870 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_interface_declaration.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_interface_declaration.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 #include "public/es2panda_lib.h"
 #include "util.h"
 
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_dynamic_class_recheck.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_dynamic_class_recheck.cpp
index 4355b52e6417937e0cfaff909ce291fa500662e2..b6a9ba320ca05e9c03709267bf0607a8ba3f2775 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_dynamic_class_recheck.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_dynamic_class_recheck.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_function_to_arrow.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_function_to_arrow.cpp
index 9aafdf4077ee43b6094bc216cd71817678ed2dc3..ccb773bd8f01a1515acc1ee772b404b0dafb93cb 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_function_to_arrow.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_function_to_arrow.cpp
@@ -20,7 +20,7 @@
 #include <vector>
 #include "util.h"
 #include "public/es2panda_lib.h"
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 // NOLINTBEGIN
 
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor.cpp
index 723da6707efd6b16a9dc666886b05686f02129c9..beb794d83f977acd48f043360de79e65cdea8fb4 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_member_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_member_expression.cpp
index 10774a84d5ac51987b5615fd98dd9be6ed737406..0d1b326e6e71be845a006a4c0d93bb2d6dd9e16e 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_member_expression.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_member_expression.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expr.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expr.cpp
index 9b426e52ad683f17dea7ff467548d2ec19d29453..bd8274f9954df3f3dcb486c0e3671b0416c4f999 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expr.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expr.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression.cpp
index 226ef77522d69820c382c29d5e354a3e50ae0a3e..4c60bc4b3ff445c619304667327857f3a827a50f 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_new_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_new_expression.cpp
index 9f20032bec1d727dbdf1520fb2c468df664e55df..210db0c5ba6bc8901077f8332ba14e447544b153 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_new_expression.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_new_expression.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_return_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_return_expression.cpp
index e34139e1b973d5839be97d25aca515a0cd83e50d..2ca615ee2b2249185d464134f26310a6f85b71c0 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_return_expression.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_return_expression.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_string_optimize.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_string_optimize.cpp
index b75123ec5f89ee09ee9db6be9993fb2b5c715550..0bc33e5ba7df030adc89c29ce8b06e90415bcc4b 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_string_optimize.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_string_optimize.cpp
@@ -17,7 +17,7 @@
 #include <ostream>
 #include <string>
 #include <unordered_map>
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 #include "public/es2panda_lib.h"
 #include "util.h"
 
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_annotation_change.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_annotation_change.cpp
index 31a2e3f7ddb85441a7070f9be5c6b95b7cd8e195..6bd8d0179dfb2d5af6d15c78d487c3c713437ba6 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_annotation_change.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_annotation_change.cpp
@@ -17,7 +17,7 @@
 #include <vector>
 #include <utility>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_class_decl_annotation.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_class_decl_annotation.cpp
index 721f71e54be1f57814df8050e209b600c6a7ceac..df633b5972fda96e7251f080cdb95ca8aa59a803 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_class_decl_annotation.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_class_decl_annotation.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <utility>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_this_into_method.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_this_into_method.cpp
index 567dc2d77ebbb8658b504d0a21d6baafab766482..efbdcaddb60d65818d08268babfe9aaf598b4a44 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_this_into_method.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_this_into_method.cpp
@@ -20,7 +20,7 @@
 #include <cstring>
 #include <string_view>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_class.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_class.cpp
index 5dccbe707c62d23b850762c7d62ff3a2f70afaf5..5aa4210849755df0e160d5e18a7c7208f99c01e5 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_class.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_class.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <cstring>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements.cpp
index 65437f6c97e32233d5baebaa9cb207bfaf3bfaeb..dc551bbdc23626410d3aa92f0558215fe48252ea 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <string>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements_lambda.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements_lambda.cpp
index eaae54580ce0db16eec94c2f6bd7dd0c2a95249b..a45c6d8a1494db5ad2544c1f1369bbcdee87907b 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements_lambda.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements_lambda.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <utility>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 #include "util.h"
diff --git a/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp b/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp
index 1bfb5a30effa8c3c2fcb7d418bc7b2b046e4f4c1..81a16b3b15e56cb1ab8219b4a15af2bf4fb1f10a 100644
--- a/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp
+++ b/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp
@@ -16,8 +16,8 @@
 #include <cstdint>
 #include <memory>
 #include "file.h"
-#include "macros.h"
-#include "os/file.h"
+#include "../libarkbase/macros.h"
+#include "../libarkbase/os/file.h"
 #include "public/es2panda_lib.h"
 #include "util.h"
 #include "parser/program/program.h"
diff --git a/ets2panda/test/unit/plugin/util.cpp b/ets2panda/test/unit/plugin/util.cpp
index e5709c5b75bff83da4e8214af53f6a76d584c81b..1fe7ba369ddc913ecbfd6cf52680eae18c75c702 100644
--- a/ets2panda/test/unit/plugin/util.cpp
+++ b/ets2panda/test/unit/plugin/util.cpp
@@ -19,7 +19,7 @@
 #include <functional>
 #include <ostream>
 #include <string>
-#include "macros.h"
+#include "../libarkbase/macros.h"
 
 static es2panda_Impl *g_implPtr = nullptr;
 
diff --git a/ets2panda/test/unit/plugin/util.h b/ets2panda/test/unit/plugin/util.h
index 515f89b105bd02b3155f3658e172b7fd02788d7a..156e63da2062a46144a3423959309e88f4a076ac 100644
--- a/ets2panda/test/unit/plugin/util.h
+++ b/ets2panda/test/unit/plugin/util.h
@@ -22,7 +22,7 @@
 #include <map>
 #include <vector>
 
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 #include "public/es2panda_lib.h"
 
diff --git a/ets2panda/test/unit/plugin_conversion_rule/plugin_conversion_rule_unit_test.h b/ets2panda/test/unit/plugin_conversion_rule/plugin_conversion_rule_unit_test.h
index 117529501e05c2a10c8b4232a7cea3a8f751fe63..92455d3fcb04c24cde40dfe01fd5e23e5b4b1f38 100644
--- a/ets2panda/test/unit/plugin_conversion_rule/plugin_conversion_rule_unit_test.h
+++ b/ets2panda/test/unit/plugin_conversion_rule/plugin_conversion_rule_unit_test.h
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "macros.h"
+#include "../libarkbase/macros.h"
 
 #include "test/utils/plugin_conversion_rule_test.h"
 
diff --git a/ets2panda/test/unit/public/ast_builder_test.cpp b/ets2panda/test/unit/public/ast_builder_test.cpp
index 559f1ed6ff202fade24ab7cb9556ad7c64dd63cc..dc60677dc6feb7580d64a5be41d49483f4fb7256 100644
--- a/ets2panda/test/unit/public/ast_builder_test.cpp
+++ b/ets2panda/test/unit/public/ast_builder_test.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "ast_verifier_test.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "util/ast-builders/classDefinitionBuilder.h"
 #include "util/ast-builders/binaryExpressionBuilder.h"
 #include "util/ast-builders/classPropertyBuilder.h"
diff --git a/ets2panda/test/unit/public/ast_verifier_short_test.cpp b/ets2panda/test/unit/public/ast_verifier_short_test.cpp
index 4a20d2a0540dbc26ed29e1649e1400191036df99..1b33b5f8ed3cf9b2611033510f023f6e95258086 100644
--- a/ets2panda/test/unit/public/ast_verifier_short_test.cpp
+++ b/ets2panda/test/unit/public/ast_verifier_short_test.cpp
@@ -20,7 +20,7 @@
 #include "ir/expressions/identifier.h"
 #include "ir/expressions/literals/numberLiteral.h"
 #include "ir/expressions/literals/booleanLiteral.h"
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "varbinder/ETSBinder.h"
 #include "util/diagnosticEngine.h"
 
diff --git a/ets2panda/test/unit/public/es2panda_public_test.cpp b/ets2panda/test/unit/public/es2panda_public_test.cpp
index 8d1f457c6bb64897598a8d113b1beb95676c2fe6..ab53dff88d4f7f0b44e153435e84e7de686ae041 100644
--- a/ets2panda/test/unit/public/es2panda_public_test.cpp
+++ b/ets2panda/test/unit/public/es2panda_public_test.cpp
@@ -14,7 +14,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "public/es2panda_lib.h"
 #include "test/utils/panda_executable_path_getter.h"
 #include "test/utils/ast_verifier_test.h"
diff --git a/ets2panda/test/unit/rest_parameter_flag_test.cpp b/ets2panda/test/unit/rest_parameter_flag_test.cpp
index 026166d78b578892b17dcc7397be85f028d086c9..306c640a8fccf0e1ac7a16b18ad3877568f26da6 100644
--- a/ets2panda/test/unit/rest_parameter_flag_test.cpp
+++ b/ets2panda/test/unit/rest_parameter_flag_test.cpp
@@ -18,9 +18,9 @@
 #include "assembler/assembly-program.h"
 #include "es2panda.h"
 #include "generated/signatures.h"
-#include "libpandabase/mem/mem.h"
-#include "macros.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/mem.h"
+#include "../libarkbase/macros.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "test/utils/asm_test.h"
 
 namespace ark::es2panda::compiler::test {
diff --git a/ets2panda/test/unit/union_normalization_test_1.cpp b/ets2panda/test/unit/union_normalization_test_1.cpp
index d4cbe2fb7d3e38397d63de770249ceec054843ad..f2e2a34ced082b804e1cbc680c914c5be59d48ac 100644
--- a/ets2panda/test/unit/union_normalization_test_1.cpp
+++ b/ets2panda/test/unit/union_normalization_test_1.cpp
@@ -25,8 +25,8 @@
 #include "compiler/core/regSpiller.h"
 #include "compiler/lowering/phase.h"
 #include "es2panda.h"
-#include "mem/arena_allocator.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "public/public.h"
 #include "util/arktsconfig.h"
 #include "util/generateBin.h"
diff --git a/ets2panda/test/unit/union_normalization_test_2.cpp b/ets2panda/test/unit/union_normalization_test_2.cpp
index 59715ca07ed513bca002240473d024897bbf922e..90a3984eb39cead0f6ad07d7c4b171ed09ec6387 100644
--- a/ets2panda/test/unit/union_normalization_test_2.cpp
+++ b/ets2panda/test/unit/union_normalization_test_2.cpp
@@ -25,8 +25,8 @@
 #include "compiler/core/regSpiller.h"
 #include "compiler/lowering/phase.h"
 #include "es2panda.h"
-#include "mem/arena_allocator.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/arena_allocator.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "public/public.h"
 #include "util/arktsconfig.h"
 #include "util/generateBin.h"
diff --git a/ets2panda/test/utils/panda_executable_path_getter.cpp b/ets2panda/test/utils/panda_executable_path_getter.cpp
index 1e7225caea2fd2e7ceaf10dcb3b8649eee818eb8..7574d7b2ccd56b0abd9ae7ea152341c7e2e7ccd0 100644
--- a/ets2panda/test/utils/panda_executable_path_getter.cpp
+++ b/ets2panda/test/utils/panda_executable_path_getter.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "panda_executable_path_getter.h"
 
 namespace test::utils {
diff --git a/ets2panda/test/utils/plugin_conversion_rule_test.h b/ets2panda/test/utils/plugin_conversion_rule_test.h
index 22002c4ba8a1275ef020a0ee6978705ca1946d51..64f88ef420fe9f763b4228cd2a0bf9fd5660bd1d 100644
--- a/ets2panda/test/utils/plugin_conversion_rule_test.h
+++ b/ets2panda/test/utils/plugin_conversion_rule_test.h
@@ -21,7 +21,7 @@
 
 #include <gtest/gtest.h>
 
-#include "macros.h"
+#include "../libarkbase/macros.h"
 
 namespace test::utils {
 
diff --git a/ets2panda/test/utils/scope_init_test.h b/ets2panda/test/utils/scope_init_test.h
index 2529a908f57a0244d753db39bd5dbe91fcaa361b..1a40ba396fe93dca23a9dafef3721e7d553ccf25 100644
--- a/ets2panda/test/utils/scope_init_test.h
+++ b/ets2panda/test/utils/scope_init_test.h
@@ -20,7 +20,7 @@
 #include "ir/statements/blockStatement.h"
 #include "ir/statements/variableDeclarator.h"
 #include "ir/statements/variableDeclaration.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "compiler/lowering/phase.h"
 
 #include <gtest/gtest.h>
diff --git a/ets2panda/util/arktsconfig.cpp b/ets2panda/util/arktsconfig.cpp
index d58d6220f2dbc5a84093c83c40a0112985db0cfb..0eb1adb5be7ad2d5036521d9eb4cfaa1d49dc5ce 100644
--- a/ets2panda/util/arktsconfig.cpp
+++ b/ets2panda/util/arktsconfig.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "arktsconfig.h"
-#include "libpandabase/os/filesystem.h"
+#include "../libarkbase/os/filesystem.h"
 #include "util/language.h"
 #include "util/diagnosticEngine.h"
 #include "generated/signatures.h"
diff --git a/ets2panda/util/arktsconfig.h b/ets2panda/util/arktsconfig.h
index fec474785a06fc2237606dc25adce0ad5d7f9aff..7f7a4bd007a0fa3db23763c647e9c2d6d1037ac2 100644
--- a/ets2panda/util/arktsconfig.h
+++ b/ets2panda/util/arktsconfig.h
@@ -25,8 +25,8 @@
 
 #include "util/language.h"
 #include "util/diagnostic.h"
-#include "libpandabase/utils/json_builder.h"
-#include "libpandabase/utils/json_parser.h"
+#include "../libarkbase/utils/json_builder.h"
+#include "../libarkbase/utils/json_parser.h"
 
 // NOTE(ivagin): If ARKTSCONFIG_USE_FILESYSTEM is not defined part of ArkTsConfig functionality is disabled.
 //       Only build configuration which prevents us from usage of std::filesystem is "MOBILE" build
diff --git a/ets2panda/util/ast-builders/arrowFunctionExpressionBuilder.h b/ets2panda/util/ast-builders/arrowFunctionExpressionBuilder.h
index 16f2bbf171f2fd93219135b024382a5a44fb2c01..acaf830fc378ad2507130603a72af1d3227bbed9 100644
--- a/ets2panda/util/ast-builders/arrowFunctionExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/arrowFunctionExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_ARROW_FUNCTION_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_ARROW_FUNCTION_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/arrowFunctionExpression.h"
 
diff --git a/ets2panda/util/ast-builders/assignmentExpressionBuilder.h b/ets2panda/util/ast-builders/assignmentExpressionBuilder.h
index 127775618c0b6a87859fc071df7d3075e7cf81ab..ecdf876fe93ec8a21637bd8ee0f1a65fb18a711f 100644
--- a/ets2panda/util/ast-builders/assignmentExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/assignmentExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_ASSIGNMENT_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_ASSIGNMENT_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/assignmentExpression.h"
 
diff --git a/ets2panda/util/ast-builders/astBuilder.h b/ets2panda/util/ast-builders/astBuilder.h
index b71842e601da3b8ca8b9d36bfc4e27c60286979c..54019ffeed4bc31dcfc70f4b7a0071fd90872cd0 100644
--- a/ets2panda/util/ast-builders/astBuilder.h
+++ b/ets2panda/util/ast-builders/astBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_AST_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_AST_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "util/helpers.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/awaitExpressionBuilder.h b/ets2panda/util/ast-builders/awaitExpressionBuilder.h
index 7bc7b51ede262d772841121f68b62488e843c9be..c49b2f59d032b5614936f2ae7c00cfca061de6c9 100644
--- a/ets2panda/util/ast-builders/awaitExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/awaitExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_AWAIT_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_AWAIT_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/awaitExpression.h"
 #include "ir/expressions/literals/numberLiteral.h"
diff --git a/ets2panda/util/ast-builders/bigintLiteralBuilder.h b/ets2panda/util/ast-builders/bigintLiteralBuilder.h
index cda60226f4fb25074ffd1c5161c2bcd9cf20abbf..c5e120394201a506821780ce81a9f53b7207f516 100644
--- a/ets2panda/util/ast-builders/bigintLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/bigintLiteralBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_BIGINT_LITERAL_BUILDER
 
 #include "ir/expressions/literals/bigIntLiteral.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/binaryExpressionBuilder.h b/ets2panda/util/ast-builders/binaryExpressionBuilder.h
index b25504387c11b42040db7153a540a0d51478beb9..05537543066c9327572b8b04fd100020c11deb56 100644
--- a/ets2panda/util/ast-builders/binaryExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/binaryExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_BINARY_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_BINARY_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/binaryExpression.h"
 #include "ir/expressions/literals/numberLiteral.h"
diff --git a/ets2panda/util/ast-builders/blockExpressionBuilder.h b/ets2panda/util/ast-builders/blockExpressionBuilder.h
index 30a46d57a87b0a07a76f5eb2aca676f1bf2ced46..46090f0060f07fc3b9093da61e8fafe04a54ca93 100644
--- a/ets2panda/util/ast-builders/blockExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/blockExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_BLOCK_EXPRESSION_BUILDER
 
 #include "ir/expressions/blockExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/blockStatementBuilder.h b/ets2panda/util/ast-builders/blockStatementBuilder.h
index f8a92cfc573df0e57429ae1f12f949a46685ac98..afec452b9b6a1e7fe44c522c0ab6ad399ad02c70 100644
--- a/ets2panda/util/ast-builders/blockStatementBuilder.h
+++ b/ets2panda/util/ast-builders/blockStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_BLOCK_STATEMENT_BUILDER
 
 #include "ir/statements/blockStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/booleanLiteralBuilder.h b/ets2panda/util/ast-builders/booleanLiteralBuilder.h
index abbfdb0b25b25c4ff674105f8338f101825b7e3c..78378ae60cb6302ff2efce9e8c6e71ee12176beb 100644
--- a/ets2panda/util/ast-builders/booleanLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/booleanLiteralBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_BOOLEAN_LITERAL_BUILDER
 
 #include "ir/expressions/literals/booleanLiteral.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/breakStatementBuilder.h b/ets2panda/util/ast-builders/breakStatementBuilder.h
index e6adb26964419f74529a0b162ef5788177700d6a..abbf4781d92f927c2db62f548a8abd36ef367226 100644
--- a/ets2panda/util/ast-builders/breakStatementBuilder.h
+++ b/ets2panda/util/ast-builders/breakStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_BREAK_STATEMENT_BUILDER
 
 #include "ir/statements/breakStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/callExpressionBuilder.h b/ets2panda/util/ast-builders/callExpressionBuilder.h
index 6f8fe5d8396c7fbf397412d5d7738c3d65927068..fb2cc2876686e2b5fd0c9ebd1ab648f755d3afc2 100644
--- a/ets2panda/util/ast-builders/callExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/callExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_CALL_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_CALL_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/callExpression.h"
 
diff --git a/ets2panda/util/ast-builders/catchClauseBuilder.h b/ets2panda/util/ast-builders/catchClauseBuilder.h
index 96f7c38909207f5aef19a8d9712aec56cc394a56..2ad03707dbd2c5fcf8bd51a9d0aaa7aa44dda662 100644
--- a/ets2panda/util/ast-builders/catchClauseBuilder.h
+++ b/ets2panda/util/ast-builders/catchClauseBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_CATCH_CLAUSE_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_CATCH_CLAUSE_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/base/catchClause.h"
 
diff --git a/ets2panda/util/ast-builders/chainExpressionBuilder.h b/ets2panda/util/ast-builders/chainExpressionBuilder.h
index 65bf0b8648bcc0d1a2e90ea202af686decb65dac..57383d7c883c6e038936b08337159761fdf22a65 100644
--- a/ets2panda/util/ast-builders/chainExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/chainExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_CHAIN_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_CHAIN_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/chainExpression.h"
 
diff --git a/ets2panda/util/ast-builders/charLiteralBuilder.h b/ets2panda/util/ast-builders/charLiteralBuilder.h
index 701ede6cf5a00b4db8668870352b02bf7a06ea94..2e3845e79501f3e91133a0dbbaf7c48f5b0799a4 100644
--- a/ets2panda/util/ast-builders/charLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/charLiteralBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_CHAR_LITERAL_BUILDER
 
 #include "ir/expressions/literals/charLiteral.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/classDeclarationBuilder.h b/ets2panda/util/ast-builders/classDeclarationBuilder.h
index 6335bd0b9b018c7a2ad064397ad3b47f21e5587a..1c157a3d7a358d668e2ad8f6560360e098c2c69a 100644
--- a/ets2panda/util/ast-builders/classDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/classDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_CLASS_DECLARATION_BUILDER
 
 #include "ir/statements/classDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/classDefinitionBuilder.h b/ets2panda/util/ast-builders/classDefinitionBuilder.h
index 02b3083bf8d737652a596aa2ac254ba569c7bb87..0baac7f271900cb89f63171780be7c2fb6bf322b 100644
--- a/ets2panda/util/ast-builders/classDefinitionBuilder.h
+++ b/ets2panda/util/ast-builders/classDefinitionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_CLASS_DEFINITION_BUILDER
 
 #include "ir/base/classDefinition.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/classExpressionBuilder.h b/ets2panda/util/ast-builders/classExpressionBuilder.h
index 09090d4d6aaf89bbf1929259af307567ce4eef43..c278e1e1183472d7238c976756a4a3225bcebdc2 100644
--- a/ets2panda/util/ast-builders/classExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/classExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_CLASS_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_CLASS_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/classExpression.h"
 
diff --git a/ets2panda/util/ast-builders/classPropertyBuilder.h b/ets2panda/util/ast-builders/classPropertyBuilder.h
index 6821f943426aa3dbd802ff7a9803329cf5bcde1e..9bd8e95a259c9dd335b1e5fabd44065f58cbe5c7 100644
--- a/ets2panda/util/ast-builders/classPropertyBuilder.h
+++ b/ets2panda/util/ast-builders/classPropertyBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_CLASS_PROPERTY_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_CLASS_PROPERTY_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/base/classProperty.h"
 
diff --git a/ets2panda/util/ast-builders/classStaticBlockBuilder.h b/ets2panda/util/ast-builders/classStaticBlockBuilder.h
index f4cca23ec32aa8d301d6d4d11f17185261250c82..2aced92944d265f05ec396f63f191502d566044d 100644
--- a/ets2panda/util/ast-builders/classStaticBlockBuilder.h
+++ b/ets2panda/util/ast-builders/classStaticBlockBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_CLASS_STATIC_BLOCK_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_CLASS_STATIC_BLOCK_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/base/classStaticBlock.h"
 
diff --git a/ets2panda/util/ast-builders/conditionalExpressionBuilder.h b/ets2panda/util/ast-builders/conditionalExpressionBuilder.h
index 01153ee58c41b6b4f82259a34df79c0e304c82fc..59a1ffc79946a46024997a20c7fc8912b892657b 100644
--- a/ets2panda/util/ast-builders/conditionalExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/conditionalExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_CONDITIONAL_EXPRESSION_BUILDER
 
 #include "ir/expressions/conditionalExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/continueStatementBuilder.h b/ets2panda/util/ast-builders/continueStatementBuilder.h
index 5fcaf8e292bcc9e2c71058aa8adc17b84c569421..a231243ee2fe932658bcb09080fd6406adedbac7 100644
--- a/ets2panda/util/ast-builders/continueStatementBuilder.h
+++ b/ets2panda/util/ast-builders/continueStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_CONTINUE_STATEMENT_BUILDER
 
 #include "ir/statements/continueStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/debuggerStatementBuilder.h b/ets2panda/util/ast-builders/debuggerStatementBuilder.h
index d370755314c305aa39fcd64edc96f87b48b79b3f..7a6576f154583e597b2a56ed6abdd7e4480220df 100644
--- a/ets2panda/util/ast-builders/debuggerStatementBuilder.h
+++ b/ets2panda/util/ast-builders/debuggerStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_DEBUGGER_STATEMENT_BUILDER
 
 #include "ir/statements/debuggerStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/decoratorBuilder.h b/ets2panda/util/ast-builders/decoratorBuilder.h
index 5bdacf4afce9f6ddb092b8db900a1f142f7443c1..3108da5cd5dbade26783067589016688d13b7f1f 100644
--- a/ets2panda/util/ast-builders/decoratorBuilder.h
+++ b/ets2panda/util/ast-builders/decoratorBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_DECORATOR_BUILDER
 
 #include "ir/base/decorator.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/directEvalExpressionBuilder.h b/ets2panda/util/ast-builders/directEvalExpressionBuilder.h
index 9a62bb515d50aa2b47da1151173ad566ec9b0bcf..3300b6f1a3c83e23d8d71261c60bf3e23f079090 100644
--- a/ets2panda/util/ast-builders/directEvalExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/directEvalExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_DIRECT_EVAL_EXPRESSION_BUILDER
 
 #include "ir/expressions/directEvalExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/doWhileStatementBuilder.h b/ets2panda/util/ast-builders/doWhileStatementBuilder.h
index 19af2656cdb69d59c4e3747c8df0ce0019b521c3..10ddf7d2b3735013bf03e5cfa1052f3159ab36ae 100644
--- a/ets2panda/util/ast-builders/doWhileStatementBuilder.h
+++ b/ets2panda/util/ast-builders/doWhileStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_DO_WHILE_STATEMENT_BUILDER
 
 #include "ir/statements/doWhileStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/emptyStatementBuilder.h b/ets2panda/util/ast-builders/emptyStatementBuilder.h
index 769669cce762814e9ff9e9dc1c3663f8e41b5082..29f4881b1c5532fcd7f0e658daf8fc4e89e2d263 100644
--- a/ets2panda/util/ast-builders/emptyStatementBuilder.h
+++ b/ets2panda/util/ast-builders/emptyStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_EMPTY_STATEMENT_BUILDER
 
 #include "ir/statements/emptyStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsClassLiteralBuilder.h b/ets2panda/util/ast-builders/etsClassLiteralBuilder.h
index 79bd94b88efd5b0b16d6772322facd25462796d1..049083972a47dca0c49d8e0408f458948864e448 100644
--- a/ets2panda/util/ast-builders/etsClassLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/etsClassLiteralBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_CLASS_LITERAL_BUILDER
 
 #include "ir/ets/etsClassLiteral.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsFunctionTypeBuilder.h b/ets2panda/util/ast-builders/etsFunctionTypeBuilder.h
index bebd8ba0a1384bb04436e3753993cc8c100df844..beb837cff24f4adc74e8273c8e98054837a31363 100644
--- a/ets2panda/util/ast-builders/etsFunctionTypeBuilder.h
+++ b/ets2panda/util/ast-builders/etsFunctionTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_FUNCTION_TYPE_BUILDER
 
 #include "ir/ets/etsFunctionType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsNewArrayInstanceExpressionBuilder.h b/ets2panda/util/ast-builders/etsNewArrayInstanceExpressionBuilder.h
index 49734c6374d3ee154758b4d5c62b208d8006214e..e30481ba263a11e5bb624cb01b66b8d3d3f3f877 100644
--- a/ets2panda/util/ast-builders/etsNewArrayInstanceExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/etsNewArrayInstanceExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_NEW_ARRAY_INSTANCE_EXPRESSION_BUILDER
 
 #include "ir/ets/etsNewArrayInstanceExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsNewClassInstanceExpressionBuilder.h b/ets2panda/util/ast-builders/etsNewClassInstanceExpressionBuilder.h
index 523b754e88366b6a1a55ad2eff6a1e998a63980b..61a7169d0c6f881bf434281767e28e569ef144f8 100644
--- a/ets2panda/util/ast-builders/etsNewClassInstanceExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/etsNewClassInstanceExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_NEW_CLASS_INSTANCE_EXPRESSION_BUILDER
 
 #include "ir/ets/etsNewClassInstanceExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsNewMultiDivArrayInstanceExpressionBuilder.h b/ets2panda/util/ast-builders/etsNewMultiDivArrayInstanceExpressionBuilder.h
index 77e3bd51710b08b70d64a096c204119df35a0f74..fd6479ce5c8e5bc44f82ae5881b1314e336c50e6 100644
--- a/ets2panda/util/ast-builders/etsNewMultiDivArrayInstanceExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/etsNewMultiDivArrayInstanceExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_NEW_MULTI_DIV_ARRAY_INSTANCE_EXPRESSION_BUILDER
 
 #include "ir/ets/etsNewMultiDimArrayInstanceExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsNullTypeBuilder.h b/ets2panda/util/ast-builders/etsNullTypeBuilder.h
index 2beb7de8e1ad5cbf5e3f6388f7df7575443e20a1..ebe26f3115b65dabf2fac48e3662ad5ea27716ca 100644
--- a/ets2panda/util/ast-builders/etsNullTypeBuilder.h
+++ b/ets2panda/util/ast-builders/etsNullTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_NULL_TYPE_BUILDER
 
 #include "ir/ets/etsNullishTypes.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsPackageDeclarationBuilder.h b/ets2panda/util/ast-builders/etsPackageDeclarationBuilder.h
index b80f6b7bc28595585c12639b2344409526f3b835..397e82afe6e3b78269477a70d2662dd953b91f42 100644
--- a/ets2panda/util/ast-builders/etsPackageDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/etsPackageDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_PACKAGE_DECLARATION_BUILDER
 
 #include "ir/ets/etsPackageDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsParameterExpressionBuilder.h b/ets2panda/util/ast-builders/etsParameterExpressionBuilder.h
index 4a5de5fce2372f60c57d5855c4f7dfb100aaed5b..0a217d9b997ced083fb8e2ec9e3ed9adb27ca790 100644
--- a/ets2panda/util/ast-builders/etsParameterExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/etsParameterExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_PARAMETER_EXPRESSION_BUILDER
 
 #include "ir/ets/etsParameterExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h b/ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h
index e7b902d462891f737c70add85625abc728ccd6d3..cda0024f05262c7c49e4d40562b7e96b5cde6bd4 100644
--- a/ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h
+++ b/ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_PRIMITIVE_TYPE_BUILDER
 
 #include "ir/ets/etsPrimitiveType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsReExportDeclarationBuilder.h b/ets2panda/util/ast-builders/etsReExportDeclarationBuilder.h
index 82f4fd380f3a6ecc98207b4eae1cf82287231da8..d2a2d51d834a661441e194030db0bcf2a43a8535 100644
--- a/ets2panda/util/ast-builders/etsReExportDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/etsReExportDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_RE_EXPORT_DECLARATION_BUILDER
 
 #include "ir/ets/etsReExportDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsStructDeclarationBuilder.h b/ets2panda/util/ast-builders/etsStructDeclarationBuilder.h
index e104a4603cb8d168951c226d6c24b4b2ad91f47e..496eaa95e26e7a3e3ef7249ec77f3bd65469dccd 100644
--- a/ets2panda/util/ast-builders/etsStructDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/etsStructDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_STRUCT_DECLARATION_BUILDER
 
 #include "ir/ets/etsStructDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsTupleBuilder.h b/ets2panda/util/ast-builders/etsTupleBuilder.h
index 043711183e2f231050726197ba0541bb99a5f988..071f4662c2498f16af67cda431e3717cfcb3b592 100644
--- a/ets2panda/util/ast-builders/etsTupleBuilder.h
+++ b/ets2panda/util/ast-builders/etsTupleBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_TUPLE_BUILDER
 
 #include "ir/ets/etsTuple.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsTypeReferenceBuilder.h b/ets2panda/util/ast-builders/etsTypeReferenceBuilder.h
index 643e73e753a7be4fdd9db67d317d3e698043f1a2..981f5923cac569d5074f79dd5c3fdf7aae47d2c9 100644
--- a/ets2panda/util/ast-builders/etsTypeReferenceBuilder.h
+++ b/ets2panda/util/ast-builders/etsTypeReferenceBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_TYPE_REFERENCE_BUILDER
 
 #include "ir/ets/etsTypeReference.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h b/ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h
index ae3d5470bcd9aa22cb085fb6bb4cbcfa52e57c1e..f05c401c1508e146060f73fc71e6e824ca5a0002 100644
--- a/ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h
+++ b/ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_TYPE_REFERENCE_PART_BUILDER
 
 #include "ir/ets/etsTypeReferencePart.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h b/ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h
index b265866d1bfe0fa2d3d81596eb2de34ac95a788a..d2e652b35c94e637e769b170461db70b47d848fd 100644
--- a/ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h
+++ b/ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_UNDEFINED_BUILDER
 
 #include "ir/ets/etsNullishTypes.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsUnionTypeBuilder.h b/ets2panda/util/ast-builders/etsUnionTypeBuilder.h
index 0ad352f06160b9ac5e9e4ddbbc676150279c04e7..c0ea976ae7250987155d24a4a748b42bc56aaeba 100644
--- a/ets2panda/util/ast-builders/etsUnionTypeBuilder.h
+++ b/ets2panda/util/ast-builders/etsUnionTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_UNION_TYPE_BUILDER
 
 #include "ir/ets/etsUnionType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/etsWildcardTypeBuilder.h b/ets2panda/util/ast-builders/etsWildcardTypeBuilder.h
index d53c53f01c72a949843792836ce833616422ef8f..f59d77ee6b78768ee1b224cf3ec066cfe055d2a4 100644
--- a/ets2panda/util/ast-builders/etsWildcardTypeBuilder.h
+++ b/ets2panda/util/ast-builders/etsWildcardTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_ETS_WILDCARD_TYPE_BUILDER
 
 #include "ir/ets/etsWildcardType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/exportAllDeclarationBuilder.h b/ets2panda/util/ast-builders/exportAllDeclarationBuilder.h
index 20cd5b17b426363dda5c7a0e0d7a1ecfa92f8e2a..4b6b11fce038d36abc65f09a34d33753e914539f 100644
--- a/ets2panda/util/ast-builders/exportAllDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/exportAllDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_EXPORT_ALL_DECLARATION_BUILDER
 
 #include "ir/module/exportAllDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/exportDefaultDeclarationBuilder.h b/ets2panda/util/ast-builders/exportDefaultDeclarationBuilder.h
index 30ab2b40a555299602a9d5666f6c43633c1def7b..8bed2b11a4aa792c1d6c11ec0f0e70c2595852f4 100644
--- a/ets2panda/util/ast-builders/exportDefaultDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/exportDefaultDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_EXPORT_DEFAULT_DECLARATION_BUILDER
 
 #include "ir/module/exportDefaultDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/exportNamedDeclarationBuilder.h b/ets2panda/util/ast-builders/exportNamedDeclarationBuilder.h
index c909bb3d635c0c2d2ab9f41a05be7432feb89891..6e8b74404da156000d20b589336fc3797fe73d16 100644
--- a/ets2panda/util/ast-builders/exportNamedDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/exportNamedDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_EXPORT_NAMED_DECLARATION_BUILDER
 
 #include "ir/module/exportNamedDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/exportSpecifierBuilder.h b/ets2panda/util/ast-builders/exportSpecifierBuilder.h
index b3487fb71ffc6e286650b5dcc25a198ea1e41ff1..d5eb5fd7fc8b20133be9625673e70fc5cb453114 100644
--- a/ets2panda/util/ast-builders/exportSpecifierBuilder.h
+++ b/ets2panda/util/ast-builders/exportSpecifierBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_EXPORT_SPECIFIER_BUILDER
 
 #include "ir/module/exportSpecifier.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/expressionStatementBuilder.h b/ets2panda/util/ast-builders/expressionStatementBuilder.h
index 4dcabc44f86b4e0c9c3b164a356ed01928d9c5b1..dd1cc57a7807240fbeaa9852cdd37d671b51e26d 100644
--- a/ets2panda/util/ast-builders/expressionStatementBuilder.h
+++ b/ets2panda/util/ast-builders/expressionStatementBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_EXPRESSION_STATEMENT_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_EXPRESSION_STATEMENT_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/statements/expressionStatement.h"
 
diff --git a/ets2panda/util/ast-builders/forInStatementBuilder.h b/ets2panda/util/ast-builders/forInStatementBuilder.h
index 9680930cd8eee5f3d268401597e859fb9aec662d..a50931ac0a7078ba8013052d3449baff0b52e2e3 100644
--- a/ets2panda/util/ast-builders/forInStatementBuilder.h
+++ b/ets2panda/util/ast-builders/forInStatementBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_FOR_IN_STATEMENT_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_FOR_IN_STATEMENT_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/statements/forInStatement.h"
 
diff --git a/ets2panda/util/ast-builders/forOfStatementBuilder.h b/ets2panda/util/ast-builders/forOfStatementBuilder.h
index ebd02020c614c427e802ded38f6d478f26a48dcc..9cf051c21878d37489c012c843c46e547110fbb5 100644
--- a/ets2panda/util/ast-builders/forOfStatementBuilder.h
+++ b/ets2panda/util/ast-builders/forOfStatementBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_FOR_OF_STATEMENT_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_FOR_OF_STATEMENT_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/statements/forOfStatement.h"
 
diff --git a/ets2panda/util/ast-builders/forUpdateStatementBuilder.h b/ets2panda/util/ast-builders/forUpdateStatementBuilder.h
index 5f93a01043705b9c2a9dfde32cbd5b0b85670342..ef44afcf219e1c2cc096f49ec3a970c79ff5688a 100644
--- a/ets2panda/util/ast-builders/forUpdateStatementBuilder.h
+++ b/ets2panda/util/ast-builders/forUpdateStatementBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_FOR_UPDATE_STATEMENT_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_FOR_UPDATE_STATEMENT_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/statements/forUpdateStatement.h"
 
diff --git a/ets2panda/util/ast-builders/functionDeclarationBuilder.h b/ets2panda/util/ast-builders/functionDeclarationBuilder.h
index 941dfaec8702bcd635bc127ff0e0a85a5b6b81be..1ad9beeaa06024f55e274e05487f6ab0e758bf09 100644
--- a/ets2panda/util/ast-builders/functionDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/functionDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_FUNCTION_DECLARATION_BUILDER
 
 #include "ir/statements/functionDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/functionExpressionBuilder.h b/ets2panda/util/ast-builders/functionExpressionBuilder.h
index 4730f2712577a512abd747009f559a30cd41b234..a19d442388f5a86ef026d5dfd849350fcc47f3a6 100644
--- a/ets2panda/util/ast-builders/functionExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/functionExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_FUNCTION_EXPRESSION_BUILDER
 
 #include "ir/expressions/functionExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/identifierBuilder.h b/ets2panda/util/ast-builders/identifierBuilder.h
index 6cac63d8e2ec7d1b49268662c256769445ffec23..419339651bae40e6fbe43c6f1f07140921eb1dc5 100644
--- a/ets2panda/util/ast-builders/identifierBuilder.h
+++ b/ets2panda/util/ast-builders/identifierBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_IDENTIFIER_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_IDENTIFIER_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/identifier.h"
 
diff --git a/ets2panda/util/ast-builders/ifStatementBuilder.h b/ets2panda/util/ast-builders/ifStatementBuilder.h
index 66936b18704a4719dd7a9ff55a8362f5f30deadc..b583e81913095e2d4ace63852474ca1691ecd416 100644
--- a/ets2panda/util/ast-builders/ifStatementBuilder.h
+++ b/ets2panda/util/ast-builders/ifStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_IF_STATEMENT_BUILDER
 
 #include "ir/statements/ifStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/importDeclarationBuilder.h b/ets2panda/util/ast-builders/importDeclarationBuilder.h
index 7dfe51e8c56d2fd0e49491afde43cae2e905a8bb..cd7fdd55e9f94c12a4608950b50c6854c6b51c5d 100644
--- a/ets2panda/util/ast-builders/importDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/importDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_IMPORT_DECLARATION_BUILDER
 
 #include "ir/module/importDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/importDefaultSpecifierBuilder.h b/ets2panda/util/ast-builders/importDefaultSpecifierBuilder.h
index 1788b824a61196b0b0c54f007bfd8ba93fabf7f6..2f9f3db34497863e53f7851c14f74525790c0bab 100644
--- a/ets2panda/util/ast-builders/importDefaultSpecifierBuilder.h
+++ b/ets2panda/util/ast-builders/importDefaultSpecifierBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_IMPORT_NAMESPACESPECIFIER_BUILDER
 
 #include "ir/module/importDefaultSpecifier.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/importExpressionBuilder.h b/ets2panda/util/ast-builders/importExpressionBuilder.h
index 2b99bfd5aeb6eed15a3e5453d87b50130561b670..3815d06ba37465a6235d4508af366a7bed782799 100644
--- a/ets2panda/util/ast-builders/importExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/importExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_IMPORT_EXPRESSION_BUILDER
 
 #include "ir/expressions/importExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/importNamespaceSpecifierBuilder.h b/ets2panda/util/ast-builders/importNamespaceSpecifierBuilder.h
index fc2cb687e47717b04551b1449b16bfdeb74283f7..8fafbbcc847b7d92536931a5e5de7247e8059cd7 100644
--- a/ets2panda/util/ast-builders/importNamespaceSpecifierBuilder.h
+++ b/ets2panda/util/ast-builders/importNamespaceSpecifierBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_IMPORT_NAMESPACE_SPECIFIER_BUILDER
 
 #include "ir/module/importNamespaceSpecifier.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/importSpecifierBuilder.h b/ets2panda/util/ast-builders/importSpecifierBuilder.h
index 1daf07d53fd10637def856b3095e72c9eae86811..f8b2ed62413033bef2eebb11968082096317b3db 100644
--- a/ets2panda/util/ast-builders/importSpecifierBuilder.h
+++ b/ets2panda/util/ast-builders/importSpecifierBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_IMPORT_SPECIFIER_BUILDER
 
 #include "ir/module/importSpecifier.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/labelledStatementBuilder.h b/ets2panda/util/ast-builders/labelledStatementBuilder.h
index e8f543bb13e4b951a1c5af5eff1ed1c4076f367f..faeebfa5f826bb3c18fed6d7199ef64bb60d6fe1 100644
--- a/ets2panda/util/ast-builders/labelledStatementBuilder.h
+++ b/ets2panda/util/ast-builders/labelledStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_LABELLED_STATEMENT_BUILDER
 
 #include "ir/statements/labelledStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/memberExpressionBuilder.h b/ets2panda/util/ast-builders/memberExpressionBuilder.h
index bf1d1632fd37fb8169293ca875f1f8998055ade0..ed35e90c66b6fe3ea672bfa3770923b8abfc1531 100644
--- a/ets2panda/util/ast-builders/memberExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/memberExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_MEMBER_EXPRESSION_BUILDER
 
 #include "ir/expressions/memberExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/metaPropertyBuilder.h b/ets2panda/util/ast-builders/metaPropertyBuilder.h
index 66f9dbbb6dda8f77e5851a233f26d3df124b304c..e19da46c1247542b28eb9dd89ec65dc8c78aa8e3 100644
--- a/ets2panda/util/ast-builders/metaPropertyBuilder.h
+++ b/ets2panda/util/ast-builders/metaPropertyBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_META_PROPERTY_BUILDER
 
 #include "ir/base/metaProperty.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/methodDefinitionBuilder.h b/ets2panda/util/ast-builders/methodDefinitionBuilder.h
index 4230b3af727fc27bf5a05b5456ea89980ef4bc6b..8bfbc4f04eacf5888e08967f9f6214a2175bc91b 100644
--- a/ets2panda/util/ast-builders/methodDefinitionBuilder.h
+++ b/ets2panda/util/ast-builders/methodDefinitionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_METHOD_DEFINITION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_METHOD_DEFINITION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/base/methodDefinition.h"
 
diff --git a/ets2panda/util/ast-builders/namedTypeBuilder.h b/ets2panda/util/ast-builders/namedTypeBuilder.h
index 0adbd807686261e6e3827fffbf1f82af5a909bd4..ce0908ae2385b9bdc616f62aac6d20f0204bb266 100644
--- a/ets2panda/util/ast-builders/namedTypeBuilder.h
+++ b/ets2panda/util/ast-builders/namedTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_NAMED_TYPE_BUILDER
 
 #include "ir/as/namedType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/newExpressionBuilder.h b/ets2panda/util/ast-builders/newExpressionBuilder.h
index 4f498f96d5d180e923b808f04e5ed4b2e4cfb5e6..a91c2de9f5cd312b761826c86c7f49f3ac07aaba 100644
--- a/ets2panda/util/ast-builders/newExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/newExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_NEW_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_NEW_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/newExpression.h"
 
diff --git a/ets2panda/util/ast-builders/nullLiteralBuilder.h b/ets2panda/util/ast-builders/nullLiteralBuilder.h
index dc558906d27185a51e126edadb5f01bdd5be813a..5e2e9b7690e18bb61796f61a631d19815962d59e 100644
--- a/ets2panda/util/ast-builders/nullLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/nullLiteralBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_NULL_LITERAL_BUILDER
 
 #include "ir/expressions/literals/nullLiteral.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/numberLiteralBuilder.h b/ets2panda/util/ast-builders/numberLiteralBuilder.h
index 5d1f73a104653fdb209c041ae7b74b8744445b30..b3254408be917c5c0ca3970f55b8a0b5d9dee385 100644
--- a/ets2panda/util/ast-builders/numberLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/numberLiteralBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_NUMBER_LITERAL_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_NUMBER_LITERAL_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/literals/numberLiteral.h"
 
diff --git a/ets2panda/util/ast-builders/omittedExpressionBuilder.h b/ets2panda/util/ast-builders/omittedExpressionBuilder.h
index afcfd8ddabbf539c2d07300531e46e7cd1bf3f76..34fc5cc72aed4e7ffa66c6227def550caf946e97 100644
--- a/ets2panda/util/ast-builders/omittedExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/omittedExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_OMITTED_EXPRESSION_BUILDER
 
 #include "ir/expressions/omittedExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h b/ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h
index b87bbcf5f9fb6c22c2d46cc199e1c855c511b2fa..dde7687244a4ea321a665806624bf4ccff34343d 100644
--- a/ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h
+++ b/ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_OPAQUE_TYPE_NODE_BUILDER
 
 #include "ir/opaqueTypeNode.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/prefixAssertionExpressionBuilder.h b/ets2panda/util/ast-builders/prefixAssertionExpressionBuilder.h
index 0d7b3088af00f44f342cf3d7e8486dc81db21f92..3df9fb7b6576b0e09c1068af3f9d03f47b825f3e 100644
--- a/ets2panda/util/ast-builders/prefixAssertionExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/prefixAssertionExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_PREFIX_ASSERTION_EXPRESSION_BUILDER
 
 #include "ir/as/prefixAssertionExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/propertyBuilder.h b/ets2panda/util/ast-builders/propertyBuilder.h
index 7286152dc65ba03ef0a4d6bd1832f5cc922f1dec..257e53b4f49b05f95ade4495b4009641da5a980a 100644
--- a/ets2panda/util/ast-builders/propertyBuilder.h
+++ b/ets2panda/util/ast-builders/propertyBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_PROPERTY_BUILDER
 
 #include "ir/base/property.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/regExpLiteralBuilder.h b/ets2panda/util/ast-builders/regExpLiteralBuilder.h
index b8acaa1d86088f1d0ddf496b45b3038e790ec4c6..6737b852f364d5c3eca1da6200207449d37f51d4 100644
--- a/ets2panda/util/ast-builders/regExpLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/regExpLiteralBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_REG_EXP_LITERAL_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_REG_EXP_LITERAL_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/literals/regExpLiteral.h"
 
diff --git a/ets2panda/util/ast-builders/returnStatementBuilder.h b/ets2panda/util/ast-builders/returnStatementBuilder.h
index bbb805736ff335c1e822cb8661ce35c414920b04..0cc66fb1979f803d311ece6b90e905d930e23cbb 100644
--- a/ets2panda/util/ast-builders/returnStatementBuilder.h
+++ b/ets2panda/util/ast-builders/returnStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_RETURN_STATEMENT_BUILDER
 
 #include "ir/statements/returnStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/scriptFunctionBuilder.h b/ets2panda/util/ast-builders/scriptFunctionBuilder.h
index 20beaf4914ab099fe8ce791a34485ed63a3b1154..5278c8b6458cfcb3359c841c9ed770991c0412ae 100644
--- a/ets2panda/util/ast-builders/scriptFunctionBuilder.h
+++ b/ets2panda/util/ast-builders/scriptFunctionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_SCRIPT_FUNCTION_BUILDER
 
 #include "ir/base/scriptFunction.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/sequenceExpressionBuilder.h b/ets2panda/util/ast-builders/sequenceExpressionBuilder.h
index 58a6170b5fd6c2b0b33ade4eb7755e8be65cf567..a66c15fa93ad9be13c0829044c323b590bde432d 100644
--- a/ets2panda/util/ast-builders/sequenceExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/sequenceExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_SEQUENCE_EXPRESSION_BUILDER
 
 #include "ir/expressions/sequenceExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/stringLiteralBuilder.h b/ets2panda/util/ast-builders/stringLiteralBuilder.h
index 0c01b52be1b0343a642749e318acc7d4f76b948a..6a8beecb58b7e4bcc203de6523fcbd8419bac199 100644
--- a/ets2panda/util/ast-builders/stringLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/stringLiteralBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_STRING_LITERAL_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_STRING_LITERAL_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/literals/stringLiteral.h"
 
diff --git a/ets2panda/util/ast-builders/superExpressionBuilder.h b/ets2panda/util/ast-builders/superExpressionBuilder.h
index 22ec4f1a373c2c0be55f4e9a65135ed8d6f4346e..2db814842f66e195b2418e4379ce6100003ff15d 100644
--- a/ets2panda/util/ast-builders/superExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/superExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_SUPER_EXPRESSION_BUILDER
 
 #include "ir/expressions/superExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/switchCaseStatementBuilder.h b/ets2panda/util/ast-builders/switchCaseStatementBuilder.h
index b378b05879616860b2505e158ba3c9df5a7724b1..2e848fb3150facf9890058e565439721244d8a7a 100644
--- a/ets2panda/util/ast-builders/switchCaseStatementBuilder.h
+++ b/ets2panda/util/ast-builders/switchCaseStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_SWITCH_CASE_STATEMENT_BUILDER
 
 #include "ir/statements/switchCaseStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/switchStatementBuilder.h b/ets2panda/util/ast-builders/switchStatementBuilder.h
index f8abdf7b87d7180e515fb81720c7923363cd30eb..bda681f9d406d54d988a092abb10f546b036e33e 100644
--- a/ets2panda/util/ast-builders/switchStatementBuilder.h
+++ b/ets2panda/util/ast-builders/switchStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_SWITCH_STATEMENT_BUILDER
 
 #include "ir/statements/switchStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/taggedTemplateExpressionBuilder.h b/ets2panda/util/ast-builders/taggedTemplateExpressionBuilder.h
index 6a9d189edcf2241f544a0a410ea04641278b7e56..d2a083c740f921d25e1672ad1229b8766c9a9806 100644
--- a/ets2panda/util/ast-builders/taggedTemplateExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/taggedTemplateExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TAGGED_TEMPLATE_EXPRESSION_BUILDER
 
 #include "ir/expressions/taggedTemplateExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/templateElementBuilder.h b/ets2panda/util/ast-builders/templateElementBuilder.h
index 041a032b18db4bf7714c7caf760e87624f65fdcb..ad0ef8204bb84136cf6ed41402fadf0433b1178a 100644
--- a/ets2panda/util/ast-builders/templateElementBuilder.h
+++ b/ets2panda/util/ast-builders/templateElementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TEMPLATE_ELEMENT_BUILDER
 
 #include "ir/base/templateElement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/templateLiteralBuilder.h b/ets2panda/util/ast-builders/templateLiteralBuilder.h
index d37b9d1ea6ebef697381a3aab373d1d9d901c6fe..85b05db53763ee659a05710785149ebbfa53c969 100644
--- a/ets2panda/util/ast-builders/templateLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/templateLiteralBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TEMPLATE_LITERAL_BUILDER
 
 #include "ir/expressions/templateLiteral.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/thisExpressionBuilder.h b/ets2panda/util/ast-builders/thisExpressionBuilder.h
index fb8e597e0ab0d0dbb1a21c84bb0d83e09be96daa..7a685f6bec6dea15aabc56d6e61e4eb780ac7f2d 100644
--- a/ets2panda/util/ast-builders/thisExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/thisExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_THIS_EXPRESSION_BUILDER
 
 #include "ir/expressions/thisExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/throwStatementBuilder.h b/ets2panda/util/ast-builders/throwStatementBuilder.h
index 6346d3e19275adac1d933400d5a15bb82f8f009c..8a9dad88cb2cbce5c83004ab186f64b3a60e4e14 100644
--- a/ets2panda/util/ast-builders/throwStatementBuilder.h
+++ b/ets2panda/util/ast-builders/throwStatementBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_THROW_STATEMENT_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_THROW_STATEMENT_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/statements/throwStatement.h"
 
diff --git a/ets2panda/util/ast-builders/tryStatementBuilder.h b/ets2panda/util/ast-builders/tryStatementBuilder.h
index f0cdf897c8f1e49d2b6f35a65aafae98fbd3ea51..15c0477d1a087667125f8d84917cc8d991d5fe49 100644
--- a/ets2panda/util/ast-builders/tryStatementBuilder.h
+++ b/ets2panda/util/ast-builders/tryStatementBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_TRY_STATEMENT_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_TRY_STATEMENT_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/statements/tryStatement.h"
 
diff --git a/ets2panda/util/ast-builders/tsAnyKeywordBuilder.h b/ets2panda/util/ast-builders/tsAnyKeywordBuilder.h
index d3318f753b8c717b8f283da9904418b821371f48..33c272a327087967271136c76dfe4e4aa7cc9747 100644
--- a/ets2panda/util/ast-builders/tsAnyKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsAnyKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_ANY_KEYWORD_BUILDER
 
 #include "ir/ts/tsAnyKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsArrayTypeBuilder.h b/ets2panda/util/ast-builders/tsArrayTypeBuilder.h
index f2d2d395b8574e05f4c474d8835eec32bb099928..1cb629f744813da02e681022958ef264bedc0f11 100644
--- a/ets2panda/util/ast-builders/tsArrayTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsArrayTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_ARRAY_TYPE_BUILDER
 
 #include "ir/ts/tsArrayType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsAsExpressionBuilder.h b/ets2panda/util/ast-builders/tsAsExpressionBuilder.h
index 38551c5f780a16e862b4dccc8a218960f3865e93..9b536eb66bd6d97fdef3439602e4f85e2eb71275 100644
--- a/ets2panda/util/ast-builders/tsAsExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/tsAsExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_AS_EXPRESSION_BUILDER
 
 #include "ir/ts/tsAsExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsBigintKeywordBuilder.h b/ets2panda/util/ast-builders/tsBigintKeywordBuilder.h
index 2f8764e6598a68b6f5f95354f82883ae2116d9a0..fbfadf5a13662671568bd74a0d2cf574974b4ecd 100644
--- a/ets2panda/util/ast-builders/tsBigintKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsBigintKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_BIGINT_KEYWORD_BUILDER
 
 #include "ir/ts/tsBigintKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h b/ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h
index dc765ba079d61b3a560e46c9e586876bf4db1dda..e31f79bd879d6954a24cd1d59b9c7a63bc0c798b 100644
--- a/ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_BOOLEAN_KEYWORD_BUILDER
 
 #include "ir/ts/tsBooleanKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsClassImplementsBuilder.h b/ets2panda/util/ast-builders/tsClassImplementsBuilder.h
index 43a76eb79e175a1ee0e171df4ea40fc08c87793d..659a8eb97259da4d7e72a7c3205e72b2eacf28af 100644
--- a/ets2panda/util/ast-builders/tsClassImplementsBuilder.h
+++ b/ets2panda/util/ast-builders/tsClassImplementsBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_CLASS_IMPLEMENTS_BUILDER
 
 #include "ir/ts/tsClassImplements.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsConditionalTypeBuilder.h b/ets2panda/util/ast-builders/tsConditionalTypeBuilder.h
index f0f4027575d44b4085ecd73e8c1dcd814b52de4e..f486565ed8b29ad4a9969159a325e87c6d3c0404 100644
--- a/ets2panda/util/ast-builders/tsConditionalTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsConditionalTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_CONDITIONAL_TYPE_BUILDER
 
 #include "ir/ts/tsConditionalType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h b/ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h
index bd123fffb23b6ad2126233d83aa58788d252102f..46db127676160a5a0bb80114ad0ec85e0305f87b 100644
--- a/ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_ENUM_DECLARATION_BUILDER
 
 #include "ir/ts/tsEnumDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsEnumMemberBuilder.h b/ets2panda/util/ast-builders/tsEnumMemberBuilder.h
index 987456a14c98aa2441b635d1deb7d476400f466e..8d2afba026731e19921e6034c937090417e64e39 100644
--- a/ets2panda/util/ast-builders/tsEnumMemberBuilder.h
+++ b/ets2panda/util/ast-builders/tsEnumMemberBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_ENUM_MEMBER_BUILDER
 
 #include "ir/ts/tsEnumMember.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsFunctionTypeBuilder.h b/ets2panda/util/ast-builders/tsFunctionTypeBuilder.h
index d310aa8f318b538d2f95d7f5142ee62b123272f1..bebe952ad064c3159620e94f9e791816ea82d53e 100644
--- a/ets2panda/util/ast-builders/tsFunctionTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsFunctionTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_FUNCTION_TYPE_BUILDER
 
 #include "ir/ts/tsFunctionType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsImportEqualsDeclarationBuilder.h b/ets2panda/util/ast-builders/tsImportEqualsDeclarationBuilder.h
index 2f897bf2fe45ff2ea3b081d714b6cbb1655a71ab..5ef785de91fae1c1a040d88009a79ef65db7b2c6 100644
--- a/ets2panda/util/ast-builders/tsImportEqualsDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/tsImportEqualsDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_IMPORT_EQUALS_DECLARATION_BUILDER
 
 #include "ir/ts/tsImportEqualsDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsImportTypeBuilder.h b/ets2panda/util/ast-builders/tsImportTypeBuilder.h
index 474ef5e7c194ba59d29d74127305877fbdde1480..41397a01bbe5abd21127382aeb7cdeffb5e13ba7 100644
--- a/ets2panda/util/ast-builders/tsImportTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsImportTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_IMPORT_TYPE_BUILDER
 
 #include "ir/ts/tsImportType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsIndexSignatureBuilder.h b/ets2panda/util/ast-builders/tsIndexSignatureBuilder.h
index fd639e168eefefcaef4a891e20d223debfdcbaf3..ac0f50f22f813fe8df804885a6045750eb90fb58 100644
--- a/ets2panda/util/ast-builders/tsIndexSignatureBuilder.h
+++ b/ets2panda/util/ast-builders/tsIndexSignatureBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_INDEX_SIGNATURE_BUILDER
 
 #include "ir/base/tsIndexSignature.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h b/ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h
index 1df78d5cf4ae275e9f6eef4f1edcc260a0086a2e..a39c88bdc54196b52a345641d924621ec6fb7f5d 100644
--- a/ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_INDEXED_ACCESS_TYPE_BUILDER
 
 #include "ir/ts/tsIndexedAccessType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsInferTypeBuilder.h b/ets2panda/util/ast-builders/tsInferTypeBuilder.h
index 30d4d82c38f0422f962c5b49120958dc7a4f8e75..6fd9b18b83f14242e6ce2cf47fd69b12ba15eecc 100644
--- a/ets2panda/util/ast-builders/tsInferTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsInferTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_INFER_TYPE_BUILDER
 
 #include "ir/ts/tsInferType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h b/ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h
index ce62eb960a99e0064c865c9546dc34ee9c13ce6c..cdfdfdd89620636e809405e58faaaaf82a07e62b 100644
--- a/ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h
+++ b/ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_INTERFACE_BODY_BUILDER
 
 #include "ir/ts/tsInterfaceBody.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h b/ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h
index dde77435443983b225bd4232be8edae881ab7cb0..a444caa0866047d7ac4d35a6f1abce46d75e607a 100644
--- a/ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h
+++ b/ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_INTERFACE_HERITAGE_BUILDER
 
 #include "ir/ts/tsInterfaceHeritage.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h b/ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h
index 30f119ea56df9124d6884bc08c50b1260f344a7d..34d510df1f288af9f7204fb8279ad389ba8e2f82 100644
--- a/ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_INTERSECTION_TYPE_BUILDER
 
 #include "ir/ts/tsIntersectionType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsLiteralTypeBuilder.h b/ets2panda/util/ast-builders/tsLiteralTypeBuilder.h
index 1a6ed0153d216081e1fc0805ae7ea7cc86141cb6..417cab5f0d50b1ff7ba6f368b4e686e0e0386a29 100644
--- a/ets2panda/util/ast-builders/tsLiteralTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsLiteralTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_LITERAL_TYPE_BUILDER
 
 #include "ir/ts/tsLiteralType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsMappedTypeBuilder.h b/ets2panda/util/ast-builders/tsMappedTypeBuilder.h
index 2dc1f7e794bb38dda6470282d4a4241021629527..229b2f15d52423d2efd96ca1763cc33ff81c512d 100644
--- a/ets2panda/util/ast-builders/tsMappedTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsMappedTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_MAPPED_TYPE_BUILDER
 
 #include "ir/ts/tsMappedType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsMethodSignatureBuilder.h b/ets2panda/util/ast-builders/tsMethodSignatureBuilder.h
index 2c5dac9090094319ccbcd131c8d8567ed98c2043..e278a30db219bcda8ff6283443542cd88a0582a1 100644
--- a/ets2panda/util/ast-builders/tsMethodSignatureBuilder.h
+++ b/ets2panda/util/ast-builders/tsMethodSignatureBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_METHOD_SIGNATURE_BUILDER
 
 #include "ir/base/tsMethodSignature.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsModuleBlockBuilder.h b/ets2panda/util/ast-builders/tsModuleBlockBuilder.h
index b55abe5c87a46b4dd8d0e1b0e7f350736398007b..ce3388f9c60a1bff65b8297ec611bd162bd80f6a 100644
--- a/ets2panda/util/ast-builders/tsModuleBlockBuilder.h
+++ b/ets2panda/util/ast-builders/tsModuleBlockBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_MODULE_BLOCK_BUILDER
 
 #include "ir/ts/tsModuleBlock.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h b/ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h
index 39df8ce948b8dc30eab1c30039d5f9b50e64a298..3cdb4fa24e26fe25964bb7c0eaa21675a4a52ffa 100644
--- a/ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_MODULE_DECLARATION_BUILDER
 
 #include "ir/ts/tsModuleDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h b/ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h
index f0a962000b0d648e6d455be077ddc62ae7e62279..de20796c2fc406cc6a92e2ad51aed092a7552f93 100644
--- a/ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h
+++ b/ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_NAMED_TUPLE_MEMBER_BUILDER
 
 #include "ir/ts/tsNamedTupleMember.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsNeverKeywordBuilder.h b/ets2panda/util/ast-builders/tsNeverKeywordBuilder.h
index fbf8dc36d24be563ca0a9572078b22cdab5bbefb..00047cfd6308080a20012dc8c99ebede68d5fb5b 100644
--- a/ets2panda/util/ast-builders/tsNeverKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsNeverKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_NEVER_KEYWORD_BUILDER
 
 #include "ir/ts/tsNeverKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h b/ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h
index 2696c2f6a2a34d36fbf94ad78bd310fab274c7a2..e49938cf19098f922dfb5fe622e375c790289ce4 100644
--- a/ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_NON_NULL_EXPRESSION_BUILDER
 
 #include "ir/ts/tsNonNullExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsNullKeywordBuilder.h b/ets2panda/util/ast-builders/tsNullKeywordBuilder.h
index 75682522b73c2aff8bd85ae245d870e044304b55..ef47621c6d4512802acf9e822af4434f4f54abfc 100644
--- a/ets2panda/util/ast-builders/tsNullKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsNullKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_NULL_KEYWORD_BUILDER
 
 #include "ir/ts/tsNullKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsNumberKeywordBuilder.h b/ets2panda/util/ast-builders/tsNumberKeywordBuilder.h
index b3b5afe74d7a1d07377140c1d00d61a0519d3b1f..1c91eafbf82cc44983aed335c9bbe299602d73a9 100644
--- a/ets2panda/util/ast-builders/tsNumberKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsNumberKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_NUMBER_KEYWORD_BUILDER
 
 #include "ir/ts/tsNumberKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsObjectKeywordBuilder.h b/ets2panda/util/ast-builders/tsObjectKeywordBuilder.h
index d77b36a7ceef8d4ec35561981ebf92aecf1c2cc0..561d9b0674f65e70571cd23f0b88e6fba5c3b059 100644
--- a/ets2panda/util/ast-builders/tsObjectKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsObjectKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_OBJECT_KEYWORD_BUILDER
 
 #include "ir/ts/tsObjectKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h b/ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h
index bce9a97a483cd93a45678ab351260a8cf40b1621..e7903340ee797ebd3512d1e59b7e8e22744b9b2a 100644
--- a/ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_PARENTHESIZED_TYPE_BUILDER
 
 #include "ir/ts/tsParenthesizedType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsPropertySignatureBuilder.h b/ets2panda/util/ast-builders/tsPropertySignatureBuilder.h
index 85a510763ce74b3d98165b84682e932fe29c2de8..fef0e2653afdd2bdbfa35f835409669e7c1a3e96 100644
--- a/ets2panda/util/ast-builders/tsPropertySignatureBuilder.h
+++ b/ets2panda/util/ast-builders/tsPropertySignatureBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_PROPERTY_SIGNATURE_BUILDER
 
 #include "ir/base/tsPropertySignature.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsSignatureDeclarationBuilder.h b/ets2panda/util/ast-builders/tsSignatureDeclarationBuilder.h
index 5b001b79093cc05867a6d1d2dc8081d2110d4bdb..ec67ccdfb6c15896594ad5ea00e2ccfe48ea15a7 100644
--- a/ets2panda/util/ast-builders/tsSignatureDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/tsSignatureDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_SIGNATURE_DECLARATION_BUILDER
 
 #include "ir/base/tsSignatureDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsStringKeywordBuilder.h b/ets2panda/util/ast-builders/tsStringKeywordBuilder.h
index 97c55b3dd07c13069a567dcdbb93a61a93a8bccc..79fe36c6b6e085ab8b7cea4ae8ac38ed4c13f7d5 100644
--- a/ets2panda/util/ast-builders/tsStringKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsStringKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_STRING_KEYWORD_BUILDER
 
 #include "ir/ts/tsStringKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsThisTypeBuilder.h b/ets2panda/util/ast-builders/tsThisTypeBuilder.h
index c422530e1a1de559f413377d8ea1d389f172dec5..cbb25695dca7c85be4b53a41c102b17a6911eabf 100644
--- a/ets2panda/util/ast-builders/tsThisTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsThisTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_THIS_TYPE_BUILDER
 
 #include "ir/ts/tsThisType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTupleTypeBuilder.h b/ets2panda/util/ast-builders/tsTupleTypeBuilder.h
index 1c5d79f48a365d7dfad69bcaa9e2712f758f7e8d..293db0db917c160e5e3f16b332fddd3055e35920 100644
--- a/ets2panda/util/ast-builders/tsTupleTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsTupleTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TUPLE_TYPE_BUILDER
 
 #include "ir/ts/tsTupleType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeAliasDeclarationBuilder.h b/ets2panda/util/ast-builders/tsTypeAliasDeclarationBuilder.h
index 0e5ac9d4105a6542b038a38c8139ab94a305dfff..3a76e5c86336b1a602af2527272651e680b5dbf0 100644
--- a/ets2panda/util/ast-builders/tsTypeAliasDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeAliasDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_ALIAS_DECLARATION_BUILDER
 
 #include "ir/ts/tsTypeAliasDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeAssertionBuilder.h b/ets2panda/util/ast-builders/tsTypeAssertionBuilder.h
index b669a1b45bf4a90f175b06c5ddd233eaa3500700..eb45d4281251e22cc2102b575073bc166c46d521 100644
--- a/ets2panda/util/ast-builders/tsTypeAssertionBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeAssertionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_ASSERTION_BUILDER
 
 #include "ir/ts/tsTypeAssertion.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeLiteralBuilder.h b/ets2panda/util/ast-builders/tsTypeLiteralBuilder.h
index b757adb9e6880bab9ad4703f55fc039c6c08a1a6..57be8d3ca92d1e78df0dc881d91635e26f7087cb 100644
--- a/ets2panda/util/ast-builders/tsTypeLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeLiteralBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_LITERAL_BUILDER
 
 #include "ir/ts/tsTypeLiteral.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeOperatorBuilder.h b/ets2panda/util/ast-builders/tsTypeOperatorBuilder.h
index d7686e9a0a8c30c04992094bdedb76b716b5df5b..e3db2da1840498388a162ef02ead3a43105d7d10 100644
--- a/ets2panda/util/ast-builders/tsTypeOperatorBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeOperatorBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_OPERATOR_BUILDER
 
 #include "ir/ts/tsTypeOperator.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeParameterBuilder.h b/ets2panda/util/ast-builders/tsTypeParameterBuilder.h
index 725d278c6b5d0225be9512c511a646e1856ed67f..4df6458635b3b3bc9d488d66700ad55760af1ec8 100644
--- a/ets2panda/util/ast-builders/tsTypeParameterBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeParameterBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_PARAMETER_BUILDER
 
 #include "ir/ts/tsTypeParameter.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeParameterDeclarationBuilder.h b/ets2panda/util/ast-builders/tsTypeParameterDeclarationBuilder.h
index dbceb6e6de4945064dd30dd7f61c6353068a688c..f46f210e30a0238c8b3d97076ca02c75304bdec8 100644
--- a/ets2panda/util/ast-builders/tsTypeParameterDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeParameterDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_PARAMETER_DECLARATION_BUILDER
 
 #include "ir/ts/tsTypeParameterDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeParameterInstantiationBuilder.h b/ets2panda/util/ast-builders/tsTypeParameterInstantiationBuilder.h
index 64e15871fba3a6cdf7c1008be316c8789bb1ba56..46ebbda740e23f3fce99cf395713812c0975d8e2 100644
--- a/ets2panda/util/ast-builders/tsTypeParameterInstantiationBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeParameterInstantiationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_PARAMETER_INSTANTIATION_BUILDER
 
 #include "ir/ts/tsTypeParameterInstantiation.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypePredicateBuilder.h b/ets2panda/util/ast-builders/tsTypePredicateBuilder.h
index 876ac7541dd753f245c2d6507a774f50f5184fc2..e829bb69c0bce90d59ba06cca8271c894abaf92e 100644
--- a/ets2panda/util/ast-builders/tsTypePredicateBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypePredicateBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_PREDICATE_BUILDER
 
 #include "ir/ts/tsTypePredicate.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeQueryBuilder.h b/ets2panda/util/ast-builders/tsTypeQueryBuilder.h
index 87976be6f3c1f904ac72617a7c5dcfe7fe8288cc..ed129ea5caa99560c030f3938e5fa4150e8bf25a 100644
--- a/ets2panda/util/ast-builders/tsTypeQueryBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeQueryBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_QUERY_BUILDER
 
 #include "ir/ts/tsTypeQuery.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsTypeReferenceBuilder.h b/ets2panda/util/ast-builders/tsTypeReferenceBuilder.h
index 9d76d0dd4afa39f3233cdab6fa6760e5e0b2c866..c758d922328a5ce64c6a554566be1c48c8e7a7b2 100644
--- a/ets2panda/util/ast-builders/tsTypeReferenceBuilder.h
+++ b/ets2panda/util/ast-builders/tsTypeReferenceBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_REFERENCE_BUILDER
 
 #include "ir/ts/tsTypeReference.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h b/ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h
index 580f9642af4a2bd9d69adaae7128a33b2311a15e..9bdf60f9227b5996ed6b8d071de3fef382911bc6 100644
--- a/ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_UNDEFINED_KEYWORD_BUILDER
 
 #include "ir/ts/tsUndefinedKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsUnionTypeBuilder.h b/ets2panda/util/ast-builders/tsUnionTypeBuilder.h
index 0160893594da508258f836aaf23a597779d1bf4f..ee9c4e333479758170d39cb90e16ac9c9e8a0d63 100644
--- a/ets2panda/util/ast-builders/tsUnionTypeBuilder.h
+++ b/ets2panda/util/ast-builders/tsUnionTypeBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_UNION_TYPE_BUILDER
 
 #include "ir/ts/tsUnionType.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h b/ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h
index df1d97fe8a28a6e526af077ac1b265f8a77234a1..b0c6b0cbecae4660c8de316770bb794a94986e06 100644
--- a/ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_UNKNOWN_KEYWORD_BUILDER
 
 #include "ir/ts/tsUnknownKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/tsVoidKeywordBuilder.h b/ets2panda/util/ast-builders/tsVoidKeywordBuilder.h
index e69a4605526b3f3de1257bced0702438f9df57a9..10e7f88553773c85d49722d7f792e8d9dff1d454 100644
--- a/ets2panda/util/ast-builders/tsVoidKeywordBuilder.h
+++ b/ets2panda/util/ast-builders/tsVoidKeywordBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_TS_VOID_KEYWORD_BUILDER
 
 #include "ir/ts/tsVoidKeyword.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/typeofExpressionBuilder.h b/ets2panda/util/ast-builders/typeofExpressionBuilder.h
index d0d4f74ed3b57140b72e6ec9b5c13b5cf3090db8..5deff706b9632d8e9c4f484a257db7b845e22824 100644
--- a/ets2panda/util/ast-builders/typeofExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/typeofExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_TYPEOF_EXPRESSION_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_TYPEOF_EXPRESSION_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/typeofExpression.h"
 
diff --git a/ets2panda/util/ast-builders/unaryExpressionBuilder.h b/ets2panda/util/ast-builders/unaryExpressionBuilder.h
index f9608a05cc66a723317cfabfebedb845c320e51a..561022b754db247840a4770a93f9a545c3208476 100644
--- a/ets2panda/util/ast-builders/unaryExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/unaryExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_UNARY_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_UNARY_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/unaryExpression.h"
 
diff --git a/ets2panda/util/ast-builders/undefinedLiteralBuilder.h b/ets2panda/util/ast-builders/undefinedLiteralBuilder.h
index be0cd204ee406fd72a193620c1fcb54cfb85e025..9dc04eff4480fb2be2c295e4b79c05cc6e279839 100644
--- a/ets2panda/util/ast-builders/undefinedLiteralBuilder.h
+++ b/ets2panda/util/ast-builders/undefinedLiteralBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_UNDEFINED_LITERAL_BUILDER
 
 #include "ir/expressions/literals/undefinedLiteral.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/updateExpressionBuilder.h b/ets2panda/util/ast-builders/updateExpressionBuilder.h
index 12acd83f44897f7dc647eed336a9cf00ea407da8..59e126d927d2f854be090fc89a1e5491da0a62b7 100644
--- a/ets2panda/util/ast-builders/updateExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/updateExpressionBuilder.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_INCLUDE_UPDATE_EXPRESSION_BUILDER
 #define ES2PANDA_UTIL_INCLUDE_UPDATE_EXPRESSION_BUILDER
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 #include "ir/expressions/updateExpression.h"
 
diff --git a/ets2panda/util/ast-builders/variableDeclarationBuilder.h b/ets2panda/util/ast-builders/variableDeclarationBuilder.h
index 269d4f78394a0b6aeddcaf65bd11af908f9a6811..3a051e115a5addc7f4876814c7800a89433d227a 100644
--- a/ets2panda/util/ast-builders/variableDeclarationBuilder.h
+++ b/ets2panda/util/ast-builders/variableDeclarationBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_VARIABLE_DECLARATION_BUILDER
 
 #include "ir/statements/variableDeclaration.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/variableDeclaratorBuilder.h b/ets2panda/util/ast-builders/variableDeclaratorBuilder.h
index 2319e1a066849bc9443a7ddec2423aac483f7b58..4b10393b0adfd54b3b2888ee8e0c56b6f7977350 100644
--- a/ets2panda/util/ast-builders/variableDeclaratorBuilder.h
+++ b/ets2panda/util/ast-builders/variableDeclaratorBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_VARIABLE_DECLARATOR_BUILDER
 
 #include "ir/statements/variableDeclarator.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/whileStatementBuilder.h b/ets2panda/util/ast-builders/whileStatementBuilder.h
index d53213bc6d535d10a0c4b976141c7547417a70dc..183571c50991b462e993bc8f44fbdeb9b6222dd7 100644
--- a/ets2panda/util/ast-builders/whileStatementBuilder.h
+++ b/ets2panda/util/ast-builders/whileStatementBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_WHILE_STATEMENT_BUILDER
 
 #include "ir/statements/whileStatement.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/ast-builders/yieldExpressionBuilder.h b/ets2panda/util/ast-builders/yieldExpressionBuilder.h
index 07e46d781c6513323e31e7dcc12f80bbf3f8d623..7a8f729ba40060e1ea9753ee461f933334ec68b1 100644
--- a/ets2panda/util/ast-builders/yieldExpressionBuilder.h
+++ b/ets2panda/util/ast-builders/yieldExpressionBuilder.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_YIELD_EXPRESSION_BUILDER
 
 #include "ir/expressions/yieldExpression.h"
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 #include "astBuilder.h"
 
 namespace ark::es2panda::ir {
diff --git a/ets2panda/util/doubleLinkedList.h b/ets2panda/util/doubleLinkedList.h
index a4d5a5a9197a794011563ddf8f266196f9bd6b98..7feb2deb26942ba3a65ca51d94f2a98577a05541 100644
--- a/ets2panda/util/doubleLinkedList.h
+++ b/ets2panda/util/doubleLinkedList.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_DOUBLE_LINKED_LIST_H
 #define ES2PANDA_UTIL_DOUBLE_LINKED_LIST_H
 
-#include "mem/arena_allocator.h"
+#include "../libarkbase/mem/arena_allocator.h"
 
 namespace ark::es2panda::util {
 
diff --git a/ets2panda/util/dtoa_helper.cpp b/ets2panda/util/dtoa_helper.cpp
index 05a259cf9013d3c16e634c6fcd9d70b29f4bf1cb..1bbd460b8a1daccce7dd07c9df102452fdf06065 100644
--- a/ets2panda/util/dtoa_helper.cpp
+++ b/ets2panda/util/dtoa_helper.cpp
@@ -14,8 +14,8 @@
  */
 
 #include "dtoa_helper.h"
-#include "libpandabase/macros.h"
-#include "globals.h"
+#include "../libarkbase/macros.h"
+#include "../libarkbase/globals.h"
 
 // Almost copy of ets_runtime/ecmascript/base/dtoa_helper.cpp
 namespace ark::es2panda::util {
diff --git a/ets2panda/util/dtoa_helper.h b/ets2panda/util/dtoa_helper.h
index 2a5fbac26f5adb60e8843f6664e53faebddd5815..2c742822c7b93b88943d4152cbb37b94f712875d 100644
--- a/ets2panda/util/dtoa_helper.h
+++ b/ets2panda/util/dtoa_helper.h
@@ -19,7 +19,7 @@
 #include <cstdint>
 #include <cstddef>
 #include <array>
-#include "globals.h"
+#include "../libarkbase/globals.h"
 #include "util/es2pandaMacros.h"
 
 // Almost copy of ets_runtime/ecmascript/base/dtoa_helper.h
diff --git a/ets2panda/util/es2pandaMacros.h b/ets2panda/util/es2pandaMacros.h
index 6764fadf6a481d4e5a58a42b249cceed57169ad3..28f2fed7a327216ee51199490817e87119fb9686 100644
--- a/ets2panda/util/es2pandaMacros.h
+++ b/ets2panda/util/es2pandaMacros.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_ES2PANDA_MACROS_H
 #define ES2PANDA_UTIL_ES2PANDA_MACROS_H
 
-#include "macros.h"
+#include "../libarkbase/macros.h"
 #include "lexer/token/sourceLocation.h"
 
 namespace ark::es2panda::parser {
diff --git a/ets2panda/util/helpers.cpp b/ets2panda/util/helpers.cpp
index 9bde843fb28a80800f05f813e8606e78d13f4a23..22f0206f01a5feeb2e1105ab117a444f92d63065 100644
--- a/ets2panda/util/helpers.cpp
+++ b/ets2panda/util/helpers.cpp
@@ -51,7 +51,7 @@
 #include "ir/ts/tsInterfaceDeclaration.h"
 #include "ir/ts/tsEnumDeclaration.h"
 
-#include "libpandabase/utils/utf.h"
+#include "../libarkbase/utils/utf.h"
 
 namespace ark::es2panda::util {
 // Helpers
diff --git a/ets2panda/util/helpers.h b/ets2panda/util/helpers.h
index 841f00656668b496015d7aafcdc690a8020f1317..deaa89143caea2f4776a33c4f3b6d7b835988d64 100644
--- a/ets2panda/util/helpers.h
+++ b/ets2panda/util/helpers.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_HELPERS_H
 
 #include "varbinder/variableFlags.h"
-#include "mem/pool_manager.h"
+#include "../libarkbase/mem/pool_manager.h"
 #include "util/ustring.h"
 #include "ir/module/importSpecifier.h"
 
diff --git a/ets2panda/util/importPathManager.cpp b/ets2panda/util/importPathManager.cpp
index 7cf04669276b7b647c1a6d4a086c986641ad2d86..dabf2d9d19f31c64570783d500393029832c2dec 100644
--- a/ets2panda/util/importPathManager.cpp
+++ b/ets2panda/util/importPathManager.cpp
@@ -15,7 +15,7 @@
 
 #include "importPathManager.h"
 #include "es2panda.h"
-#include <libpandabase/os/filesystem.h>
+#include <../libarkbase/os/filesystem.h>
 #include "util/arktsconfig.h"
 #include "util/diagnostic.h"
 #include "util/diagnosticEngine.h"
diff --git a/ets2panda/util/options.cpp b/ets2panda/util/options.cpp
index 9f42bc27ab6b00253434bd595348cb5f457bbad6..90926fbdf6456756dfae3ed21d18985233b69e2f 100644
--- a/ets2panda/util/options.cpp
+++ b/ets2panda/util/options.cpp
@@ -17,8 +17,8 @@
 #include "util/diagnostic.h"
 #include "util/diagnosticEngine.h"
 #include "util/ustring.h"
-#include "os/filesystem.h"
-#include "utils/pandargs.h"
+#include "../libarkbase/os/filesystem.h"
+#include "../libarkbase/utils/pandargs.h"
 #include "arktsconfig.h"
 #include "generated/diagnostic.h"
 
diff --git a/ets2panda/util/options.h b/ets2panda/util/options.h
index 47e693e74c59a76784698f42e4c9e90f833dedcd..bc567876c62ed76ecb0f2ec90cb4b93f7474c3fc 100644
--- a/ets2panda/util/options.h
+++ b/ets2panda/util/options.h
@@ -16,10 +16,10 @@
 #ifndef ES2PANDA_UTIL_OPTIONS_H
 #define ES2PANDA_UTIL_OPTIONS_H
 
-#include "libpandabase/os/file.h"
-#include "libpandabase/utils/logger.h"
+#include "../libarkbase/os/file.h"
+#include "../libarkbase/utils/logger.h"
 #include "util/helpers.h"
-#include "utils/pandargs.h"
+#include "../libarkbase/utils/pandargs.h"
 #include "arktsconfig.h"
 #include "es2panda.h"
 
diff --git a/ets2panda/util/path.cpp b/ets2panda/util/path.cpp
index 995424b52469d9bf82322cad60fed00adc5568df..887462f1997de1ca29200308725c71c475f17bab 100644
--- a/ets2panda/util/path.cpp
+++ b/ets2panda/util/path.cpp
@@ -15,7 +15,7 @@
 
 #include <cstdio>
 #include <string>
-#include "os/filesystem.h"
+#include "../libarkbase/os/filesystem.h"
 #include "path.h"
 
 namespace ark::es2panda::util {
diff --git a/ets2panda/util/perfMetrics.cpp b/ets2panda/util/perfMetrics.cpp
index 7d207d956f8f51069209884686c0b2528b2cbb1d..909430c475a95a5d3c769643d7e20db49f1e0567 100644
--- a/ets2panda/util/perfMetrics.cpp
+++ b/ets2panda/util/perfMetrics.cpp
@@ -15,9 +15,9 @@
 
 #include "util/perfMetrics.h"
 
-#include "libpandabase/utils/logger.h"
-#include "libpandabase/utils/type_converter.h"
-#include "libpandabase/mem/mem.h"
+#include "../libarkbase/utils/logger.h"
+#include "../libarkbase/utils/type_converter.h"
+#include "../libarkbase/mem/mem.h"
 #include <chrono>
 #include <mutex>
 #include <forward_list>
diff --git a/ets2panda/util/perfMetrics.h b/ets2panda/util/perfMetrics.h
index 37f72ffbcacc6dd4219ba85d673c657142288610..7e9b81538087a10f15e58d87bb5fdd53c60dd11b 100644
--- a/ets2panda/util/perfMetrics.h
+++ b/ets2panda/util/perfMetrics.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_UTIL_PERF_METRICS_H
 #define ES2PANDA_UTIL_PERF_METRICS_H
 
-#include "libpandabase/macros.h"
+#include "../libarkbase/macros.h"
 
 namespace ark::es2panda::util {
 
diff --git a/ets2panda/util/plugin.cpp b/ets2panda/util/plugin.cpp
index cf883368aa26666a4193815a3830e2bec8ad3dd8..e9f7458028cc71102cc15110c7d3e7acc96560fa 100644
--- a/ets2panda/util/plugin.cpp
+++ b/ets2panda/util/plugin.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 #include "plugin.h"
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 
 namespace ark::es2panda::util {
 
diff --git a/ets2panda/util/plugin.h b/ets2panda/util/plugin.h
index a09113ac0bba9e43c372ef2d764fbf14889fe7ac..bc1592aee20db56f3cfbb618205765b476d49932 100644
--- a/ets2panda/util/plugin.h
+++ b/ets2panda/util/plugin.h
@@ -16,7 +16,7 @@
 #define ES2PANDA_UTIL_PLUGINS_H
 
 #include "util/es2pandaMacros.h"
-#include "os/library_loader.h"
+#include "../libarkbase/os/library_loader.h"
 #include "public/es2panda_lib.h"
 #include "util/ustring.h"
 
diff --git a/ets2panda/util/ustring.h b/ets2panda/util/ustring.h
index be6a745d60eeb58ac60b8e767f1bb344cc9cf59f..ec8256327456e7b2bc4ecbdb746f799ee9ff802a 100644
--- a/ets2panda/util/ustring.h
+++ b/ets2panda/util/ustring.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_UTIL_INCLUDE_USTRING_H
 
 #include "util/es2pandaMacros.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 
 #include <cstddef>
 #include <limits>
diff --git a/ets2panda/varbinder/recordTable.h b/ets2panda/varbinder/recordTable.h
index 437a2ffb79dd259f21257e6901141194fc991930..78299a2bdad71ffd7448b9a38911835ed0ab44c0 100644
--- a/ets2panda/varbinder/recordTable.h
+++ b/ets2panda/varbinder/recordTable.h
@@ -17,7 +17,7 @@
 #define ES2PANDA_VARBINDER_RECORDTABLE_H
 
 #include "util/es2pandaMacros.h"
-#include "utils/arena_containers.h"
+#include "../libarkbase/utils/arena_containers.h"
 #include "util/ustring.h"
 #include "util/enumbitops.h"