diff --git a/config b/config
index 0ff846bbb..1a62b68a2 100644
--- a/config
+++ b/config
@@ -129,6 +129,7 @@ NGX_WASMX_INCS="\
     $ngx_addon_dir/src/common \
     $ngx_addon_dir/src/common/proxy_wasm \
     $ngx_addon_dir/src/common/shm \
+    $ngx_addon_dir/src/common/metrics \
     $ngx_addon_dir/src/common/lua"
 
 NGX_WASMX_DEPS="\
@@ -142,7 +143,7 @@ NGX_WASMX_DEPS="\
     $ngx_addon_dir/src/common/shm/ngx_wasm_shm.h \
     $ngx_addon_dir/src/common/shm/ngx_wasm_shm_kv.h \
     $ngx_addon_dir/src/common/shm/ngx_wasm_shm_queue.h \
-    $ngx_addon_dir/src/common/ngx_wa_metrics.h"
+    $ngx_addon_dir/src/common/metrics/ngx_wa_metrics.h"
 
 NGX_WASMX_SRCS="\
     $ngx_addon_dir/src/ngx_wasmx.c \
@@ -157,7 +158,7 @@ NGX_WASMX_SRCS="\
     $ngx_addon_dir/src/common/shm/ngx_wasm_shm.c \
     $ngx_addon_dir/src/common/shm/ngx_wasm_shm_kv.c \
     $ngx_addon_dir/src/common/shm/ngx_wasm_shm_queue.c \
-    $ngx_addon_dir/src/common/ngx_wa_metrics.c"
+    $ngx_addon_dir/src/common/metrics/ngx_wa_metrics.c"
 
 # wasm
 
diff --git a/src/common/ngx_wa_metrics.c b/src/common/metrics/ngx_wa_metrics.c
similarity index 99%
rename from src/common/ngx_wa_metrics.c
rename to src/common/metrics/ngx_wa_metrics.c
index e57da54f2..0b591a734 100644
--- a/src/common/ngx_wa_metrics.c
+++ b/src/common/metrics/ngx_wa_metrics.c
@@ -3,8 +3,6 @@
 #endif
 #include "ddebug.h"
 
-#include <math.h>
-#include <ngx_event.h>
 #include <ngx_wasm.h>
 #include <ngx_wa_metrics.h>
 
diff --git a/src/common/ngx_wa_metrics.h b/src/common/metrics/ngx_wa_metrics.h
similarity index 97%
rename from src/common/ngx_wa_metrics.h
rename to src/common/metrics/ngx_wa_metrics.h
index 65ca87c0d..b325a9d28 100644
--- a/src/common/ngx_wa_metrics.h
+++ b/src/common/metrics/ngx_wa_metrics.h
@@ -2,8 +2,6 @@
 #define _NGX_WA_METRICS_H_INCLUDED_
 
 
-#include <ngx_core.h>
-#include <ngx_wrt.h>
 #include <ngx_wasm_shm_kv.h>