diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index e1123b91785328429c37147b2590531cfee91ea7..f60861a349d70312a7b26bcc1922319b0ad4953f 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -27,7 +27,7 @@ extern "C" {
 #include "textbuffer.h"
 #include "tscSecondaryMerge.h"
 #include "tsclient.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 #define UTIL_METER_IS_SUPERTABLE(metaInfo) \
   (((metaInfo)->pMeterMeta != NULL) && ((metaInfo)->pMeterMeta->tableType == TSDB_TABLE_TYPE_SUPER_TABLE))
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 7220a343598313a2be727159e75b5139af1701f7..3720a09459af4d0275a5c409c5eb5057dcfe3c81 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -27,7 +27,7 @@ extern "C" {
 #include "tlog.h"
 #include "tscCache.h"
 #include "tscSQLParser.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsqlfunction.h"
 #include "tutil.h"
 
diff --git a/src/client/src/tscAst.c b/src/client/src/tscAst.c
index cf0873b5b620ddc118863e3c2cae86080f1d481f..c740f65dcf40173385de3286db5b47e515d5d531 100644
--- a/src/client/src/tscAst.c
+++ b/src/client/src/tscAst.c
@@ -20,7 +20,7 @@
 #include "tscSQLParser.h"
 #include "tscSyntaxtreefunction.h"
 #include "tschemautil.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tskiplist.h"
 #include "tsqldef.h"
 #include "tsqlfunction.h"
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 6c685b06b4e109cee43262a2ae382f56c495d9ce..e07f459cf4575a0b3c7ae0b2df6668cb2dd9c108 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -18,7 +18,7 @@
 #include "tcache.h"
 #include "tlog.h"
 #include "trpc.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsocket.h"
 #include "tsystem.h"
 #include "ttime.h"
diff --git a/src/dnode/inc/dnodeVnodeMgmt.h b/src/dnode/inc/dnodeVnodeMgmt.h
index 9c677ba9e0f3e6f05062de0d6580918c248ce6ea..137461607e72390793677d92e50a11d35f9abea4 100644
--- a/src/dnode/inc/dnodeVnodeMgmt.h
+++ b/src/dnode/inc/dnodeVnodeMgmt.h
@@ -22,7 +22,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "taosmsg.h"
 
 /*
diff --git a/src/dnode/src/dnodeService.c b/src/dnode/src/dnodeService.c
index 6a0dfdb63a1ef4b1c3548ec66c8d66f7b7572eea..763422b1dd2a9a7c41eb692245a4339c62dc65d9 100644
--- a/src/dnode/src/dnodeService.c
+++ b/src/dnode/src/dnodeService.c
@@ -16,7 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tglobalcfg.h"
-#include "tsdb.h"
 #include "vnode.h"
 #include "dnodeSystem.h"
 
diff --git a/src/dnode/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c
index 7b2a273a14fb7cd2e700a20c1b435227d66221dd..1203e15ed4b0a882c1ae426f3a5ecf97ca88b71f 100644
--- a/src/dnode/src/dnodeSystem.c
+++ b/src/dnode/src/dnodeSystem.c
@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tlog.h"
 #include "ttimer.h"
 #include "dnode.h"
diff --git a/src/inc/mnode.h b/src/inc/mnode.h
index 4d7591fdd3b0d94da8a09ea6eeeab810727533fd..101df94805670749006bbba898b9b349cb3c503c 100644
--- a/src/inc/mnode.h
+++ b/src/inc/mnode.h
@@ -34,7 +34,7 @@ extern "C" {
 #include "tlog.h"
 #include "tmempool.h"
 #include "trpc.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tskiplist.h"
 #include "tsocket.h"
 #include "ttime.h"
diff --git a/src/inc/sdb.h b/src/inc/sdb.h
index 636a7642376d926d0384260712f23caac7932cd6..7316fd7ef5275b8edc4a2a32ae6aaa543e78a9bd 100644
--- a/src/inc/sdb.h
+++ b/src/inc/sdb.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 #include "taosmsg.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 extern uint16_t    tsMgmtMgmtPort;
 extern uint16_t    tsMgmtSyncPort;
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index f6e117d426b6a50143ff1fdd99515ba75cd138ab..98f82b2e722f6122b277ffcc99329e8c8168cb15 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -23,7 +23,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "taoserror.h"
 #include "taosdef.h"
 
diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h
index 0c8153e3ab615b2ecc33bbc815cc38552967c393..0315aa1b277a460ebce32107a9a76d2fc24f34a8 100644
--- a/src/kit/shell/inc/shell.h
+++ b/src/kit/shell/inc/shell.h
@@ -19,7 +19,7 @@
 #include "stdbool.h"
 #include "taos.h"
 #include "tlog.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "stdbool.h"
 
 #define MAX_USERNAME_SIZE      64
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index 8cf015b342649ff4e099a51a2c4b7fe841da3db3..a7a8da24799b975fbd06e19dff7a49b236aa428a 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -32,7 +32,7 @@
 #include "taosmsg.h"
 #include "tglobalcfg.h"
 #include "tsclient.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 #define COMMAND_SIZE 65536
diff --git a/src/mnode/src/mgmtSystem.c b/src/mnode/src/mgmtSystem.c
index 3ed29fdd0912d9483cdc404d59e315f38ac22b68..f63215ce1b192316c7b314e75788af8fcdb5495a 100644
--- a/src/mnode/src/mgmtSystem.c
+++ b/src/mnode/src/mgmtSystem.c
@@ -29,7 +29,7 @@
 #include "mgmtTable.h"
 #include "mgmtShell.h"
 #include "dnodeModule.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 // global, not configurable
 char               mgmtDirectory[128];
diff --git a/src/modules/http/inc/httpHandle.h b/src/modules/http/inc/httpHandle.h
index 1b746e15200e1dfa7f0b5dcfc0054120c94aee56..c564337187088b9ced276984c1a5cdec210c6af8 100644
--- a/src/modules/http/inc/httpHandle.h
+++ b/src/modules/http/inc/httpHandle.h
@@ -20,7 +20,7 @@
 #include "pthread.h"
 #include "semaphore.h"
 #include "tmempool.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tutil.h"
 #include "zlib.h"
 
diff --git a/src/modules/http/src/gcHandle.c b/src/modules/http/src/gcHandle.c
index eb0c6223a7f8c6d0ae1e980646695a074959730b..2ba8250eac781fa636ba07f512f634e45e5f2094 100644
--- a/src/modules/http/src/gcHandle.c
+++ b/src/modules/http/src/gcHandle.c
@@ -16,7 +16,7 @@
 #include "gcHandle.h"
 #include "cJSON.h"
 #include "gcJson.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest};
 static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL};
diff --git a/src/modules/http/src/tgHandle.c b/src/modules/http/src/tgHandle.c
index b9adf5416274d8f380d8b00a033f2d83fa249084..9004dc473774b7991bcf82ebd9261136d5570d6b 100644
--- a/src/modules/http/src/tgHandle.c
+++ b/src/modules/http/src/tgHandle.c
@@ -17,7 +17,7 @@
 #include "shash.h"
 #include "taosmsg.h"
 #include "tgJson.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 /*
  * taos.telegraf.cfg formats like
diff --git a/src/modules/monitor/src/monitorSystem.c b/src/modules/monitor/src/monitorSystem.c
index 649b1a3baae8f78b183fb29a41026105065f0b69..d3bff0e281d675fa230e0a49d9064ef4df442b44 100644
--- a/src/modules/monitor/src/monitorSystem.c
+++ b/src/modules/monitor/src/monitorSystem.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include "monitorSystem.h"
 #include "tsclient.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsystem.h"
 #include "ttime.h"
 #include "ttimer.h"
diff --git a/src/os/darwin/src/tdarwin.c b/src/os/darwin/src/tdarwin.c
index af3b1bd8a50d9f52d5f81f4dd42f483c510866c9..ff9576542f2bda45db0d016d27a6957e0fd19c9a 100644
--- a/src/os/darwin/src/tdarwin.c
+++ b/src/os/darwin/src/tdarwin.c
@@ -30,7 +30,7 @@
 
 #include "tglobalcfg.h"
 #include "tlog.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 char configDir[TSDB_FILENAME_LEN] = "/etc/taos";
diff --git a/src/os/linux/CMakeLists.txt b/src/os/linux/CMakeLists.txt
index a702cac759a3dea135da05689118b763631e83f9..d5a736ce2e4305ffb066c78fe102497ecf2386ae 100644
--- a/src/os/linux/CMakeLists.txt
+++ b/src/os/linux/CMakeLists.txt
@@ -2,9 +2,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
 IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+  INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)
+
   ADD_LIBRARY(os ${SRC})
   TARGET_LINK_LIBRARIES(os m rt)
 ENDIF ()
diff --git a/src/os/linux/inc/os.h b/src/os/linux/inc/os.h
index aa54a3563ec08b2c83d7dd34db427399cfa93a3e..d3c401e3cfc3d4e6ee1d1ebca4baa6b7752355ba 100644
--- a/src/os/linux/inc/os.h
+++ b/src/os/linux/inc/os.h
@@ -77,7 +77,6 @@ extern "C" {
 #include <wctype.h>
 #include <inttypes.h>
 
-
 #define taosCloseSocket(x) \
   {                        \
     if (FD_VALID(x)) {     \
diff --git a/src/os/linux/src/tlinux.c b/src/os/linux/src/tlinux.c
index b81b98a5f7fb9cea96879c570a05fbca8e4e74b5..98faffdfd27fb0dbdbd641141a2f8ec99ead3f49 100644
--- a/src/os/linux/src/tlinux.c
+++ b/src/os/linux/src/tlinux.c
@@ -30,7 +30,7 @@
 
 #include "tglobalcfg.h"
 #include "tlog.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tutil.h"
 #include "ttimer.h"
 
diff --git a/src/os/windows/src/twindows.c b/src/os/windows/src/twindows.c
index 30973165dfd03f6179f4fc36a83c4b4a32ed3e55..15e42d8948faf30c7f4462479fc5e2eed549ff50 100644
--- a/src/os/windows/src/twindows.c
+++ b/src/os/windows/src/twindows.c
@@ -25,7 +25,7 @@
 
 #include "os.h"
 #include "tlog.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tglobalcfg.h"
 
 #include <intrin.h>
diff --git a/src/rpc/inc/ttcpclient.h b/src/rpc/inc/ttcpclient.h
index 8427c6f162fa0906af0c51e9ff49ad7e85c4b5a5..1246b2560ef4e135bdc92e9eb7e34e6a2676d450 100644
--- a/src/rpc/inc/ttcpclient.h
+++ b/src/rpc/inc/ttcpclient.h
@@ -16,7 +16,7 @@
 #ifndef _taos_tcp_client_header_
 #define _taos_tcp_client_header_
 
-#include "tsdb.h"
+#include "taosdef.h"
 
 void *taosInitTcpClient(char *ip, uint16_t port, char *label, int num, void *fp, void *shandle);
 void taosCleanUpTcpClient(void *chandle);
diff --git a/src/rpc/inc/ttcpserver.h b/src/rpc/inc/ttcpserver.h
index ba3bd25719f05372ab97b1dc67a92d244e03ae64..b62949e73e8ca38503eb1d2fb46e5cbdfd3042ef 100644
--- a/src/rpc/inc/ttcpserver.h
+++ b/src/rpc/inc/ttcpserver.h
@@ -16,7 +16,7 @@
 #ifndef _taos_tcp_server_header_
 #define _taos_tcp_server_header_
 
-#include "tsdb.h"
+#include "taosdef.h"
 
 void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle);
 void taosCleanUpTcpServer(void *param);
diff --git a/src/rpc/inc/tudp.h b/src/rpc/inc/tudp.h
index 27c7593090d89d34b77ba34cf6c2f8b8366f2bd6..647d54badeed8ea08336fff113d56168df662f9e 100644
--- a/src/rpc/inc/tudp.h
+++ b/src/rpc/inc/tudp.h
@@ -16,7 +16,7 @@
 #ifndef _taos_udp_header_
 #define _taos_udp_header_
 
-#include "tsdb.h"
+#include "taosdef.h"
 
 void *taosInitUdpServer(char *ip, uint16_t port, char *label, int, void *fp, void *shandle);
 void *taosInitUdpClient(char *ip, uint16_t port, char *label, int, void *fp, void *shandle);
diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c
index 379925a6bf419ca883c26fbc4b332859784a5a22..fe2ed91ce38762b1ba3c4790c520d6df5beaceaa 100755
--- a/src/rpc/src/trpc.c
+++ b/src/rpc/src/trpc.c
@@ -21,7 +21,7 @@
 #include "tmd5.h"
 #include "tmempool.h"
 #include "trpc.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsocket.h"
 #include "ttcpclient.h"
 #include "ttcpserver.h"
diff --git a/src/sdb/src/hashint.c b/src/sdb/src/hashint.c
index c99a5aff737f8c08724358ab7e9ea43e480f40fd..87a6da4fa8c7f4748d0b08f3bb59603fdba93ab9 100644
--- a/src/sdb/src/hashint.c
+++ b/src/sdb/src/hashint.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include "tmempool.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 typedef struct _long_hash_t {
   uint32_t             key;
diff --git a/src/sdb/src/hashstr.c b/src/sdb/src/hashstr.c
index c34d61f1deed689bd77fbc10453da92072d50234..d87e605176700bc77dedbd2d052b45e4a7d6b7d6 100644
--- a/src/sdb/src/hashstr.c
+++ b/src/sdb/src/hashstr.c
@@ -14,7 +14,7 @@
  */
 
 #include "os.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 #define MAX_STR_LEN 40
 
diff --git a/src/util/inc/tglobalcfg.h b/src/util/inc/tglobalcfg.h
index 243835bacd22c74ebffa88e49bfe0184806de8c1..6448e379b9dd9e4f78bd3574ae30652751ce6736 100644
--- a/src/util/inc/tglobalcfg.h
+++ b/src/util/inc/tglobalcfg.h
@@ -22,7 +22,7 @@ extern "C" {
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "tsdb.h"
+#include "taosdef.h"
 
 extern int  (*startMonitor)();
 extern void (*stopMonitor)();
diff --git a/src/util/inc/tscompression.h b/src/util/inc/tscompression.h
index 71c25eed3f6ce1b114e58ec664117ec8af0ae6e4..55e282296fac6d179580c53f5384136f2ef290c5 100644
--- a/src/util/inc/tscompression.h
+++ b/src/util/inc/tscompression.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include "tsdb.h"
+#include "taosdef.h"
 
 #define BITS_PER_BYTE 8
 // Masks
diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h
index b66da286973521c1e6cd29db2b2923cfc371be58..04b2b32f69eec01dde55e4631c4998bf4be83c11 100644
--- a/src/util/inc/tutil.h
+++ b/src/util/inc/tutil.h
@@ -23,7 +23,7 @@ extern "C" {
 #include "os.h"
 #include "tmd5.h"
 #include "tcrc32c.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 #ifndef STDERR_FILENO
 #define STDERR_FILENO (2)
diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c
index 0f0c7bed347fce36ea8054ce523619998a1f6327..1592a47c1597c53336d46d65e946b1a400b447f0 100644
--- a/src/util/src/tcompression.c
+++ b/src/util/src/tcompression.c
@@ -50,7 +50,7 @@
 #include "os.h"
 #include "lz4.h"
 #include "tscompression.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "ttypes.h"
 
 const int TEST_NUMBER = 1;
diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c
index 45efcad56394b1507c60d383a60199d0b96afb02..c07268aa1eaeae3cbf49af8b30471093905f7ed1 100644
--- a/src/util/src/tglobalcfg.c
+++ b/src/util/src/tglobalcfg.c
@@ -19,7 +19,7 @@
 #include "tglobalcfg.h"
 #include "tkey.h"
 #include "tlog.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsocket.h"
 #include "tsystem.h"
 #include "tutil.h"
diff --git a/src/util/src/thistogram.c b/src/util/src/thistogram.c
index 93046cf796220c1d0fb2a64d1b3501f254ea351d..b603163b399eb0af3194576fefe4b390c2ec2ccd 100644
--- a/src/util/src/thistogram.c
+++ b/src/util/src/thistogram.c
@@ -17,7 +17,7 @@
 #include "taosmsg.h"
 #include "thistogram.h"
 #include "tlosertree.h"
-#include "tsdb.h"
+#include "taosdef.h"
 
 /**
  *
diff --git a/src/util/src/tmd5.c b/src/util/src/tmd5.c
index 90b41dacf40c79b0ab3d173368943fd786c15270..4971ed7a1200d9fb69fb1b49746414ed792d5079 100644
--- a/src/util/src/tmd5.c
+++ b/src/util/src/tmd5.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "tsdb.h"
+#include "taosdef.h"
 
 /* forward declaration */
 static void Transform(uint32_t *buf, uint32_t *in);
diff --git a/src/util/src/tpercentile.c b/src/util/src/tpercentile.c
index b3c09033b4d48f5d00d2ad3deafea6d29e1be3ec..a5c074839cf540da206d987daaab248e1b911e7c 100644
--- a/src/util/src/tpercentile.c
+++ b/src/util/src/tpercentile.c
@@ -16,7 +16,7 @@
 #include "os.h"
 
 #include "taosmsg.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tlog.h"
 #include "ttypes.h"
 #include "tpercentile.h"
diff --git a/src/util/src/tskiplist.c b/src/util/src/tskiplist.c
index 01c91b6c6565e1dc2b0b1cd20eb8c7324eb70ea4..69a714425375fa7f3771ce6ce4009add77da9ded 100644
--- a/src/util/src/tskiplist.c
+++ b/src/util/src/tskiplist.c
@@ -15,7 +15,7 @@
 #include "os.h"
 
 #include "tlog.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tskiplist.h"
 #include "tutil.h"
 
diff --git a/src/util/src/ttime.c b/src/util/src/ttime.c
index 65c5d0ea4c86f2cd05628bbc2f9e35da89d0d7c6..015cb19606ff11b5ddb857a1fc11299f224afd16 100644
--- a/src/util/src/ttime.c
+++ b/src/util/src/ttime.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "ttime.h"
 #include "tutil.h"
 
diff --git a/src/util/src/ttypes.c b/src/util/src/ttypes.c
index ae994cb77b7cdb27f3e857115d6d1db7df9bd9b0..86fa7cd5f8c7fb0b66062c6d358fcabdb5fe7c9f 100644
--- a/src/util/src/ttypes.c
+++ b/src/util/src/ttypes.c
@@ -14,7 +14,7 @@
  */
 #include "os.h"
 #include "taos.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsqldef.h"
 #include "ttypes.h"
 #include "tutil.h"
diff --git a/src/vnode/common/inc/vnodePeer.h b/src/vnode/common/inc/vnodePeer.h
index becf9bae394fb44da3c8c5f58a97983293a98e1f..6c69326fbcc08f6120c347f6c395117f38600653 100644
--- a/src/vnode/common/inc/vnodePeer.h
+++ b/src/vnode/common/inc/vnodePeer.h
@@ -22,7 +22,7 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "tsdb.h"
+#include "taosdef.h"
 
 /*
  * Initialize the resources
diff --git a/src/vnode/detail/inc/vnode.h b/src/vnode/detail/inc/vnode.h
index 13831d17bdfd2ebbc376f11a6f747ae380600a2d..158f4b2479f7be81a4de933cc6ea98b568bcc84d 100644
--- a/src/vnode/detail/inc/vnode.h
+++ b/src/vnode/detail/inc/vnode.h
@@ -28,7 +28,7 @@ extern "C" {
 #include "tmempool.h"
 #include "trpc.h"
 #include "tsclient.h"
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsocket.h"
 #include "ttime.h"
 #include "ttimer.h"
diff --git a/src/vnode/detail/src/vnodeCommit.c b/src/vnode/detail/src/vnodeCommit.c
index a650376afac0615c1966e6c0181adfdf41910329..a43ad3728a7d95b918c14eab60a80a9b6abfc3dc 100644
--- a/src/vnode/detail/src/vnodeCommit.c
+++ b/src/vnode/detail/src/vnodeCommit.c
@@ -16,7 +16,7 @@
 #define _GNU_SOURCE /* See feature_test_macros(7) */
 #include "os.h"
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "vnode.h"
 #include "vnodeUtil.h"
 #include "vnodeStatus.h"
diff --git a/src/vnode/detail/src/vnodeTagMgmt.c b/src/vnode/detail/src/vnodeTagMgmt.c
index 5585813ec377571f8415ba6b949bb158285b1d3e..d3e22ec00adfbf418264888ea01a4940723df2a6 100644
--- a/src/vnode/detail/src/vnodeTagMgmt.c
+++ b/src/vnode/detail/src/vnodeTagMgmt.c
@@ -16,7 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tlog.h"
 #include "tutil.h"
 #include "taosmsg.h"
diff --git a/src/vnode/tsdb/inc/tsdbMeta.h b/src/vnode/tsdb/inc/tsdbMeta.h
index dc697d52fe3feba25fbbe587e61c1336c644895d..28bafa1dc8a8b426edca2e4a0397d23676d1b1ec 100644
--- a/src/vnode/tsdb/inc/tsdbMeta.h
+++ b/src/vnode/tsdb/inc/tsdbMeta.h
@@ -4,7 +4,7 @@
 
 #include <pthread.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 
 // Initially, there are 4 tables
 #define TSDB_INIT_NUMBER_OF_SUPER_TABLE 4
diff --git a/src/vnode/tsdb/src/tsdb.c b/src/vnode/tsdb/src/tsdb.c
index a50c674001902f0b0a1a6e2e988d8e55d1ee79a5..d0087945240e8ac83befb1a5fb45a7a4c3aa41ed 100644
--- a/src/vnode/tsdb/src/tsdb.c
+++ b/src/vnode/tsdb/src/tsdb.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 // #include "disk.h"
 #include "tsdbCache.h"
 #include "tsdbMeta.h"
diff --git a/src/vnode/tsdb/src/tsdbMeta.c b/src/vnode/tsdb/src/tsdbMeta.c
index a5e4025108bdaba6750b491f32f3cc6bf4445123..5bc82dfa103056e58abe3746460503d85b8e824c 100644
--- a/src/vnode/tsdb/src/tsdbMeta.c
+++ b/src/vnode/tsdb/src/tsdbMeta.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include "tsdb.h"
+#include "taosdef.h"
 #include "tsdbMeta.h"
 
 SMetaHandle *tsdbCreateMetaHandle(int32_t numOfTables) {