diff --git a/ets2panda/ast_verifier/invariants/arithmeticOperationValid.cpp b/ets2panda/ast_verifier/invariants/arithmeticOperationValid.cpp
index bb77859aed5faaa10db8e382b720112625617808..bf6ab126463ef72bdd5fcff959bce8227691f80f 100644
--- a/ets2panda/ast_verifier/invariants/arithmeticOperationValid.cpp
+++ b/ets2panda/ast_verifier/invariants/arithmeticOperationValid.cpp
@@ -19,7 +19,7 @@
 #include "ir/ts/tsInterfaceDeclaration.h"
 #include "ir/ts/tsEnumDeclaration.h"
 #include "ir/ts/tsInterfaceBody.h"
-#include "../helpers.h"
+#include "ast_verifier/helpers.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/arithmeticOperationValid.h b/ets2panda/ast_verifier/invariants/arithmeticOperationValid.h
index 1afed1ea7fb3564257f089b7ccda30e024f3bbd2..ba478d93ecc064ff547ac87b49e9e25f7581289d 100644
--- a/ets2panda/ast_verifier/invariants/arithmeticOperationValid.h
+++ b/ets2panda/ast_verifier/invariants/arithmeticOperationValid.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_ARITHMETICOPERATIONVALID_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_ARITHMETICOPERATIONVALID_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/checkAbstractMethod.h b/ets2panda/ast_verifier/invariants/checkAbstractMethod.h
index d2534f5483ea3017becd4dd6108ce2d7d4efde2a..174a685564664f5fa77352c57287319530a1a39b 100644
--- a/ets2panda/ast_verifier/invariants/checkAbstractMethod.h
+++ b/ets2panda/ast_verifier/invariants/checkAbstractMethod.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_CHECKABSTRACTMETHOD_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_CHECKABSTRACTMETHOD_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/checkConstProperties.h b/ets2panda/ast_verifier/invariants/checkConstProperties.h
index 379e446e7a90a5c09a018c1be19cf2a41f616c09..a4a042b1212389809609131311f4f1504535df00 100644
--- a/ets2panda/ast_verifier/invariants/checkConstProperties.h
+++ b/ets2panda/ast_verifier/invariants/checkConstProperties.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_CHECKCONSTPROPERTIES_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_CHECKCONSTPROPERTIES_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/checkScopeDeclaration.h b/ets2panda/ast_verifier/invariants/checkScopeDeclaration.h
index f7766ab0b8370e8bb76bbada509f4aec9589033d..1137ee9848c28dc9418a75da18189c88b6a979a4 100644
--- a/ets2panda/ast_verifier/invariants/checkScopeDeclaration.h
+++ b/ets2panda/ast_verifier/invariants/checkScopeDeclaration.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_CHECKSCOPEDECLARATION_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_CHECKSCOPEDECLARATION_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/checkStructDeclaration.h b/ets2panda/ast_verifier/invariants/checkStructDeclaration.h
index 931279a83c25db407b4612749cf19ec4b4849ee6..aa6d9ffe53e9dfe000c59308e950b81569f70848 100644
--- a/ets2panda/ast_verifier/invariants/checkStructDeclaration.h
+++ b/ets2panda/ast_verifier/invariants/checkStructDeclaration.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_CHECKSTRUCTDECLARATION_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_CHECKSTRUCTDECLARATION_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/everyChildHasValidParent.h b/ets2panda/ast_verifier/invariants/everyChildHasValidParent.h
index d18220f781f94a2e7563cdc420aca729529d7714..a2a3070c25b20d307a04d462dc0904490e2fbdc2 100644
--- a/ets2panda/ast_verifier/invariants/everyChildHasValidParent.h
+++ b/ets2panda/ast_verifier/invariants/everyChildHasValidParent.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_EVERYCHILDHASVALIDPARENT_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_EVERYCHILDHASVALIDPARENT_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/everyChildInParentRange.h b/ets2panda/ast_verifier/invariants/everyChildInParentRange.h
index c3406de3e0b04c9285e9b1b5dc8c4abb2ff482e2..fa25a4654465dc45f4304593faf99b1b32f2a6af 100644
--- a/ets2panda/ast_verifier/invariants/everyChildInParentRange.h
+++ b/ets2panda/ast_verifier/invariants/everyChildInParentRange.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_EVERYCHILDINPARENTRANGE_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_EVERYCHILDINPARENTRANGE_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/forLoopCorrectlyInitialized.h b/ets2panda/ast_verifier/invariants/forLoopCorrectlyInitialized.h
index 15c3e45451cf0457a420023a642fbadd4140f302..ea2fa365dd30501f0cd0cb33c8340796e660956b 100644
--- a/ets2panda/ast_verifier/invariants/forLoopCorrectlyInitialized.h
+++ b/ets2panda/ast_verifier/invariants/forLoopCorrectlyInitialized.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_FORLOOPCORRECTLYINITIALIZED_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_FORLOOPCORRECTLYINITIALIZED_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/getterSetterValidation.h b/ets2panda/ast_verifier/invariants/getterSetterValidation.h
index 4f4b1d4aed1ca3c3c5f867e857d62e619cb102f0..9d6bd4f22121c8a260a0d4c52f8f110a992fe170 100644
--- a/ets2panda/ast_verifier/invariants/getterSetterValidation.h
+++ b/ets2panda/ast_verifier/invariants/getterSetterValidation.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_GETTERSETTERVALIDATION_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_GETTERSETTERVALIDATION_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/identifierHasVariable.h b/ets2panda/ast_verifier/invariants/identifierHasVariable.h
index 8fc17ff9bba58291a17e394043688350b22342f1..72f9d271903f2d9c8246248651cea73ff2ad392f 100644
--- a/ets2panda/ast_verifier/invariants/identifierHasVariable.h
+++ b/ets2panda/ast_verifier/invariants/identifierHasVariable.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_IDENTIFIERHASVARIABLE_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_IDENTIFIERHASVARIABLE_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 #include "ir/expressions/identifier.h"
 
