diff --git a/BUILD.gn b/BUILD.gn
index ad127914..e069f52d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -29,6 +29,17 @@
 
 import("config.gni")
 
+config("los_config") {
+  cflags = [ "-Werror" ]
+
+  include_dirs = [
+    "//kernel/liteos_m/kernel/include",
+    "//kernel/liteos_m/kernel/arch/include",
+    "//kernel/liteos_m/utils",
+    "//third_party/bounds_checking_function/include",
+  ]
+}
+
 group("kernel") {
   deps = [
     "kernel:kernel",
diff --git a/components/backtrace/BUILD.gn b/components/backtrace/BUILD.gn
index 22e3a48d..c543abe9 100644
--- a/components/backtrace/BUILD.gn
+++ b/components/backtrace/BUILD.gn
@@ -27,13 +27,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("backtrace") {
   sources = [ "los_backtrace.c" ]
 
-  include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/components/cppsupport/BUILD.gn b/components/cppsupport/BUILD.gn
index 497ec40c..7a8a5ddc 100644
--- a/components/cppsupport/BUILD.gn
+++ b/components/cppsupport/BUILD.gn
@@ -27,8 +27,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("cppsupport") {
   sources = [ "los_cppsupport.c" ]
 
-  include_dirs = [ "../../utils" ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/components/cpup/BUILD.gn b/components/cpup/BUILD.gn
index cd5693b0..6c51771c 100644
--- a/components/cpup/BUILD.gn
+++ b/components/cpup/BUILD.gn
@@ -27,13 +27,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("cpup") {
   sources = [ "los_cpup.c" ]
 
-  include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/components/dynlink/BUILD.gn b/components/dynlink/BUILD.gn
index bd575308..35b12b53 100644
--- a/components/dynlink/BUILD.gn
+++ b/components/dynlink/BUILD.gn
@@ -26,15 +26,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-config("dynlink_config") {
-  include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-    ".",
-    "//third_party/bounds_checking_function/include",
-  ]
+import("//kernel/liteos_m/config.gni")
 
+config("dynlink_config") {
+  include_dirs = [ "./" ]
   if (arch == "arm") {
     include_dirs += [ "../../kernel/arch/arm/include" ]
   } else {
@@ -47,5 +42,7 @@ static_library("dynlink") {
   sources = [ "los_dynlink.c" ]
 
   public_configs = [ ":dynlink_config" ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
+
   deps = [ "//kernel/liteos_m/kal/posix" ]
 }
diff --git a/components/exchook/BUILD.gn b/components/exchook/BUILD.gn
index bbd45a1b..ab968eed 100644
--- a/components/exchook/BUILD.gn
+++ b/components/exchook/BUILD.gn
@@ -27,15 +27,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("exchook") {
   sources = [
     "los_exc_info.c",
     "los_exchook.c",
   ]
-  include_dirs = [
-    "../../kernel/arch/include",
-    "../../kernel/include",
-    "../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/components/power/BUILD.gn b/components/power/BUILD.gn
index d75e908f..e0a8119b 100644
--- a/components/power/BUILD.gn
+++ b/components/power/BUILD.gn
@@ -27,13 +27,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("pm") {
   sources = [ "los_pm.c" ]
 
-  include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/components/trace/BUILD.gn b/components/trace/BUILD.gn
index 73b035a8..c3b33146 100644
--- a/components/trace/BUILD.gn
+++ b/components/trace/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("trace") {
   sources = [
     "cnv/trace_cnv.c",
@@ -39,13 +41,10 @@ static_library("trace") {
   ]
 
   include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
     "./",
     "cnv",
     "pipeline",
     "pipeline/serial",
-    "//third_party/bounds_checking_function/include",
   ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/config.gni b/config.gni
index 5b2b3703..91b8d7e3 100755
--- a/config.gni
+++ b/config.gni
@@ -43,3 +43,5 @@ declare_args() {
   enable_ohos_kernel_liteos_m_tz = false
   ohos_kernel_liteos_m_lwip_path = "components/net/lwip-2.1:lwip"
 }
+
+LITEOSTOPDIR = "//kernel/liteos_m"
diff --git a/kal/cmsis/BUILD.gn b/kal/cmsis/BUILD.gn
index 07aefe5e..2782b12f 100644
--- a/kal/cmsis/BUILD.gn
+++ b/kal/cmsis/BUILD.gn
@@ -27,17 +27,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("cmsis") {
   sources = [ "cmsis_liteos2.c" ]
 
-  include_dirs = [
-    "//third_party/bounds_checking_function/include",
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-  ]
-
   public_configs = [ ":include" ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
 
 config("include") {
diff --git a/kal/posix/BUILD.gn b/kal/posix/BUILD.gn
index 60d7c6e9..d192a8ae 100644
--- a/kal/posix/BUILD.gn
+++ b/kal/posix/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 config("include") {
   include_dirs = [ "include" ]
 }
@@ -45,16 +47,8 @@ static_library("posix") {
     "src/time.c",
   ]
 
-  include_dirs = [
-    "../../kernel/arch/include",
-    "../../kernel/include",
-    "../../utils",
-  ]
-
   public_configs = [ ":include" ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 
-  public_deps = [
-    "//third_party/bounds_checking_function:libsec_static",
-    "//third_party/musl/porting/liteos_m/kernel",
-  ]
+  public_deps = [ "//third_party/musl/porting/liteos_m/kernel" ]
 }
diff --git a/kernel/BUILD.gn b/kernel/BUILD.gn
index 043adac4..55ff30a1 100644
--- a/kernel/BUILD.gn
+++ b/kernel/BUILD.gn
@@ -27,7 +27,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import("../config.gni")
+import("//kernel/liteos_m/config.gni")
 
 static_library("kernel") {
   sources = [
@@ -46,17 +46,15 @@ static_library("kernel") {
   ]
 
   include_dirs = [
-    "include",
-    "arch/include",
     "../components/cpup",
     "../components/exchook",
     "../components/backtrace",
     "../components/power",
     "../components/dynlink",
-    "../utils",
-    "//third_party/bounds_checking_function/include",
   ]
 
+  configs += [ "$LITEOSTOPDIR:los_config" ]
+
   if ("$board_cpu" == "cortex-m3") {
     deps = [ "arch/arm/cortex-m3/gcc/:arch" ]
   } else if ("$board_cpu" == "cortex-m4") {
diff --git a/kernel/arch/arm/arm9/gcc/BUILD.gn b/kernel/arch/arm/arm9/gcc/BUILD.gn
index 66f3d6b2..a6cdddb9 100644
--- a/kernel/arch/arm/arm9/gcc/BUILD.gn
+++ b/kernel/arch/arm/arm9/gcc/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -37,10 +39,5 @@ static_library("arch") {
     "reset_vector.S",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/kernel/arch/arm/cortex-m33/gcc/BUILD.gn b/kernel/arch/arm/cortex-m33/gcc/BUILD.gn
index 9e6f08d1..9adb6f49 100644
--- a/kernel/arch/arm/cortex-m33/gcc/BUILD.gn
+++ b/kernel/arch/arm/cortex-m33/gcc/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -36,10 +38,5 @@ static_library("arch") {
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/kernel/arch/arm/cortex-m33/gcc/NTZ/BUILD.gn b/kernel/arch/arm/cortex-m33/gcc/NTZ/BUILD.gn
index 6f120913..9adb6f49 100755
--- a/kernel/arch/arm/cortex-m33/gcc/NTZ/BUILD.gn
+++ b/kernel/arch/arm/cortex-m33/gcc/NTZ/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -36,10 +38,5 @@ static_library("arch") {
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../../kernel/arch/include",
-    "../../../../../../kernel/include",
-    "../../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/kernel/arch/arm/cortex-m33/gcc/TZ/BUILD.gn b/kernel/arch/arm/cortex-m33/gcc/TZ/BUILD.gn
index 0b95748f..9e319178 100644
--- a/kernel/arch/arm/cortex-m33/gcc/TZ/BUILD.gn
+++ b/kernel/arch/arm/cortex-m33/gcc/TZ/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "non_secure/los_context.c",
@@ -40,10 +42,7 @@ static_library("arch") {
   include_dirs = [
     "./non_secure",
     "./secure",
-    "../../../../../../kernel/arch/include",
-    "../../../../../../kernel/arch/include",
-    "../../../../../../kernel/include",
-    "../../../../../../utils",
-    "//third_party/bounds_checking_function/include",
   ]
+
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/kernel/arch/arm/cortex-m4/gcc/BUILD.gn b/kernel/arch/arm/cortex-m4/gcc/BUILD.gn
index 01757ea5..9fcb66e1 100644
--- a/kernel/arch/arm/cortex-m4/gcc/BUILD.gn
+++ b/kernel/arch/arm/cortex-m4/gcc/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -37,10 +39,5 @@ static_library("arch") {
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/kernel/arch/arm/cortex-m7/gcc/BUILD.gn b/kernel/arch/arm/cortex-m7/gcc/BUILD.gn
index 9e6f08d1..9adb6f49 100644
--- a/kernel/arch/arm/cortex-m7/gcc/BUILD.gn
+++ b/kernel/arch/arm/cortex-m7/gcc/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -36,10 +38,5 @@ static_library("arch") {
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/kernel/arch/risc-v/riscv32/gcc/BUILD.gn b/kernel/arch/risc-v/riscv32/gcc/BUILD.gn
index a931cd8b..55b0138d 100644
--- a/kernel/arch/risc-v/riscv32/gcc/BUILD.gn
+++ b/kernel/arch/risc-v/riscv32/gcc/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   asmflags = board_asmflags
   sources = [
@@ -37,11 +39,7 @@ static_library("arch") {
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "asm",
-    "//third_party/bounds_checking_function/include",
-  ]
+  include_dirs = [ "asm" ]
+
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
diff --git a/kernel/arch/risc-v/riscv32/gcc/los_timer.c b/kernel/arch/risc-v/riscv32/gcc/los_timer.c
index ffb98543..31c50338 100644
--- a/kernel/arch/risc-v/riscv32/gcc/los_timer.c
+++ b/kernel/arch/risc-v/riscv32/gcc/los_timer.c
@@ -45,7 +45,7 @@ WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
     g_cyclesPerTick = g_sysClock / LOSCFG_BASE_CORE_TICK_PER_SECOND;
     g_intCount = 0;
 
-    HalClockInit(handler, LOSCFG_BASE_CORE_TICK_RESPONSE_MAX);
+    HalClockInit(handler, (UINT32)LOSCFG_BASE_CORE_TICK_RESPONSE_MAX);
 
     return LOS_OK; /* never return */
 }
diff --git a/kernel/src/mm/los_memory.c b/kernel/src/mm/los_memory.c
index cb8a02ce..d7391cf0 100644
--- a/kernel/src/mm/los_memory.c
+++ b/kernel/src/mm/los_memory.c
@@ -279,7 +279,7 @@ STATIC INLINE UINT32 OsMemAllocCheck(struct OsMemPoolHead *pool, UINT32 intSave)
 #endif
 
 #if (LOSCFG_MEM_MUL_REGIONS == 1)
-/** 
+/**
  *  When LOSCFG_MEM_MUL_REGIONS is enabled to support multiple non-continuous memory regions,
  *  the gap between two memory regions is marked as a used OsMemNodeHead node. The gap node
  *  couldn't be freed, and would also be skipped in some DFX functions. The 'ptr.prev' pointer
@@ -310,7 +310,7 @@ STATIC VOID OsAllMemNodeDoHandle(VOID *pool, VOID (*handle)(struct OsMemNodeHead
     struct OsMemPoolHead *poolInfo = (struct OsMemPoolHead *)pool;
     struct OsMemNodeHead *tmpNode = NULL;
     struct OsMemNodeHead *endNode = NULL;
-    UINT32 intSave;
+    UINT32 intSave = 0;
 
     if (pool == NULL) {
         PRINTK("input param is NULL\n");
@@ -1065,7 +1065,7 @@ VOID *LOS_MemAlloc(VOID *pool, UINT32 size)
 
     struct OsMemPoolHead *poolHead = (struct OsMemPoolHead *)pool;
     VOID *ptr = NULL;
-    UINT32 intSave;
+    UINT32 intSave = 0;
 
     MEM_LOCK(poolHead, intSave);
     do {
@@ -1109,7 +1109,7 @@ VOID *LOS_MemAllocAlign(VOID *pool, UINT32 size, UINT32 boundary)
     }
 
     struct OsMemPoolHead *poolHead = (struct OsMemPoolHead *)pool;
-    UINT32 intSave;
+    UINT32 intSave = 0;
     VOID *ptr = NULL;
     VOID *alignedPtr = NULL;
 
@@ -1316,7 +1316,7 @@ UINT32 LOS_MemFree(VOID *pool, VOID *ptr)
     UINT32 ret = LOS_NOK;
     struct OsMemPoolHead *poolHead = (struct OsMemPoolHead *)pool;
     struct OsMemNodeHead *node = NULL;
-    UINT32 intSave;
+    UINT32 intSave = 0;
 
     MEM_LOCK(poolHead, intSave);
     do {
@@ -1423,7 +1423,7 @@ VOID *LOS_MemRealloc(VOID *pool, VOID *ptr, UINT32 size)
     struct OsMemPoolHead *poolHead = (struct OsMemPoolHead *)pool;
     struct OsMemNodeHead *node = NULL;
     VOID *newPtr = NULL;
-    UINT32 intSave;
+    UINT32 intSave = 0;
 
     MEM_LOCK(poolHead, intSave);
     do {
@@ -1464,7 +1464,7 @@ STATIC VOID MemNodeFreeByTaskIDHandle(struct OsMemNodeHead *curNode, VOID *arg)
 
 UINT32 LOS_MemFreeByTaskID(VOID *pool, UINT32 taskID)
 {
-    UINT32 args[2] = {taskID, (UINT32)(UINTPTR)pool}; 
+    UINT32 args[2] = { taskID, (UINT32)(UINTPTR)pool };
     if (pool == NULL) {
         return OS_ERROR;
     }
@@ -1521,7 +1521,6 @@ STATIC VOID MemUsedGetHandle(struct OsMemNodeHead *curNode, VOID *arg)
 UINT32 LOS_MemTotalUsedGet(VOID *pool)
 {
     UINT32 memUsed = 0;
-    UINT32 intSave;
 
     if (pool == NULL) {
         return LOS_NOK;
@@ -1689,52 +1688,52 @@ STATIC VOID OsMemNodeInfo(const struct OsMemNodeHead *tmpNode,
         usedNode = (struct OsMemUsedNodeHead *)tmpNode;
         PRINTK("\n broken node head: %p  "
 #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-               "0x%x  "
+            "0x%x  "
 #endif
-               "0x%x, ",
-               usedNode->header.ptr.prev,
+            "0x%x, ",
+            usedNode->header.ptr.prev,
 #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-               usedNode->header.magic,
+            usedNode->header.magic,
 #endif
-               usedNode->header.sizeAndFlag);
+            usedNode->header.sizeAndFlag);
     } else {
         freeNode = (struct OsMemFreeNodeHead *)tmpNode;
         PRINTK("\n broken node head: %p  %p  %p  "
 #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-               "0x%x  "
+            "0x%x  "
 #endif
-               "0x%x, ",
-               freeNode->header.ptr.prev, freeNode->next, freeNode->prev,
+            "0x%x, ",
+            freeNode->header.ptr.prev, freeNode->next, freeNode->prev,
 #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-               freeNode->header.magic,
+            freeNode->header.magic,
 #endif
-               freeNode->header.sizeAndFlag);
+            freeNode->header.sizeAndFlag);
     }
 
     if (OS_MEM_NODE_GET_USED_FLAG(preNode->sizeAndFlag)) {
         usedNode = (struct OsMemUsedNodeHead *)preNode;
         PRINTK("prev node head: %p  "
 #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-               "0x%x  "
+            "0x%x  "
 #endif
-               "0x%x\n",
-               usedNode->header.ptr.prev,
+            "0x%x\n",
+            usedNode->header.ptr.prev,
 #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-               usedNode->header.magic,
+            usedNode->header.magic,
 #endif
-               usedNode->header.sizeAndFlag);
+            usedNode->header.sizeAndFlag);
     } else {
         freeNode = (struct OsMemFreeNodeHead *)preNode;
         PRINTK("prev node head: %p  %p  %p  "
 #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-               "0x%x  "
+            "0x%x  "
 #endif
-               "0x%x, ",
-               freeNode->header.ptr.prev, freeNode->next, freeNode->prev,
+            "0x%x, ",
+            freeNode->header.ptr.prev, freeNode->next, freeNode->prev,
 #if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-               freeNode->header.magic,
+            freeNode->header.magic,
 #endif
-               freeNode->header.sizeAndFlag);
+            freeNode->header.sizeAndFlag);
     }
 
 #if (LOSCFG_MEM_LEAKCHECK == 1)
@@ -1821,7 +1820,7 @@ UINT32 LOS_MemIntegrityCheck(const VOID *pool)
     struct OsMemPoolHead *poolHead = (struct OsMemPoolHead *)pool;
     struct OsMemNodeHead *tmpNode = NULL;
     struct OsMemNodeHead *preNode = NULL;
-    UINT32 intSave;
+    UINT32 intSave = 0;
 
     MEM_LOCK(poolHead, intSave);
     if (OsMemIntegrityCheck(poolHead, &tmpNode, &preNode)) {
@@ -1857,7 +1856,7 @@ STATIC INLINE VOID OsMemInfoGet(struct OsMemNodeHead *node,
             size = OS_MEM_NODE_HEAD_SIZE;
         } else {
             size = OS_MEM_NODE_GET_SIZE(node->sizeAndFlag);
-        }        
+        }
         ++usedNodeNum;
         totalUsedSize += size;
     }
@@ -1880,7 +1879,7 @@ STATIC VOID OsMemNodeInfoGetHandle(struct OsMemNodeHead *curNode, VOID *arg)
 UINT32 LOS_MemInfoGet(VOID *pool, LOS_MEM_POOL_STATUS *poolStatus)
 {
     struct OsMemPoolHead *poolInfo = pool;
-    UINT32 intSave;
+    UINT32 intSave = 0;
 
     if (poolStatus == NULL) {
         PRINT_ERR("can't use NULL addr to save info\n");
@@ -1950,7 +1949,7 @@ UINT32 LOS_MemFreeNodeShow(VOID *pool)
     struct OsMemFreeNodeHead *node = NULL;
     UINT32 countNum[OS_MEM_FREE_LIST_COUNT] = {0};
     UINT32 index;
-    UINT32 intSave;
+    UINT32 intSave = 0;
 
     MEM_LOCK(poolInfo, intSave);
     for (index = 0; index < OS_MEM_FREE_LIST_COUNT; index++) {
@@ -2162,7 +2161,7 @@ STATIC VOID OsMemExcInfoGetSub(struct OsMemPoolHead *pool, MemInfoCB *memExcInfo
 {
     struct OsMemNodeHead *tmpNode = NULL;
     UINT32 taskID = OS_TASK_ERRORID;
-    UINT32 intSave;
+    UINT32 intSave = 0;
 
     (VOID)memset_s(memExcInfo, sizeof(MemInfoCB), 0, sizeof(MemInfoCB));
 
@@ -2227,5 +2226,3 @@ UINT32 OsMemExcInfoGet(UINT32 memNumMax, MemInfoCB *memExcInfo)
     return count;
 }
 #endif
-
-
diff --git a/utils/BUILD.gn b/utils/BUILD.gn
index f23ddc0c..a18d6e5e 100644
--- a/utils/BUILD.gn
+++ b/utils/BUILD.gn
@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("utils") {
   sources = [
     "los_debug.c",
@@ -34,10 +36,5 @@ static_library("utils") {
     "los_hook.c",
   ]
 
-  include_dirs = [
-    "../kernel/include",
-    "../kernel/arch/include",
-    ".",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }