diff --git a/build-scripts/config_common.cmake b/build-scripts/config_common.cmake
index c7cfff842..df71198f1 100644
--- a/build-scripts/config_common.cmake
+++ b/build-scripts/config_common.cmake
@@ -321,10 +321,10 @@ endif()
 
 if (WAMR_ENABLE_COPY_CALLSTACK EQUAL 1)
   add_definitions (-DWAMR_ENABLE_COPY_CALLSTACK=1)
-  message("      Copy callstack enabled")
+  message("     Copy callstack enabled")
 else ()
   add_definitions (-DWAMR_ENABLE_COPY_CALLSTACK=0)
-  message("      Copy callstack disabled")
+  message("     Copy callstack disabled")
 endif()
 
 if (WAMR_BUILD_MEMORY64 EQUAL 1)
diff --git a/core/iwasm/aot/aot_runtime.c b/core/iwasm/aot/aot_runtime.c
index 0cd53e4a5..78b4b60f4 100644
--- a/core/iwasm/aot/aot_runtime.c
+++ b/core/iwasm/aot/aot_runtime.c
@@ -4111,11 +4111,11 @@ aot_copy_callstack_tiny_frame(WASMExecEnv *exec_env, wasm_frame_ptr_t buffer,
 {
     /*
      * Note for devs: please refrain from such modifications inside of
-     * aot_iterate_callstack_tiny_frame
+     * aot_copy_callstack_tiny_frame
      * - any allocations/freeing memory
      * - dereferencing any pointers other than: exec_env, exec_env->module_inst,
      * exec_env->module_inst->module, pointers between stack's bottom and
-     * top_boundary For more details check wasm_iterate_callstack in
+     * top_boundary For more details check wasm_copy_callstack in
      * wasm_export.h
      */
     uint8 *top_boundary = exec_env->wasm_stack.top_boundary;
@@ -4409,7 +4409,7 @@ aot_dump_call_stack(WASMExecEnv *exec_env, bool print, char *buf, uint32 len)
 
     return total_len + 1;
 }
-#endif /* end of WASM_ENABLE_DUMP_CALL_STACK != 0 && WASM_ENABLE_AOT_STACK_FRAME != 0 */
+#endif /* end of WASM_ENABLE_DUMP_CALL_STACK != 0 */
 
 #if WASM_ENABLE_PERF_PROFILING != 0
 void
diff --git a/core/iwasm/aot/aot_runtime.h b/core/iwasm/aot/aot_runtime.h
index 0cc66c4b6..764403f72 100644
--- a/core/iwasm/aot/aot_runtime.h
+++ b/core/iwasm/aot/aot_runtime.h
@@ -10,7 +10,6 @@
 #include "../common/wasm_runtime_common.h"
 #include "../interpreter/wasm_runtime.h"
 #include "../compilation/aot.h"
-#include "platform_common.h"
 #if WASM_ENABLE_GC != 0
 #include "gc_export.h"
 #endif
diff --git a/core/iwasm/common/wasm_runtime_common.c b/core/iwasm/common/wasm_runtime_common.c
index 8d04f3799..5ce16a14d 100644
--- a/core/iwasm/common/wasm_runtime_common.c
+++ b/core/iwasm/common/wasm_runtime_common.c
@@ -7,7 +7,6 @@
 #include "bh_common.h"
 #include "bh_assert.h"
 #include "bh_log.h"
-#include "platform_common.h"
 #include "wasm_export.h"
 #include "wasm_native.h"
 #include "wasm_runtime_common.h"
diff --git a/core/iwasm/common/wasm_runtime_common.h b/core/iwasm/common/wasm_runtime_common.h
index 19f11bd48..44406cdb4 100644
--- a/core/iwasm/common/wasm_runtime_common.h
+++ b/core/iwasm/common/wasm_runtime_common.h
@@ -8,7 +8,6 @@
 
 #include "bh_platform.h"
 #include "bh_common.h"
-#include "platform_common.h"
 #include "wasm_exec_env.h"
 #include "wasm_native.h"
 #include "../include/wasm_export.h"
diff --git a/core/iwasm/include/wasm_export.h b/core/iwasm/include/wasm_export.h
index 18a417cc9..a17f13f24 100644
--- a/core/iwasm/include/wasm_export.h
+++ b/core/iwasm/include/wasm_export.h
@@ -140,9 +140,7 @@ typedef struct wasm_frame_t {
     uint32_t *lp;
 } WASMCApiFrame;
 
-// #if WAMR_ENABLE_COPY_CALLSTACK != 0
 typedef struct wasm_frame_t *wasm_frame_ptr_t;
-// #endif // WAMR_ENABLE_COPY_CALLSTACK
 
 /* WASM section */
 typedef struct wasm_section_t {
@@ -883,7 +881,6 @@ WASM_RUNTIME_API_EXTERN void
 wasm_runtime_destroy_exec_env(wasm_exec_env_t exec_env);
 
 
-// #if WAMR_ENABLE_COPY_CALLSTACK != 0
 /**
  * @brief Copy callstack frames.
  *
@@ -910,7 +907,6 @@ wasm_runtime_destroy_exec_env(wasm_exec_env_t exec_env);
 WASM_RUNTIME_API_EXTERN uint32_t
 wasm_copy_callstack(const wasm_exec_env_t exec_env, wasm_frame_ptr_t buffer,
                        const uint32_t length, const uint32_t skip_n);
-// #endif
 
 /**
  * Get the singleton execution environment for the instance.