diff --git a/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp b/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp
index e8c36d5f971c0ab8905fa142919a9961e13483f6..9a318fce930a9e5e8bad325f21f84ecc18ef7276 100644
--- a/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp
+++ b/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp
@@ -25,8 +25,8 @@
 #include <climits>
 #include <dirent.h>
 #include <string>
-#include "securec.h"
 #include "gtest/gtest.h"
+#include "securec.h"
 #include "dmabuf_alloc.h"
 
 using namespace testing;
diff --git a/libpurgeablemem/c/src/purgeable_mem_c.c b/libpurgeablemem/c/src/purgeable_mem_c.c
index 942b26581c289878f49080649d8d6b3f8882edf4..8671c7367062b900872063428d602a804a638196 100644
--- a/libpurgeablemem/c/src/purgeable_mem_c.c
+++ b/libpurgeablemem/c/src/purgeable_mem_c.c
@@ -330,18 +330,20 @@ bool PurgMemBeginWrite(struct PurgMem *purgObj)
     if (rwlockRet != 0) {
         PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: wrlock fail. %{public}d", __func__, rwlockRet);
         err = PM_LOCK_WRITE_FAIL;
-        goto uxpte_put;
+        PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: %{public}s, return false, UxptePut.", __func__, GetPMStateName(err));
+        UxptePut(purgObj->uxPageTable, (uint64_t)(purgObj->dataPtr), purgObj->dataSizeInput);
+        return false;
     }
 
     if (!IsPurged(purgObj)) {
-        goto succ;
+        return true;
     }
 
     /* data is purged */
     rebuildRet = PurgMemBuildData_(purgObj);
     PM_HILOG_INFO_C(LOG_CORE, "%{public}s: purged, built %{public}s", __func__, rebuildRet ? "succ" : "fail");
     if (rebuildRet) {
-        goto succ;
+        return true;
     }
     /* data is purged and rebuild failed. return false */
     err = PMB_BUILD_ALL_FAIL;
@@ -350,12 +352,9 @@ bool PurgMemBeginWrite(struct PurgMem *purgObj)
         PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: wr unlock fail. %{public}d", __func__, rwlockRet);
     }
 
-uxpte_put:
     PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: %{public}s, return false, UxptePut.", __func__, GetPMStateName(err));
     UxptePut(purgObj->uxPageTable, (uint64_t)(purgObj->dataPtr), purgObj->dataSizeInput);
     return false;
-succ:
-    return true;
 }
 
 static inline void EndAccessPurgMem_(struct PurgMem *purgObj)
diff --git a/libpurgeablemem/common/include/pm_ptr_util.h b/libpurgeablemem/common/include/pm_ptr_util.h
index 6180d6a87c90add3d9ba29474a1db1d1633d4ea4..3151f19a12e2755f71347aad17417b7ff761ad46 100644
--- a/libpurgeablemem/common/include/pm_ptr_util.h
+++ b/libpurgeablemem/common/include/pm_ptr_util.h
@@ -26,11 +26,4 @@
         }                                              \
     } while (0)
 
-#define IF_NULL_LOG(pointer, log)                      \
-    do {                                               \
-        if (!(pointer)) {                              \
-            HILOG_ERROR(LOG_CORE, "%{public}s:", log); \
-        }                                              \
-    } while (0)
-
 #endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H */
diff --git a/libpurgeablemem/cpp/include/purgeable_ashmem.h b/libpurgeablemem/cpp/include/purgeable_ashmem.h
index 42435d8fc0e796eddca8da3f3081316d402c97c7..627e9b5bb0bd39a7a71435df0ddb18a0f384d68e 100644
--- a/libpurgeablemem/cpp/include/purgeable_ashmem.h
+++ b/libpurgeablemem/cpp/include/purgeable_ashmem.h
@@ -16,13 +16,14 @@
 #ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_ASHMEM_H
 #define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_ASHMEM_H
 
-#include <linux/ashmem.h>
 #include <memory>
 #include <shared_mutex>
 #include <string>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include <linux/ashmem.h>
+
 #include "ashmem.h"
 #include "purgeable_mem_builder.h"
 #include "purgeable_mem_base.h"
diff --git a/libpurgeablemem/cpp/src/purgeable_ashmem.cpp b/libpurgeablemem/cpp/src/purgeable_ashmem.cpp
index 42c4c48252cee8e49aca84c8c4b0e54ad7388571..70b438de040c6b895dd51b11d5cb0d686a6ba190 100644
--- a/libpurgeablemem/cpp/src/purgeable_ashmem.cpp
+++ b/libpurgeablemem/cpp/src/purgeable_ashmem.cpp
@@ -19,9 +19,10 @@
 #include "pm_util.h"
 #include "pm_state_c.h"
 #include "pm_smartptr_util.h"
-#include "purgeable_ashmem.h"
 #include "pm_log.h"
 
+#include "purgeable_ashmem.h"
+
 namespace OHOS {
 namespace PurgeableMem {
 #ifdef LOG_TAG
diff --git a/libpurgeablemem/cpp/src/purgeable_mem.cpp b/libpurgeablemem/cpp/src/purgeable_mem.cpp
index 55cccf52fc52c33ffa1730ac4802f9b3474b7c01..1ee83a07628925ebe67ea68a40fd5fc6275bd8d1 100644
--- a/libpurgeablemem/cpp/src/purgeable_mem.cpp
+++ b/libpurgeablemem/cpp/src/purgeable_mem.cpp
@@ -19,9 +19,10 @@
 #include "pm_util.h"
 #include "pm_state_c.h"
 #include "pm_smartptr_util.h"
-#include "purgeable_mem.h"
 #include "pm_log.h"
 
+#include "purgeable_mem.h"
+
 namespace OHOS {
 namespace PurgeableMem {
 #ifdef LOG_TAG
diff --git a/libpurgeablemem/cpp/src/purgeable_mem_base.cpp b/libpurgeablemem/cpp/src/purgeable_mem_base.cpp
index 65fef8ebc33ddc7e4ae515c9bbcbb54697a9c877..86b0bf219220572468b82d04239399cc3c40ff56 100644
--- a/libpurgeablemem/cpp/src/purgeable_mem_base.cpp
+++ b/libpurgeablemem/cpp/src/purgeable_mem_base.cpp
@@ -19,9 +19,10 @@
 #include "pm_util.h"
 #include "pm_state_c.h"
 #include "pm_smartptr_util.h"
-#include "purgeable_mem_base.h"
 #include "pm_log.h"
 
+#include "purgeable_mem_base.h"
+
 namespace OHOS {
 namespace PurgeableMem {
 #ifdef LOG_TAG
diff --git a/libpurgeablemem/test/purgeableashmem_test.cpp b/libpurgeablemem/test/purgeableashmem_test.cpp
index fc1a95d365b6fcd925dccfaae39d3164be285deb..2b6f2ace150ebb4e9ae88a83d09e9c7d1606b76a 100644
--- a/libpurgeablemem/test/purgeableashmem_test.cpp
+++ b/libpurgeablemem/test/purgeableashmem_test.cpp
@@ -15,15 +15,16 @@
 
 #include <cstdio>
 #include <cstring>
-#include <linux/ashmem.h>
 #include <memory>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <thread>
 #include <unistd.h>
 
-#include "ashmem.h"
+#include <linux/ashmem.h>
+
 #include "gtest/gtest.h"
+#include "ashmem.h"
 #include "purgeable_ashmem.h"
 #include "securec.h"