diff --git a/ets2panda/ast_verifier/invariants/importExportAccessValid.cpp b/ets2panda/ast_verifier/invariants/importExportAccessValid.cpp
index 10a85bbdc092be5495712e9de780e1758cb0adc5..035796aacc0dc71c58a79f2413b8091a14a5231d 100644
--- a/ets2panda/ast_verifier/invariants/importExportAccessValid.cpp
+++ b/ets2panda/ast_verifier/invariants/importExportAccessValid.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "importExportAccessValid.h"
-#include "../helpers.h"
+#include "ast_verifier/helpers.h"
 #include "ir/expressions/callExpression.h"
 #include "checker/types/ets/etsObjectType.h"
 #include "ir/module/importSpecifier.h"
diff --git a/ets2panda/ast_verifier/invariants/importExportAccessValid.h b/ets2panda/ast_verifier/invariants/importExportAccessValid.h
index 7977ee3a56e9059fec269c1bc737b4122cf94bf6..1eaf3cb642f7e24867e7d38924b43e4ca0a11fbf 100644
--- a/ets2panda/ast_verifier/invariants/importExportAccessValid.h
+++ b/ets2panda/ast_verifier/invariants/importExportAccessValid.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_IMPORTEXPORTACCESSVALID_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_IMPORTEXPORTACCESSVALID_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/modifierAccessValid.cpp b/ets2panda/ast_verifier/invariants/modifierAccessValid.cpp
index 58ce2de70a8439b4446c9198aa3a03bd1de71147..7f8875f7a9a3ca63873ae1d15b0ea23875505acb 100644
--- a/ets2panda/ast_verifier/invariants/modifierAccessValid.cpp
+++ b/ets2panda/ast_verifier/invariants/modifierAccessValid.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "modifierAccessValid.h"
-#include "../helpers.h"
+#include "ast_verifier/helpers.h"
 #include "varbinder/variableFlags.h"
 #include "ir/expressions/memberExpression.h"
 #include "ir/expressions/callExpression.h"
diff --git a/ets2panda/ast_verifier/invariants/modifierAccessValid.h b/ets2panda/ast_verifier/invariants/modifierAccessValid.h
index a5fe690286f0f832a3e92b8a55a558cc8be340b4..5889a24cb725fc596c25d1e2e93abbe8c8f32456 100644
--- a/ets2panda/ast_verifier/invariants/modifierAccessValid.h
+++ b/ets2panda/ast_verifier/invariants/modifierAccessValid.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_MODIFIERACCESSVALID_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_MODIFIERACCESSVALID_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/nodeHasParent.h b/ets2panda/ast_verifier/invariants/nodeHasParent.h
index c3f583c8d9b7cc72bbe2bdec15904481e9817b95..f5a77f9a3e09b316bf68b22e5cc50f9ebfd6ba13 100644
--- a/ets2panda/ast_verifier/invariants/nodeHasParent.h
+++ b/ets2panda/ast_verifier/invariants/nodeHasParent.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_NODEHASPARENT_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_NODEHASPARENT_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/nodeHasSourceRange.h b/ets2panda/ast_verifier/invariants/nodeHasSourceRange.h
index fed802ecb7d531d87106868fedb7def3bebbd026..a797369d03867595e09ca1f1fe4d9cb40b428e1b 100644
--- a/ets2panda/ast_verifier/invariants/nodeHasSourceRange.h
+++ b/ets2panda/ast_verifier/invariants/nodeHasSourceRange.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_NODEHASSOURCERANGE_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_NODEHASSOURCERANGE_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/nodeHasType.cpp b/ets2panda/ast_verifier/invariants/nodeHasType.cpp
index 4cfa95f5ca829f7252625b4821008f7f71411770..4a57eda031014279d77fb35958bb4df766e93824 100644
--- a/ets2panda/ast_verifier/invariants/nodeHasType.cpp
+++ b/ets2panda/ast_verifier/invariants/nodeHasType.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "../helpers.h"
+#include "ast_verifier/helpers.h"
 #include "nodeHasType.h"
 #include "ir/base/classDefinition.h"
 #include "ir/base/methodDefinition.h"
