diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt
index a41b3734ebd2f56a9f1a387088c6ee5f124d57f9..4bd89e238e7d1e08d9a0f4b223b72f5ed1dee369 100644
--- a/src/dnode/CMakeLists.txt
+++ b/src/dnode/CMakeLists.txt
@@ -6,6 +6,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/tsdb/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
   INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index dece52fbbc498060ea902cbd7b7b0e18ad1d494b..e2de9bf5860b7e6d4f759c868eefb51a71018b5a 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -28,6 +28,7 @@
 #include "dnodeRead.h"
 #include "dnodeShell.h"
 #include "dnodeWrite.h"
+#include "mgmtGrant.h"
 
 static int32_t dnodeInitSystem();
 static int32_t dnodeInitStorage();
diff --git a/src/vnode/tsdb/src/tsdbMain.c b/src/vnode/tsdb/src/tsdbMain.c
index 1a8e50d0eeab0ded741d19ae71b796d9f19343fd..343e3325745e8006f81b254e762913e1690b5599 100644
--- a/src/vnode/tsdb/src/tsdbMain.c
+++ b/src/vnode/tsdb/src/tsdbMain.c
@@ -654,7 +654,7 @@ static int32_t tsdbSetRepoEnv(STsdbRepo *pRepo) {
 }
 
 static int32_t tsdbDestroyRepoEnv(STsdbRepo *pRepo) {
-  char fname[128];
+  char fname[260];
   if (pRepo == NULL) return 0;
   char *dirName = calloc(1, strlen(pRepo->rootDir) + strlen("tsdb") + 2);
   if (dirName == NULL) {
diff --git a/tests/examples/c/demo.c b/tests/examples/c/demo.c
index d92eabab496888c51f9bb54b2391f4f988d82bfa..e06dbedfca3778d191f0d49cc145d69bdbcdbe8a 100644
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
@@ -45,6 +45,8 @@ static int32_t doQuery(TAOS* taos, const char* sql) {
   }
   
   taos_free_result(res);
+
+  return 0;
 }
 
 int main(int argc, char *argv[]) {
diff --git a/tests/tsim/src/cJSON.c b/tests/tsim/src/cJSON.c
index b2e2f47bdac787b82ca0b93e50e69009e8a5f64c..ecf0e05b42cf5a6f83e98d95f72b10dd5360714e 100644
--- a/tests/tsim/src/cJSON.c
+++ b/tests/tsim/src/cJSON.c
@@ -290,7 +290,7 @@ loop_end:
 
     input_buffer->offset += (size_t)(after_end - number_c_string);
 
-    strncpy(item->numberstring, number_c_string, 12);
+    strncpy(item->numberstring, (const char *)number_c_string, 12);
 
     return true;
 }