diff --git a/graphic/graphic_2d/native_buffer/buffer_common.h b/graphic/graphic_2d/native_buffer/buffer_common.h
index d67646240969ae66153afc1dcc5a2dcb1eaec1fe..20b22fd8733a829f2c4b6c2514bf6adba5b6cc54 100644
--- a/graphic/graphic_2d/native_buffer/buffer_common.h
+++ b/graphic/graphic_2d/native_buffer/buffer_common.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_BUFFER_COMMON_H_
-#define NDK_INCLUDE_BUFFER_COMMON_H_
-
 /**
  * @addtogroup OH_NativeBuffer
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_BUFFER_COMMON_H_
+#define NDK_INCLUDE_BUFFER_COMMON_H_
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/graphic/graphic_2d/native_buffer/native_buffer.h b/graphic/graphic_2d/native_buffer/native_buffer.h
index 154df76d3ea589a746fdd175691561d2b24969e2..2ca2fc617c5482e55e483e92061cbfa7f3f4bcd0 100644
--- a/graphic/graphic_2d/native_buffer/native_buffer.h
+++ b/graphic/graphic_2d/native_buffer/native_buffer.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_NATIVE_BUFFER_H_
-#define NDK_INCLUDE_NATIVE_BUFFER_H_
-
 /**
  * @addtogroup OH_NativeBuffer
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_NATIVE_BUFFER_H_
+#define NDK_INCLUDE_NATIVE_BUFFER_H_
+
 #include <stdint.h>
 #include <native_window/external_window.h>
 #include <native_buffer/buffer_common.h>
diff --git a/graphic/graphic_2d/native_image/native_image.h b/graphic/graphic_2d/native_image/native_image.h
index 795a30d826a4ac0a1d59e4862365f5b62a810857..42358fe82e72a4aea977f876135d5e589f9a3c5f 100644
--- a/graphic/graphic_2d/native_image/native_image.h
+++ b/graphic/graphic_2d/native_image/native_image.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_NATIVE_IMAGE_H_
-#define NDK_INCLUDE_NATIVE_IMAGE_H_
-
 /**
  * @addtogroup OH_NativeImage
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_NATIVE_IMAGE_H_
+#define NDK_INCLUDE_NATIVE_IMAGE_H_
+
 #include <stdint.h>
 
 #ifdef __cplusplus
diff --git a/graphic/graphic_2d/native_vsync/native_vsync.h b/graphic/graphic_2d/native_vsync/native_vsync.h
index 610fe1debc2c44e035005c71cd5a060d19a7eb2d..65890146c898b09dae63d6db9237f1b903a8e3e7 100644
--- a/graphic/graphic_2d/native_vsync/native_vsync.h
+++ b/graphic/graphic_2d/native_vsync/native_vsync.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_NATIVE_VSYNC_H_
-#define NDK_INCLUDE_NATIVE_VSYNC_H_
-
 /**
  * @addtogroup NativeVsync
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_NATIVE_VSYNC_H_
+#define NDK_INCLUDE_NATIVE_VSYNC_H_
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -118,4 +118,5 @@ int OH_NativeVSync_GetPeriod(OH_NativeVSync* nativeVsync, long long* period);
 }
 #endif
 
+/** @} */
 #endif
\ No newline at end of file
diff --git a/graphic/graphic_2d/native_window/buffer_handle.h b/graphic/graphic_2d/native_window/buffer_handle.h
index a5e3a13cfb1f06aba4b3abd67eb1c413711d8e32..441af5e75b8082b30b22356e8ecde1dd01e1169a 100644
--- a/graphic/graphic_2d/native_window/buffer_handle.h
+++ b/graphic/graphic_2d/native_window/buffer_handle.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef INCLUDE_BUFFER_HANDLE_H
-#define INCLUDE_BUFFER_HANDLE_H
-
 /**
  * @addtogroup NativeWindow
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef INCLUDE_BUFFER_HANDLE_H
+#define INCLUDE_BUFFER_HANDLE_H
+
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -65,4 +65,5 @@ typedef struct {
 }
 #endif
 
+/** @} */
 #endif // INCLUDE_BUFFER_HANDLE_H
diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h
index 47a407ff05225dd1fc88e4b1e65926874ee83347..54ae4efe5b71ba9d00ec417efc9601c13f73b06d 100644
--- a/graphic/graphic_2d/native_window/external_window.h
+++ b/graphic/graphic_2d/native_window/external_window.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_EXTERNAL_NATIVE_WINDOW_H_
-#define NDK_INCLUDE_EXTERNAL_NATIVE_WINDOW_H_
-
 /**
  * @addtogroup NativeWindow
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_EXTERNAL_NATIVE_WINDOW_H_
+#define NDK_INCLUDE_EXTERNAL_NATIVE_WINDOW_H_
+
 #include <stdint.h>
 #include "buffer_handle.h"
 #include "../native_buffer/buffer_common.h"
diff --git a/graphic/graphic_2d/native_window/graphic_error_code.h b/graphic/graphic_2d/native_window/graphic_error_code.h
index 1b5e9deb0166e9817bf5cf1f8a600f73ef53c5dd..1c16d7b95f1dcfb94a261dcb4f059e3264c744fd 100644
--- a/graphic/graphic_2d/native_window/graphic_error_code.h
+++ b/graphic/graphic_2d/native_window/graphic_error_code.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef INCLUDE_GRAPHIC_ERROR_CODE_H
-#define INCLUDE_GRAPHIC_ERROR_CODE_H
-
 /**
  * @addtogroup NativeWindow
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef INCLUDE_GRAPHIC_ERROR_CODE_H
+#define INCLUDE_GRAPHIC_ERROR_CODE_H
+
 #include <stdint.h>
 
 #ifdef __cplusplus