diff --git a/ets2panda/ast_verifier/invariants/nodeHasType.h b/ets2panda/ast_verifier/invariants/nodeHasType.h
index 81769166cf67988b5c87153d932072722614aca2..12e7eaf4e6b12063468326eba03f866100c717ab 100644
--- a/ets2panda/ast_verifier/invariants/nodeHasType.h
+++ b/ets2panda/ast_verifier/invariants/nodeHasType.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_NODEHASTYPE_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_NODEHASTYPE_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 #include "checker/types/type.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
diff --git a/ets2panda/ast_verifier/invariants/referenceTypeAnnotationIsNull.h b/ets2panda/ast_verifier/invariants/referenceTypeAnnotationIsNull.h
index e0e7bcaf36f3583d834edf86ef9372a467920f48..562cc47cb18bdc5215a4513bda732e3b479f1c14 100644
--- a/ets2panda/ast_verifier/invariants/referenceTypeAnnotationIsNull.h
+++ b/ets2panda/ast_verifier/invariants/referenceTypeAnnotationIsNull.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_REFERENCETYPEANNOTATIONISNULL_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_REFERENCETYPEANNOTATIONISNULL_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/sequenceExpressionHasLastType.h b/ets2panda/ast_verifier/invariants/sequenceExpressionHasLastType.h
index c39f50507244ae115b4c818cee22b899a8daface..7b4f0760cbf77bcc1cf48b68eaefb77467ae2e13 100644
--- a/ets2panda/ast_verifier/invariants/sequenceExpressionHasLastType.h
+++ b/ets2panda/ast_verifier/invariants/sequenceExpressionHasLastType.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_SEQUENCEEXPRESSIONHASLASTTYPE_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_SEQUENCEEXPRESSIONHASLASTTYPE_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/variableHasEnclosingScope.cpp b/ets2panda/ast_verifier/invariants/variableHasEnclosingScope.cpp
index 1aa6f1abf062c4b37663c31cb50160668839ef1a..08ae83ddcbbfc6f587371a7b93c306f0e8cd9491 100644
--- a/ets2panda/ast_verifier/invariants/variableHasEnclosingScope.cpp
+++ b/ets2panda/ast_verifier/invariants/variableHasEnclosingScope.cpp
@@ -15,7 +15,7 @@
 
 #include "variableHasEnclosingScope.h"
 #include "variableHasScope.h"
-#include "../helpers.h"
+#include "ast_verifier/helpers.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/variableHasEnclosingScope.h b/ets2panda/ast_verifier/invariants/variableHasEnclosingScope.h
index 5d0cf636988ba868da9edffb947b4f22d6c8520f..fa75e280f00225ea0eb15b2ce99c99f252bcfe59 100644
--- a/ets2panda/ast_verifier/invariants/variableHasEnclosingScope.h
+++ b/ets2panda/ast_verifier/invariants/variableHasEnclosingScope.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_VARIABLEHASENCLOSINGSCOPE_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_VARIABLEHASENCLOSINGSCOPE_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/ast_verifier/invariants/variableHasScope.cpp b/ets2panda/ast_verifier/invariants/variableHasScope.cpp
index 0e072bf3845a13c8cda5f40a7d28c8ad2923d890..9b18ba8289d4d4a1a03daeedead8c049c92d4d73 100644
--- a/ets2panda/ast_verifier/invariants/variableHasScope.cpp
+++ b/ets2panda/ast_verifier/invariants/variableHasScope.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "../helpers.h"
+#include "ast_verifier/helpers.h"
 #include "variableHasScope.h"
 #include "ir/base/scriptFunction.h"
 #include "ir/ts/tsEnumDeclaration.h"
diff --git a/ets2panda/ast_verifier/invariants/variableHasScope.h b/ets2panda/ast_verifier/invariants/variableHasScope.h
index 41d067774e285f773fc3c74c63f29a431abb515a..a6c7741c94677e9dcd630ef135ac1b1a0989069b 100644
--- a/ets2panda/ast_verifier/invariants/variableHasScope.h
+++ b/ets2panda/ast_verifier/invariants/variableHasScope.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_VARIABLEHASSCOPE_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_VARIABLEHASSCOPE_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 #include "varbinder/varbinder.h"
 
