diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb94ef758089e791f0c345031d21a1a4a118aa50..e1fbefaf71e3a314d645434400fd7eb5bb78dcf1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,8 +7,8 @@ ADD_SUBDIRECTORY(thirdparty)
 
 ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(util)
-# ADD_SUBDIRECTORY(rpc)
-# ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(rpc)
+ADD_SUBDIRECTORY(client)
 # ADD_SUBDIRECTORY(kit)
 # ADD_SUBDIRECTORY(plugins)
 # ADD_SUBDIRECTORY(sdb)
diff --git a/src/client/inc/tscSQLParser.h b/src/client/inc/tscSQLParser.h
index 87c193de75a81c690a2580c220e13212b3b4b384..c7f8ba06e8fc20ea4be57784861ad86b4089aad2 100644
--- a/src/client/inc/tscSQLParser.h
+++ b/src/client/inc/tscSQLParser.h
@@ -23,7 +23,7 @@ extern "C" {
 #include "taos.h"
 #include "taosmsg.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tvariant.h"
 #include "qsqlparser.h"
 
diff --git a/src/client/src/tscFunctionImpl.c b/src/client/src/tscFunctionImpl.c
index 88b1fc0c28157f9023a3fbef62dabc05802cf05c..9c4f7e9c55b315263edaa4bbcadef11b6089593f 100644
--- a/src/client/src/tscFunctionImpl.c
+++ b/src/client/src/tscFunctionImpl.c
@@ -25,7 +25,7 @@
 #include "tscompression.h"
 #include "tsqlfunction.h"
 #include "ttime.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 #include "tpercentile.h"
 
diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index ab57719d0979d4994e2c5ee913f21d320ca21561..89b43816c86db232b2d48de86a839bc958296b38 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -19,7 +19,7 @@
 #include "tcache.h"
 #include "tscUtil.h"
 #include "tsclient.h"
-#include "ttypes.h"
+#include "taosdef.h"
 
 #include "textbuffer.h"
 #include "tscSecondaryMerge.h"
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index b54600f6412f84c67b892fd228d10d0380e5f948..4c9f99b93235f38cfd995dc822e2ceef2ee1a325 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -25,7 +25,7 @@
 #include "tschemautil.h"
 #include "tsclient.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 
 #include "tlog.h"
 #include "tstoken.h"
diff --git a/src/client/src/tscSchemaUtil.c b/src/client/src/tscSchemaUtil.c
index 250e296e5345845152534c692f5a28020e22748f..d412ac18c86988665a2f5a1e1dad688d4bc45700 100644
--- a/src/client/src/tscSchemaUtil.c
+++ b/src/client/src/tscSchemaUtil.c
@@ -17,7 +17,7 @@
 #include "taosmsg.h"
 #include "tschemautil.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 bool isValidSchema(struct SSchema* pSchema, int32_t numOfCols) {
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index a4a589d55ccd77d61e389efddcb4a6f7e80b7302..61fdb424e54435ce7dfa04b71219093d97e89bc7 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -21,7 +21,7 @@
 #include "shellCommand.h"
 #include "ttime.h"
 #include "tutil.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "taoserror.h"
 
 #include <regex.h>
diff --git a/src/query/inc/tast.h b/src/query/inc/tast.h
index 3cb483a91b134fe3301533d0360174d250fba578..1e89ffb49dbc0667dd25d7d8b32646a155bcb016 100644
--- a/src/query/inc/tast.h
+++ b/src/query/inc/tast.h
@@ -23,7 +23,7 @@ extern "C" {
 #include "os.h"
 
 #include "taosmsg.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tvariant.h"
 
 struct tSQLBinaryExpr;
diff --git a/src/query/inc/tsqlfunction.h b/src/query/inc/tsqlfunction.h
index dc5f284efab09c0b54e2366e7b11ed055fa14cc4..27bce71300ccf17743eaa50d64a975b624bde5d2 100644
--- a/src/query/inc/tsqlfunction.h
+++ b/src/query/inc/tsqlfunction.h
@@ -24,7 +24,7 @@ extern "C" {
 #include <stdint.h>
 
 #include "trpc.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tvariant.h"
 
 #define TSDB_FUNC_INVALID_ID  -1
diff --git a/src/query/inc/tvariant.h b/src/query/inc/tvariant.h
index f54a3a434827aea2e4b0685bb0b4df345d263dae..7ed5aa8dbe1243633e3b256a173dd61f217038fb 100644
--- a/src/query/inc/tvariant.h
+++ b/src/query/inc/tvariant.h
@@ -16,6 +16,8 @@
 #ifndef TDENGINE_TVARIANT_H
 #define TDENGINE_TVARIANT_H
 
+#include "tstoken.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/query/src/textbuffer.c b/src/query/src/textbuffer.c
index 8ce090d335ea8105d22d2342de9d9a3e61b4592f..056fe808588e673126081355ca31020f672ab368 100644
--- a/src/query/src/textbuffer.c
+++ b/src/query/src/textbuffer.c
@@ -19,7 +19,7 @@
 #include "tlog.h"
 #include "tsqlfunction.h"
 #include "ttime.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 #define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \
diff --git a/src/query/src/tinterpolation.c b/src/query/src/tinterpolation.c
index cb7c8854ce914d22680db5429871857ac445f1fe..1a9da44788f5c9bc5a066bd927beaefd0f58ea34 100644
--- a/src/query/src/tinterpolation.c
+++ b/src/query/src/tinterpolation.c
@@ -18,7 +18,7 @@
 #include "textbuffer.h"
 #include "tinterpolation.h"
 #include "tsqlfunction.h"
-#include "ttypes.h"
+#include "taosdef.h"
 
 #define INTERPOL_IS_ASC_INTERPOL(interp) ((interp)->order == TSQL_SO_ASC)
 
diff --git a/src/query/src/tpercentile.c b/src/query/src/tpercentile.c
index a5c074839cf540da206d987daaab248e1b911e7c..6e1c28c516ce08e233b7c9afa418e571bd94e051 100644
--- a/src/query/src/tpercentile.c
+++ b/src/query/src/tpercentile.c
@@ -18,7 +18,7 @@
 #include "taosmsg.h"
 #include "taosdef.h"
 #include "tlog.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tpercentile.h"
 
 tExtMemBuffer *releaseBucketsExceptFor(tMemBucket *pMemBucket, int16_t segIdx, int16_t slotIdx) {
diff --git a/src/query/src/tscAst.c b/src/query/src/tscAst.c
index 70fda9bd9360a1d9715fac5b904a72078610762e..7be583a5ea1c59bae4065185e39e22b2d0d75dd1 100644
--- a/src/query/src/tscAst.c
+++ b/src/query/src/tscAst.c
@@ -24,7 +24,7 @@
 #include "tsqlfunction.h"
 #include "tstoken.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 #include "qsqlparser.h"
 
diff --git a/src/query/src/tscSQLParserImpl.c b/src/query/src/tscSQLParserImpl.c
index 0a76b867f29780a7af3f381237c28ced03d9354d..e4067d470fc93617f93623aafc7a59138090d7c0 100644
--- a/src/query/src/tscSQLParserImpl.c
+++ b/src/query/src/tscSQLParserImpl.c
@@ -22,7 +22,7 @@
 #include "tstoken.h"
 #include "ttime.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 int32_t tSQLParse(SSqlInfo *pSQLInfo, const char *pStr) {
diff --git a/src/query/src/tscSyntaxtreefunction.c b/src/query/src/tscSyntaxtreefunction.c
index 3fe43d9c1ef35e9f073c67b72047ef932d256c11..e3c00ed59d1da9ee6e042f748a6bf6f586f8bd2f 100644
--- a/src/query/src/tscSyntaxtreefunction.c
+++ b/src/query/src/tscSyntaxtreefunction.c
@@ -16,7 +16,7 @@
 #include "os.h"
 
 #include "tscSyntaxtreefunction.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 #define ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, op, _res_type, _ord)     \
diff --git a/src/query/src/ttokenizer.c b/src/query/src/ttokenizer.c
index c53debcb455d05cf8852769e4cac5f0e7be30ebb..f43d344ca3aeb82b45c15d6eea399f22c12392c1 100644
--- a/src/query/src/ttokenizer.c
+++ b/src/query/src/ttokenizer.c
@@ -19,7 +19,7 @@
 #include "shash.h"
 #include "tstoken.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 // All the keywords of the SQL language are stored in a hash table
diff --git a/src/query/src/tvariant.c b/src/query/src/tvariant.c
index 8c8887ca2ec7da2c956a2ec883a147d61bf4db71..c9168ab252bd39f58ddcf0e09f676ff585c27c56 100644
--- a/src/query/src/tvariant.c
+++ b/src/query/src/tvariant.c
@@ -19,10 +19,10 @@
 #include "shash.h"
 #include "tstoken.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 #include "tvariant.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "taos.h"
 
 // todo support scientific expression number and oct number
diff --git a/src/util/inc/sskiplist.h b/src/util/inc/sskiplist.h
index 2f300fa4ea0765ae81e06d560172dbec2c672a16..f2ae2efc54342a1aa0fd1298b8868132d65e246d 100644
--- a/src/util/inc/sskiplist.h
+++ b/src/util/inc/sskiplist.h
@@ -28,7 +28,7 @@ extern "C" {
 #include <stdlib.h>
 
 #include "os.h"
-#include "ttypes.h"
+#include "taosdef.h"
 
 /*
  * key of each node