From 5ea72e703a655aef0a5a87d9247d46711d3a08e3 Mon Sep 17 00:00:00 2001
From: qianyong325 <qianyong05@chinasoftinc.com>
Date: Mon, 16 Jun 2025 17:47:45 +0800
Subject: [PATCH] ets_frontend access control alarm modification

Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICFJPC

Signed-off-by: qianyong325 <qianyong05@chinasoftinc.com>
---
 .../ast_verifier/invariants/arithmeticOperationValid.cpp      | 2 +-
 ets2panda/ast_verifier/invariants/arithmeticOperationValid.h  | 2 +-
 ets2panda/ast_verifier/invariants/checkAbstractMethod.h       | 2 +-
 ets2panda/ast_verifier/invariants/checkConstProperties.h      | 2 +-
 ets2panda/ast_verifier/invariants/checkScopeDeclaration.h     | 2 +-
 ets2panda/ast_verifier/invariants/checkStructDeclaration.h    | 2 +-
 ets2panda/ast_verifier/invariants/everyChildHasValidParent.h  | 2 +-
 ets2panda/ast_verifier/invariants/everyChildInParentRange.h   | 2 +-
 .../ast_verifier/invariants/forLoopCorrectlyInitialized.h     | 2 +-
 ets2panda/ast_verifier/invariants/getterSetterValidation.h    | 2 +-
 ets2panda/ast_verifier/invariants/identifierHasVariable.h     | 2 +-
 ets2panda/ast_verifier/invariants/importExportAccessValid.cpp | 2 +-
 ets2panda/ast_verifier/invariants/importExportAccessValid.h   | 2 +-
 ets2panda/ast_verifier/invariants/modifierAccessValid.cpp     | 2 +-
 ets2panda/ast_verifier/invariants/modifierAccessValid.h       | 2 +-
 ets2panda/ast_verifier/invariants/nodeHasParent.h             | 2 +-
 ets2panda/ast_verifier/invariants/nodeHasSourceRange.h        | 2 +-
 ets2panda/ast_verifier/invariants/nodeHasType.cpp             | 2 +-
 ets2panda/ast_verifier/invariants/nodeHasType.h               | 2 +-
 .../ast_verifier/invariants/referenceTypeAnnotationIsNull.h   | 2 +-
 .../ast_verifier/invariants/sequenceExpressionHasLastType.h   | 2 +-
 .../ast_verifier/invariants/variableHasEnclosingScope.cpp     | 2 +-
 ets2panda/ast_verifier/invariants/variableHasEnclosingScope.h | 2 +-
 ets2panda/ast_verifier/invariants/variableHasScope.cpp        | 2 +-
 ets2panda/ast_verifier/invariants/variableHasScope.h          | 2 +-
 .../ast_verifier/invariants/variableNameIdentifierNameSame.h  | 2 +-
 ets2panda/compiler/lowering/ets/localClassLowering.cpp        | 2 +-
 ets2panda/lexer/regexp/regexp.h                               | 4 ++--
 .../test/unit/plugin_ut/plugin_ut_binary_expression_api.cpp   | 2 +-
 .../plugin_ut/plugin_ut_new_array_instance_expression_api.cpp | 2 +-
 ets2panda/test/unit/plugin_ut/plugin_ut_variables_api.cpp     | 2 +-
 31 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/ets2panda/ast_verifier/invariants/arithmeticOperationValid.cpp b/ets2panda/ast_verifier/invariants/arithmeticOperationValid.cpp
index bb77859aed..bf6ab12646 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 1afed1ea7f..ba478d93ec 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 d2534f5483..174a685564 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 379e446e7a..a4a042b121 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 f7766ab0b8..1137ee9848 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 931279a83c..aa6d9ffe53 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 d18220f781..a2a3070c25 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 c3406de3e0..fa25a46544 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 15c3e45451..ea2fa365dd 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 4f4b1d4aed..9d6bd4f221 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 8fc17ff9bb..72f9d27190 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 10a85bbdc0..035796aacc 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 7977ee3a56..1eaf3cb642 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 58ce2de70a..7f8875f7a9 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 a5fe690286..5889a24cb7 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 c3f583c8d9..f5a77f9a3e 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 fed802ecb7..a797369d03 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 4cfa95f5ca..4a57eda031 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 81769166cf..12e7eaf4e6 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 e0e7bcaf36..562cc47cb1 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 c39f505072..7b4f0760cb 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 1aa6f1abf0..08ae83ddcb 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 5d0cf63698..fa75e280f0 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 0e072bf384..9b18ba8289 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 41d067774e..a6c7741c94 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 5eb9e85e21..211c166828 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 5153b0be11..7b1de4c561 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 445659c557..42c11f4f10 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 42e150fa9f..ac6bcbb874 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 14c55feb30..2b1a73020d 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 b9752c7f48..d96ab188a3 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
-- 
Gitee