diff --git a/src/client/inc/tscSQLParser.h b/src/client/inc/tscSQLParser.h
deleted file mode 100644
index 0341b7ed033bb5162131619d803d3885a1dd7a4f..0000000000000000000000000000000000000000
--- a/src/client/inc/tscSQLParser.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_TSQL_H
-#define TDENGINE_TSQL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "tsclient.h"
-
-int32_t tscToSQLCmd(struct SSqlObj* pSql, struct SSqlInfo* pInfo);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 0823e6175fec933f98312138c6a151a53873c6a2..bf85629c860b4580391a45bfe945dbb7b41bfd07 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -26,7 +26,6 @@ extern "C" {
 #include "tglobalcfg.h"
 #include "tlog.h"
 #include "tscCache.h"
-#include "tscSQLParser.h"
 #include "taosdef.h"
 #include "tsqlfunction.h"
 #include "tutil.h"
@@ -444,6 +443,7 @@ char *tscGetErrorMsgPayload(SSqlCmd *pCmd);
 int32_t tscInvalidSQLErrMsg(char *msg, const char *additionalInfo, const char *sql);
 
 void tscQueueAsyncFreeResult(SSqlObj *pSql);
+int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo);
 
 extern void *     pVnodeConn;
 extern void *     pTscMgmtConn;
diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index f1630ef294cd33fb80d096892120fe9f162203bc..77fe94210035b47c1e0eccc8ca54409a9e66920c 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -22,7 +22,6 @@
 #include "tscUtil.h"
 #include "tsclient.h"
 #include "tsocket.h"
-#include "tscSQLParser.h"
 #include "tutil.h"
 #include "tnote.h"
 #include "tsched.h"
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index cb991691f5473cb7b8c528f017508d53df7b45b2..a20d7cad1c983ceb54ac3c7c66f19866143d1840 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -15,7 +15,6 @@
 
 #include "taos.h"
 #include "tsclient.h"
-#include "tscSQLParser.h"
 #include "tscUtil.h"
 #include "ttimer.h"
 #include "taosmsg.h"
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 4f4b557051c7b5a73a6bcca130c258f047ebe91f..d4dfba47791c4a4400de81e84dbb17a28b53ecbd 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -24,7 +24,6 @@
 #include "ttime.h"
 #include "tast.h"
 
-#include "tscSQLParser.h"
 #include "tscUtil.h"
 #include "tschemautil.h"
 #include "tsclient.h"
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 18161833f8a93c978f98dd7d4f6bb0ec0bdb2576..ed905a8d544197a7474e7fc4256d1bc4e676750d 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -18,7 +18,6 @@
 #include "trpc.h"
 #include "tscJoinProcess.h"
 #include "tscProfile.h"
-#include "tscSQLParser.h"
 #include "tscSecondaryMerge.h"
 #include "tscUtil.h"
 #include "tschemautil.h"
@@ -620,7 +619,7 @@ int tscProcessSql(SSqlObj *pSql) {
     }
     
     return pSql->res.code;
-  } else if (pSql->fp == launchMultivnodeInsert) {  // multi-vnodes insertion
+  } else if (pSql->fp == (void(*)())launchMultivnodeInsert) {  // multi-vnodes insertion
     launchMultivnodeInsert(pSql);
     return pSql->res.code;
   }
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index eb09231578b1b0770c7d8ee5386b0453f89ba509..7f385cd635b33532c2cd085a942d34680fc8f6ff 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -21,7 +21,6 @@
 #include "trpc.h"
 #include "tscJoinProcess.h"
 #include "tscProfile.h"
-#include "tscSQLParser.h"
 #include "tscSecondaryMerge.h"
 #include "tscUtil.h"
 #include "tsclient.h"
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index 5fd0adf5b15b31abe741dd51025e8e0a5a211230..d3ceb5ee84cb3987d487a30aaba4ae1f2cd7c663 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -15,7 +15,6 @@
 
 #include "os.h"
 #include "tlog.h"
-#include "tscSQLParser.h"
 #include "ttime.h"
 #include "ttimer.h"
 #include "tutil.h"
diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y
index 2b7e0b628cb0cf951db287722036523749e0fdd8..585aa8a9cf8a5166e00ec23b9782bb979c671634 100644
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdbool.h>
-#include "tscSQLParser.h"
 #include "tutil.h"
 }