diff --git a/src/util/inc/tkvstore.h b/src/util/inc/tkvstore.h
index 36acb83f6900d1089280d2270397a9ae0d21834b..3a7deb8e5d0b27050a8ba5b3365f9de28441f134 100644
--- a/src/util/inc/tkvstore.h
+++ b/src/util/inc/tkvstore.h
@@ -21,8 +21,6 @@ extern "C" {
 
 #include <stdint.h>
 
-#define KVSTORE_FILE_VERSION ((uint32_t)0)
-
 typedef int (*iterFunc)(void *, void *cont, int contLen);
 typedef void (*afterFunc)(void *);
 
@@ -48,6 +46,7 @@ typedef struct {
 } SKVStore;
 
 #define KVSTORE_MAGIC(s) (s)->info.magic
+#define KVSTORE_FILE_VERSION ((uint32_t)0)
 
 int       tdCreateKVStore(char *fname);
 int       tdDestroyKVStore(char *fname);
diff --git a/src/util/src/tkvstore.c b/src/util/src/tkvstore.c
index 776c8bc23c02aeb1047e67dd666925fba59bc93e..fdd772f3ad42724d308cf7fe0c8e40f0f82304de 100644
--- a/src/util/src/tkvstore.c
+++ b/src/util/src/tkvstore.c
@@ -17,11 +17,6 @@
 
 #define TAOS_RANDOM_FILE_FAIL_TEST
 
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include "os.h"
 #include "hash.h"
 #include "taoserror.h"
@@ -33,7 +28,6 @@
 #define TD_KVSTORE_HEADER_SIZE 512
 #define TD_KVSTORE_MAJOR_VERSION 1
 #define TD_KVSTORE_MAINOR_VERSION 0
-#define TD_KVSTORE_SNAP_SUFFIX ".snap"
 #define TD_KVSTORE_NEW_SUFFIX ".new"
 #define TD_KVSTORE_INIT_MAGIC 0xFFFFFFFF