diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index fb175618c0..e98acfc9a6 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -13,8 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
-
 #include "os.h"
 #include "com_taosdata_jdbc_TSDBJNIConnector.h"
 #include "taos.h"
diff --git a/src/client/src/tscAst.c b/src/client/src/tscAst.c
index 845a9fd36d..fe0921c64d 100644
--- a/src/client/src/tscAst.c
+++ b/src/client/src/tscAst.c
@@ -13,12 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <float.h>
-#include <math.h>
-#include <stdbool.h>
-#include <stdlib.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tast.h"
diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 6e0e1ae7c5..aad0295959 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -13,8 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "os.h"
 
 #include "tlog.h"
 #include "trpc.h"
diff --git a/src/client/src/tscCache.c b/src/client/src/tscCache.c
index 866b6e7dbc..f508857ce1 100644
--- a/src/client/src/tscCache.c
+++ b/src/client/src/tscCache.c
@@ -13,14 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "os.h"
 
 #include "tglobalcfg.h"
 #include "tlog.h"
diff --git a/src/client/src/tscFunctionImpl.c b/src/client/src/tscFunctionImpl.c
index 0f9be90412..35011a259b 100644
--- a/src/client/src/tscFunctionImpl.c
+++ b/src/client/src/tscFunctionImpl.c
@@ -15,16 +15,6 @@
 
 #pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
 
-#include <assert.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wctype.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tast.h"
diff --git a/src/client/src/tscJoinProcess.c b/src/client/src/tscJoinProcess.c
index 4965498eff..dfeebc8c61 100644
--- a/src/client/src/tscJoinProcess.c
+++ b/src/client/src/tscJoinProcess.c
@@ -13,13 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fcntl.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <tsclient.h>
-#include <sys/stat.h>
-
 #include "os.h"
 #include "tcache.h"
 #include "tscJoinProcess.h"
diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index 9afb74fec2..d217d09588 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -13,9 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "os.h"
 #include "taosmsg.h"
 
 #include "tcache.h"
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 37a32e9ebb..c8ce728de1 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -21,22 +21,8 @@
 #pragma GCC diagnostic ignored "-Woverflow"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <pthread.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <float.h>
-#include <math.h>
-#include <string.h>
-#include <time.h>
-#include <wchar.h>
-
-#include "ihash.h"
 #include "os.h"
+#include "ihash.h"
 #include "tscSecondaryMerge.h"
 #include "tscUtil.h"
 #include "tschemautil.h"
diff --git a/src/client/src/tscPrepare.c b/src/client/src/tscPrepare.c
index e956d6159e..03f644ac36 100644
--- a/src/client/src/tscPrepare.c
+++ b/src/client/src/tscPrepare.c
@@ -13,9 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "taos.h"
 #include "tsclient.h"
 #include "tsql.h"
diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index 770e61e278..7d74f62dcc 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -13,9 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "os.h"
 #include "tlog.h"
 #include "tsclient.h"
diff --git a/src/client/src/tscSQLParserImpl.c b/src/client/src/tscSQLParserImpl.c
index 7e1b4a7cf1..4fefe1665c 100644
--- a/src/client/src/tscSQLParserImpl.c
+++ b/src/client/src/tscSQLParserImpl.c
@@ -13,13 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdarg.h>
-
 #include "os.h"
 #include "tglobalcfg.h"
 #include "tsql.h"
diff --git a/src/client/src/tscSchemaUtil.c b/src/client/src/tscSchemaUtil.c
index 9728811ae7..5e50c27ab1 100644
--- a/src/client/src/tscSchemaUtil.c
+++ b/src/client/src/tscSchemaUtil.c
@@ -13,10 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tschemautil.h"
diff --git a/src/client/src/tscSecondaryMerge.c b/src/client/src/tscSecondaryMerge.c
index ac2638f635..398cd1cca6 100644
--- a/src/client/src/tscSecondaryMerge.c
+++ b/src/client/src/tscSecondaryMerge.c
@@ -13,13 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <tsclient.h>
 
-#include "tlosertree.h"
+#include "os.h"
 #include "tlosertree.h"
 #include "tscSecondaryMerge.h"
 #include "tscUtil.h"
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 6edec3d477..73e612962a 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -13,12 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-
 #include "os.h"
 #include "tcache.h"
 #include "trpc.h"
@@ -3613,7 +3607,7 @@ int tscRenewMeterMeta(SSqlObj *pSql, char *meterId) {
 
     code = tscDoGetMeterMeta(pSql, meterId, 0);  // todo ??
   } else {
-    tscTrace("%p metric query not update metric meta, numOfTags:%d, numOfCols:%d, uid:%d, addr:%p", pSql,
+    tscTrace("%p metric query not update metric meta, numOfTags:%d, numOfCols:%d, uid:%lld, addr:%p", pSql,
              pMeterMetaInfo->pMeterMeta->numOfTags, pCmd->numOfCols, pMeterMetaInfo->pMeterMeta->uid,
              pMeterMetaInfo->pMeterMeta);
   }
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index e6714bb4cb..1727840a98 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -13,9 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "os.h"
 #include "tcache.h"
 #include "tlog.h"
diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index dee8f02118..bcbcaba4c4 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <signal.h>
+#include "os.h"
 
 #include "shash.h"
 #include "taos.h"
diff --git a/src/client/src/tscSyntaxtreefunction.c b/src/client/src/tscSyntaxtreefunction.c
index 00781919e4..bbd30c1fa9 100644
--- a/src/client/src/tscSyntaxtreefunction.c
+++ b/src/client/src/tscSyntaxtreefunction.c
@@ -13,10 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "os.h"
 
 #include "tscSyntaxtreefunction.h"
 #include "tsql.h"
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 7ebd43cd19..708ceee405 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -13,15 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <locale.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tcache.h"
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index ec5c980612..5793656477 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -13,10 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <math.h>
-#include <time.h>
-
 #include "os.h"
 #include "ihash.h"
 #include "taosmsg.h"