diff --git a/ets2panda/ast_verifier/invariants/variableNameIdentifierNameSame.h b/ets2panda/ast_verifier/invariants/variableNameIdentifierNameSame.h
index 5eb9e85e2162d29c4f8d695879da3c12cc63d44d..211c166828bcfc0c26dd1310fbc857d0fe2bebf2 100644
--- a/ets2panda/ast_verifier/invariants/variableNameIdentifierNameSame.h
+++ b/ets2panda/ast_verifier/invariants/variableNameIdentifierNameSame.h
@@ -16,7 +16,7 @@
 #ifndef ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_VARIABLENAMEIDENTIFIERNAMESAME_H
 #define ES2PANDA_COMPILER_CORE_AST_VERIFIER_INVARIANTS_VARIABLENAMEIDENTIFIERNAMESAME_H
 
-#include "../invariantBase.h"
+#include "ast_verifier/invariantBase.h"
 
 namespace ark::es2panda::compiler::ast_verifier {
 
diff --git a/ets2panda/compiler/lowering/ets/localClassLowering.cpp b/ets2panda/compiler/lowering/ets/localClassLowering.cpp
index 5153b0be11153d366b260cee6078f846923e0c3b..7b1de4c561ed3ea4e11ba2bf32f830ce1e624613 100644
--- a/ets2panda/compiler/lowering/ets/localClassLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/localClassLowering.cpp
@@ -16,7 +16,7 @@
 #include "localClassLowering.h"
 
 #include "checker/ETSchecker.h"
-#include "../util.h"
+#include "compiler/lowering/util.h"
 
 namespace ark::es2panda::compiler {
 
diff --git a/ets2panda/lexer/regexp/regexp.h b/ets2panda/lexer/regexp/regexp.h
index 445659c5573275ea31a8eb8b2bf376f1d8e2267f..42c11f4f1060f9f79dc1838bfab0dbdc0a748a76 100644
--- a/ets2panda/lexer/regexp/regexp.h
+++ b/ets2panda/lexer/regexp/regexp.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021-2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -19,7 +19,7 @@
 #include "util/enumbitops.h"
 #include "util/ustring.h"
 
-#include "../../parser/parserImpl.h"
+#include "parser/parserImpl.h"
 
 #include <unordered_set>
 
diff --git a/ets2panda/test/unit/plugin_ut/plugin_ut_binary_expression_api.cpp b/ets2panda/test/unit/plugin_ut/plugin_ut_binary_expression_api.cpp
index 42e150fa9f34bde580901033af35f739539f0c42..ac6bcbb874002ff894448304ac76cb5c241a8cbe 100644
--- a/ets2panda/test/unit/plugin_ut/plugin_ut_binary_expression_api.cpp
+++ b/ets2panda/test/unit/plugin_ut/plugin_ut_binary_expression_api.cpp
@@ -19,7 +19,7 @@
 #include <ir/expression.h>
 #include <ostream>
 #include <string>
-#include "../plugin/util.h"
+#include "test/unit/plugin/util.h"
 #include "public/es2panda_lib.h"
 
 // NOLINTBEGIN
diff --git a/ets2panda/test/unit/plugin_ut/plugin_ut_new_array_instance_expression_api.cpp b/ets2panda/test/unit/plugin_ut/plugin_ut_new_array_instance_expression_api.cpp
index 14c55feb305b4a8205a8148cc6f15eb1c77f72d8..2b1a73020d7bd477c3d1059a859a59ca82664a83 100644
--- a/ets2panda/test/unit/plugin_ut/plugin_ut_new_array_instance_expression_api.cpp
+++ b/ets2panda/test/unit/plugin_ut/plugin_ut_new_array_instance_expression_api.cpp
@@ -19,7 +19,7 @@
 #include <iostream>
 #include <ostream>
 #include <string>
-#include "../plugin/util.h"
+#include "test/unit/plugin/util.h"
 #include "public/es2panda_lib.h"
 
 // NOLINTBEGIN
diff --git a/ets2panda/test/unit/plugin_ut/plugin_ut_variables_api.cpp b/ets2panda/test/unit/plugin_ut/plugin_ut_variables_api.cpp
index b9752c7f486cfd4983708a1eb7413762944e792b..d96ab188a3b12d0fac007dcfe6c44aab309054aa 100644
--- a/ets2panda/test/unit/plugin_ut/plugin_ut_variables_api.cpp
+++ b/ets2panda/test/unit/plugin_ut/plugin_ut_variables_api.cpp
@@ -20,7 +20,7 @@
 #include <iterator>
 #include <ostream>
 #include <string>
-#include "../plugin/util.h"
+#include "test/unit/plugin/util.h"
 #include "public/es2panda_lib.h"
 
 // NOLINTBEGIN