diff --git a/libdmabufheap/include/dmabuf_alloc.h b/libdmabufheap/include/dmabuf_alloc.h
index 07ec54b86091ef90aa141b6462ae1b4036bef6e8..e8233198269f8a818663f971f00135d625e90ead 100644
--- a/libdmabufheap/include/dmabuf_alloc.h
+++ b/libdmabufheap/include/dmabuf_alloc.h
@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <linux/dma-buf.h>
+#include <linux/dma-heap.h>
 
 #undef LOG_TAG
 #define LOG_TAG "dmabufheap"
diff --git a/libdmabufheap/src/dmabuf_alloc.c b/libdmabufheap/src/dmabuf_alloc.c
index e20a781751ba8551ce883e7eb92df75e40e0cfcb..b283b78b6f7a47b80f4cb110a89a012d7e1a1c49 100644
--- a/libdmabufheap/src/dmabuf_alloc.c
+++ b/libdmabufheap/src/dmabuf_alloc.c
@@ -20,8 +20,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <linux/dma-buf.h>
-#include <linux/dma-heap.h>
 #include "securec.h"
 #include "hilog/log.h"
 #include "dmabuf_alloc.h"
diff --git a/libdmabufheap/test/BUILD.gn b/libdmabufheap/test/BUILD.gn
index 4f525f33da3263600b269ea446291eaf6e7893a5..7aceed651fcaed978b857f570ed93a089c2e5fcb 100644
--- a/libdmabufheap/test/BUILD.gn
+++ b/libdmabufheap/test/BUILD.gn
@@ -19,6 +19,7 @@ ohos_unittest("DmabufAllocTest") {
   module_out_path = module_output_path
   sources = [ "unittest/libdmabufheap/dmabuf_alloc_test.cpp" ]
   deps = [ "//utils/memory/libdmabufheap:libdmabufheap" ]
+  external_deps = [ "c_utils:utils" ]
 }
 
 group("unittest") {
diff --git a/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp b/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp
index 0cd07b395abe90aa4f9b7a1cb159483fd674617f..a47c608e225e57b63f2576b31a539e906998c08a 100644
--- a/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp
+++ b/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp
@@ -23,6 +23,7 @@
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <climits>
+#include "securec.h"
 #include "gtest/gtest.h"
 #include "dmabuf_alloc.h"
 
@@ -69,7 +70,7 @@ HWTEST_F(DmabufAllocTest, AllocSingleBuffer, TestSize.Level1)
 
     ASSERT_EQ(0, DmabufHeapBufferSyncStart(buffer.fd, DMA_BUF_HEAP_BUF_SYNC_RW));
 
-    ASSERT_GE(sprintf((char *)ptr, "libdmabufheap"), 0);
+    ASSERT_GE(sprintf_s((char *)ptr, BUFFER_SIZE, "libdmabufheap"), 0);
 
     ASSERT_EQ(0, DmabufHeapBufferSyncEnd(buffer.fd, DMA_BUF_HEAP_BUF_SYNC_RW));
 
@@ -95,7 +96,7 @@ HWTEST_F(DmabufAllocTest, ShareBufferBetweenProcess, Function|MediumTest|Level1)
 
     ASSERT_EQ(0, DmabufHeapBufferSyncStart(buffer.fd, DMA_BUF_HEAP_BUF_SYNC_RW));
 
-    ASSERT_GE(sprintf((char *)ptr, "parent"), 0);
+    ASSERT_GE(sprintf_s((char *)ptr, BUFFER_SIZE, "parent"), 0);
 
     ASSERT_EQ(0, DmabufHeapBufferSyncEnd(buffer.fd, DMA_BUF_HEAP_BUF_SYNC_RW));
 
@@ -110,7 +111,7 @@ HWTEST_F(DmabufAllocTest, ShareBufferBetweenProcess, Function|MediumTest|Level1)
 
         ASSERT_STREQ("parent", (char *)ptr);
 
-        ASSERT_GE(sprintf((char *)ptr, "child"), 0);
+        ASSERT_GE(sprintf_s((char *)ptr, BUFFER_SIZE, "child"), 0);
 
         ASSERT_EQ(0, DmabufHeapBufferSyncEnd(buffer.fd, DMA_BUF_HEAP_BUF_SYNC_RW));
 
@@ -224,7 +225,7 @@ HWTEST_F(DmabufAllocTest, SyncBufferTwice, Function|MediumTest|Level1)
 
     ASSERT_EQ(0, DmabufHeapBufferSyncStart(buffer.fd, DMA_BUF_HEAP_BUF_SYNC_RW));
 
-    ASSERT_GE(sprintf((char *)ptr, "libdmabufheap"), 0);
+    ASSERT_GE(sprintf_s((char *)ptr, BUFFER_SIZE, "libdmabufheap"), 0);
 
     ASSERT_EQ(0, DmabufHeapBufferSyncEnd(buffer.fd, DMA_BUF_HEAP_BUF_SYNC_RW));
 
diff --git a/libpurgeablemem/c/include/purgeable_mem_builder_c.h b/libpurgeablemem/c/include/purgeable_mem_builder_c.h
index 2ccd3312f970fdf929f2681759d0da6e0f0ac7dd..488e5b251601aecebdfbe6f2baf03ec0a0a37e94 100644
--- a/libpurgeablemem/c/include/purgeable_mem_builder_c.h
+++ b/libpurgeablemem/c/include/purgeable_mem_builder_c.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_BUILDER_C_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_BUILDER_C_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_BUILDER_C_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_BUILDER_C_H
 
 #include <stdbool.h>
 
@@ -49,4 +49,4 @@ bool PurgMemBuilderBuildAll(struct PurgMemBuilder *builder, void *data, size_t s
 #endif /* End of #if __cplusplus */
 #endif /* End of #ifdef __cplusplus */
 
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_BUILDER_C_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_BUILDER_C_H */
diff --git a/libpurgeablemem/c/include/purgeable_mem_c.h b/libpurgeablemem/c/include/purgeable_mem_c.h
index 3628ac78ababe7563b32227b0dadb044f3fe7421..fb341473d1d62b52348234de1d599a80a13ebf32 100644
--- a/libpurgeablemem/c/include/purgeable_mem_c.h
+++ b/libpurgeablemem/c/include/purgeable_mem_c.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_C_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_C_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_C_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_C_H
 
 #include <stdbool.h> /* bool */
 #include <stddef.h> /* size_t */
@@ -30,7 +30,7 @@ struct PurgMem;
 
 /*
  * Function pointer, it points to a function which build content of a PurgMem obj.
- * Input:   void *: data ptr, ponits to start address of a PurgMem obj's content.
+ * Input:   void *: data ptr, points to start address of a PurgMem obj's content.
  * Input:   size_t: data size of the content.
  * Input:   void *: other private parameters.
  * Return:  build content result, true means success, while false is fail.
@@ -128,4 +128,4 @@ bool PurgMemAppendModify(struct PurgMem *purgObj, PurgMemModifyFunc func, void *
 #endif /* End of #if __cplusplus */
 #endif /* End of #ifdef __cplusplus */
 
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_C_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_C_INCLUDE_PURGEABLE_MEM_C_H */
diff --git a/libpurgeablemem/common/include/pm_ptr_util.h b/libpurgeablemem/common/include/pm_ptr_util.h
index 75d7f76bdce3b6d339319bc807b54beb0697098e..6180d6a87c90add3d9ba29474a1db1d1633d4ea4 100644
--- a/libpurgeablemem/common/include/pm_ptr_util.h
+++ b/libpurgeablemem/common/include/pm_ptr_util.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H
 
 #include "hilog/log_c.h"
 
@@ -33,4 +33,4 @@
         }                                              \
     } while (0)
 
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H */
diff --git a/libpurgeablemem/common/include/pm_state_c.h b/libpurgeablemem/common/include/pm_state_c.h
index 90b205771d1ddfb80b98ca4a6b320dea82168534..e18254d86ea9e6441a9758e1d9d91e85a598ce99 100644
--- a/libpurgeablemem/common/include/pm_state_c.h
+++ b/libpurgeablemem/common/include/pm_state_c.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_STATE_C_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_STATE_C_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_STATE_C_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_STATE_C_H
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -64,4 +64,4 @@ const char *GetPMStateName(PMState state);
 #endif /* End of #if __cplusplus */
 #endif /* End of #ifdef __cplusplus */
 
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_STATE_C_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_STATE_C_H */
diff --git a/libpurgeablemem/common/include/pm_util.h b/libpurgeablemem/common/include/pm_util.h
index 94423255e52e897138c1868c8f9263dd85137b39..954e7ee4b5f79142097b88ba09aac2ecb5c7bb24 100644
--- a/libpurgeablemem/common/include/pm_util.h
+++ b/libpurgeablemem/common/include/pm_util.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_UTIL_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_UTIL_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_UTIL_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_UTIL_H
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -57,4 +57,4 @@ extern "C" {
 #endif /* End of #if __cplusplus */
 #endif /* End of #ifdef __cplusplus */
 
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_UTIL_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_UTIL_H */
diff --git a/libpurgeablemem/common/include/ux_page_table_c.h b/libpurgeablemem/common/include/ux_page_table_c.h
index cbfdc1d03b50dae7b42ac667670a9a9cdca27599..1ee3625dce975de90d068949e83c51bd5658e248 100644
--- a/libpurgeablemem/common/include/ux_page_table_c.h
+++ b/libpurgeablemem/common/include/ux_page_table_c.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_UX_PAGE_TABLE_C_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_UX_PAGE_TABLE_C_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_UX_PAGE_TABLE_C_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_UX_PAGE_TABLE_C_H
 
 #include <stdint.h> /* uint64_t */
 #include <stdbool.h> /* bool */
@@ -46,4 +46,4 @@ bool UxpteIsPresent(UxPageTableStruct *upt, uint64_t addr, size_t len);
 }
 #endif /* End of #if __cplusplus */
 #endif /* End of #ifdef __cplusplus */
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_COMMON_INCLUDE_UX_PAGE_TABLE_C_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_UX_PAGE_TABLE_C_H */
diff --git a/libpurgeablemem/cpp/include/purgeable_mem.h b/libpurgeablemem/cpp/include/purgeable_mem.h
index 9f2d461de321cac4f384ca6e52c56982e7a34e2c..c77e91b94111c7030feb6d6941cd6c8c2e606833 100644
--- a/libpurgeablemem/cpp/include/purgeable_mem.h
+++ b/libpurgeablemem/cpp/include/purgeable_mem.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_H
 
 #include <memory> /* unique_ptr */
 #include <shared_mutex> /* shared_mutex */
@@ -113,4 +113,4 @@ private:
 };
 } /* namespace PurgeableMem */
 } /* namespace OHOS */
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_H */
diff --git a/libpurgeablemem/cpp/include/purgeable_mem_builder.h b/libpurgeablemem/cpp/include/purgeable_mem_builder.h
index b8e92690bdc425471747ded5c40210bc006352c5..7b09b4f560af1798c24857a8d258338211a48f77 100644
--- a/libpurgeablemem/cpp/include/purgeable_mem_builder.h
+++ b/libpurgeablemem/cpp/include/purgeable_mem_builder.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_BUILDER_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_BUILDER_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_BUILDER_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_BUILDER_H
 
 #include <memory> /* unique_ptr */
 
@@ -47,4 +47,4 @@ private:
 };
 } /* namespace PurgeableMem */
 } /* namespace OHOS */
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_BUILDER_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_MEM_BUILDER_H */
diff --git a/libpurgeablemem/cpp/include/ux_page_table.h b/libpurgeablemem/cpp/include/ux_page_table.h
index 301640a87657c7326b703506958424767501ee00..a0481be1b5cc3fe424f579bb5709ed747e4b3bff 100644
--- a/libpurgeablemem/cpp/include/ux_page_table.h
+++ b/libpurgeablemem/cpp/include/ux_page_table.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_UX_PAGE_TABLE_H
-#define OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_UX_PAGE_TABLE_H
+#ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_UX_PAGE_TABLE_H
+#define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_UX_PAGE_TABLE_H
 
 #include <string> /* std::string */
 
@@ -38,4 +38,4 @@ private:
 };
 } /* namespace PurgeableMem */
 } /* namespace OHOS */
-#endif /* OHOS_UTILS_MEMOEY_LIBPURGEABLEMEM_CPP_INCLUDE_UX_PAGE_TABLE_H */
+#endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_UX_PAGE_TABLE_H */