diff --git a/src/kit/shell/src/shellCommand.c b/src/kit/shell/src/shellCommand.c
index 9bf182ab0e..46aa04c1d7 100644
--- a/src/kit/shell/src/shellCommand.c
+++ b/src/kit/shell/src/shellCommand.c
@@ -13,16 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <regex.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define __USE_XOPEN
 
-#include <wchar.h>
-
 #include "os.h"
 #include "shell.h"
 #include "shellCommand.h"
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 34f51e3b3f..e2897da698 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -16,16 +16,6 @@
 #define _XOPEN_SOURCE
 #define _DEFAULT_SOURCE
 
-#include <assert.h>
-#include <pthread.h>
-#include <regex.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <time.h>
-
 #include "os.h"
 #include "shell.h"
 #include "shellCommand.h"
diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c
index 145025cbe1..0ece4efbb2 100644
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
@@ -13,27 +13,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <argp.h>
-#include <assert.h>
-#include <assert.h>
-#include <error.h>
-#include <pwd.h>
-#include <regex.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <termios.h>
-#include <time.h>
-#include <unistd.h>
-#include <wordexp.h>
-
 #define __USE_XOPEN
 
-#include <wchar.h>
+#include "os.h"
 
 #include "shell.h"
 #include "shellCommand.h"
diff --git a/src/kit/shell/src/shellMain.c b/src/kit/shell/src/shellMain.c
index 63c9eac0db..82333020f1 100644
--- a/src/kit/shell/src/shellMain.c
+++ b/src/kit/shell/src/shellMain.c
@@ -13,13 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <locale.h>
-#include <pthread.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "os.h"
 #include "shell.h"
 #include "tsclient.h"
diff --git a/src/modules/http/src/httpServer.c b/src/modules/http/src/httpServer.c
index 49ff3562bf..ae8f9eeaad 100644
--- a/src/modules/http/src/httpServer.c
+++ b/src/modules/http/src/httpServer.c
@@ -13,23 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <pthread.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/epoll.h>
-#include <sys/socket.h>
-#include <syslog.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "taosmsg.h"
 #include "tlog.h"
diff --git a/src/os/linux/inc/os.h b/src/os/linux/inc/os.h
index 6ecb64eda5..dc3dc1cfdf 100644
--- a/src/os/linux/inc/os.h
+++ b/src/os/linux/inc/os.h
@@ -23,6 +23,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <argp.h>
 #include <arpa/inet.h>
 #include <assert.h>
 #include <ctype.h>
@@ -31,6 +32,7 @@ extern "C" {
 #include <errno.h>
 #include <float.h>
 #include <ifaddrs.h>
+#include <libgen.h>
 #include <limits.h>
 #include <locale.h>
 #include <math.h>
@@ -41,9 +43,12 @@ extern "C" {
 #include <netinet/udp.h>
 #include <pthread.h>
 #include <pwd.h>
+#include <regex.h>
 #include <semaphore.h>
+#include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 #include <strings.h>
@@ -55,7 +60,9 @@ extern "C" {
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
+#include <sys/statvfs.h>
 #include <sys/time.h>
+#include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <syslog.h>
@@ -65,6 +72,7 @@ extern "C" {
 #include <wordexp.h>
 #include <wctype.h>
 
+
 #define taosCloseSocket(x) \
   {                        \
     if (VALIDFD(x)) {      \
diff --git a/src/rpc/src/thaship.c b/src/rpc/src/thaship.c
index 4cc6feeea3..2c46e53258 100644
--- a/src/rpc/src/thaship.c
+++ b/src/rpc/src/thaship.c
@@ -13,14 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-
 #include "os.h"
 #include "tlog.h"
 #include "tmempool.h"
diff --git a/src/rpc/src/tmsghdr.c b/src/rpc/src/tmsghdr.c
index 960d1fc5f6..a46f182b1d 100644
--- a/src/rpc/src/tmsghdr.c
+++ b/src/rpc/src/tmsghdr.c
@@ -13,10 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <netinet/in.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
+#include "os.h"
 
 void taosFreeMsgHdr(void *hdr) {
   struct msghdr *msgHdr = (struct msghdr *)hdr;
diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c
index 41c628e169..de21598dd9 100644
--- a/src/rpc/src/trpc.c
+++ b/src/rpc/src/trpc.c
@@ -13,16 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
 #include "os.h"
+
 #include "shash.h"
 #include "taosmsg.h"
 #include "tidpool.h"
diff --git a/src/rpc/src/ttcpclient.c b/src/rpc/src/ttcpclient.c
index e12f1e1728..8e6f91a661 100644
--- a/src/rpc/src/ttcpclient.c
+++ b/src/rpc/src/ttcpclient.c
@@ -13,15 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tlog.h"
diff --git a/src/rpc/src/ttcpserver.c b/src/rpc/src/ttcpserver.c
index b6b0e07230..04078abb64 100644
--- a/src/rpc/src/ttcpserver.c
+++ b/src/rpc/src/ttcpserver.c
@@ -13,16 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "tlog.h"
diff --git a/src/rpc/src/tudp.c b/src/rpc/src/tudp.c
index 1940c89e85..7a4961f90c 100644
--- a/src/rpc/src/tudp.c
+++ b/src/rpc/src/tudp.c
@@ -13,15 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "os.h"
 #include "taosmsg.h"
 #include "thash.h"
diff --git a/src/sdb/src/hashstr.c b/src/sdb/src/hashstr.c
index 1a9a7fefb4..4b9aa33928 100644
--- a/src/sdb/src/hashstr.c
+++ b/src/sdb/src/hashstr.c
@@ -13,13 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "os.h"
 #include "tsdb.h"
 
 #define MAX_STR_LEN 40
diff --git a/src/sdb/src/sdbEngine.c b/src/sdb/src/sdbEngine.c
index 59e3d7e039..326e9a4df2 100644
--- a/src/sdb/src/sdbEngine.c
+++ b/src/sdb/src/sdbEngine.c
@@ -13,19 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "sdb.h"
 #include "sdbint.h"
diff --git a/src/system/detail/inc/mgmt.h b/src/system/detail/inc/mgmt.h
index 1d1f325ec2..702eb00875 100644
--- a/src/system/detail/inc/mgmt.h
+++ b/src/system/detail/inc/mgmt.h
@@ -20,11 +20,7 @@
 extern "C" {
 #endif
 
-#include <errno.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <syslog.h>
-#include <stdint.h>
+#include "os.h"
 
 #include "sdb.h"
 #include "tglobalcfg.h"
@@ -34,7 +30,6 @@ extern "C" {
 #include "tmempool.h"
 #include "trpc.h"
 #include "tsdb.h"
-#include "tsdb.h"
 #include "tskiplist.h"
 #include "tsocket.h"
 #include "ttime.h"
diff --git a/src/system/detail/inc/mgmtBalance.h b/src/system/detail/inc/mgmtBalance.h
index 4157458a7f..7d478416ac 100644
--- a/src/system/detail/inc/mgmtBalance.h
+++ b/src/system/detail/inc/mgmtBalance.h
@@ -20,9 +20,7 @@
 extern "C" {
 #endif
 
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdbool.h>
+#include "os.h"
 
 #include "dnodeSystem.h"
 #include "mgmt.h"
diff --git a/src/system/detail/inc/mgmtSystem.h b/src/system/detail/inc/mgmtSystem.h
index 1262d7e834..44bb0331e1 100644
--- a/src/system/detail/inc/mgmtSystem.h
+++ b/src/system/detail/inc/mgmtSystem.h
@@ -20,8 +20,6 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
-
 int  mgmtInitRedirect();
 
 void mgmtCleanUpRedirect();
diff --git a/src/system/detail/inc/vnode.h b/src/system/detail/inc/vnode.h
index 373d9e713b..35b5c010ab 100644
--- a/src/system/detail/inc/vnode.h
+++ b/src/system/detail/inc/vnode.h
@@ -20,11 +20,7 @@
 extern "C" {
 #endif
 
-#include <errno.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdint.h>
-#include <syslog.h>
+#include "os.h"
 
 #include "tglobalcfg.h"
 #include "tidpool.h"
@@ -33,7 +29,6 @@ extern "C" {
 #include "trpc.h"
 #include "tsclient.h"
 #include "tsdb.h"
-#include "tsdb.h"
 #include "tsocket.h"
 #include "ttime.h"
 #include "ttimer.h"
diff --git a/src/system/detail/inc/vnodePeer.h b/src/system/detail/inc/vnodePeer.h
index d44143e619..4f17e66a70 100644
--- a/src/system/detail/inc/vnodePeer.h
+++ b/src/system/detail/inc/vnodePeer.h
@@ -16,7 +16,7 @@
 #ifndef TDENGINE_VNODEPEER_H
 #define TDENGINE_VNODEPEER_H
 
-#include <stdint.h>
+#include "os.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/system/detail/inc/vnodeQueryImpl.h b/src/system/detail/inc/vnodeQueryImpl.h
index c00af3b8e9..810105d638 100644
--- a/src/system/detail/inc/vnodeQueryImpl.h
+++ b/src/system/detail/inc/vnodeQueryImpl.h
@@ -20,8 +20,7 @@
 extern "C" {
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "os.h"
 
 #include "ihash.h"
 
diff --git a/src/system/detail/inc/vnodeRead.h b/src/system/detail/inc/vnodeRead.h
index 20f49354f2..1de9f97e82 100644
--- a/src/system/detail/inc/vnodeRead.h
+++ b/src/system/detail/inc/vnodeRead.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
+#include "os.h"
 
 #include "tinterpolation.h"
 #include "vnodeTagMgmt.h"
diff --git a/src/system/detail/inc/vnodeShell.h b/src/system/detail/inc/vnodeShell.h
index d0194a1765..e450983dd7 100644
--- a/src/system/detail/inc/vnodeShell.h
+++ b/src/system/detail/inc/vnodeShell.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
+#include "os.h"
 
 typedef struct {
   int      sid;
diff --git a/src/system/detail/inc/vnodeStore.h b/src/system/detail/inc/vnodeStore.h
index d4eedd4ce0..638bcb54bb 100644
--- a/src/system/detail/inc/vnodeStore.h
+++ b/src/system/detail/inc/vnodeStore.h
@@ -16,8 +16,6 @@
 #ifndef TDENGINE_VNODESTORE_H
 #define TDENGINE_VNODESTORE_H
 
-#include <stdbool.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/system/detail/inc/vnodeSystem.h b/src/system/detail/inc/vnodeSystem.h
index e69b0b9f1e..e436288fc1 100644
--- a/src/system/detail/inc/vnodeSystem.h
+++ b/src/system/detail/inc/vnodeSystem.h
@@ -16,8 +16,6 @@
 #ifndef TDENGINE_VNODESYSTEM_H
 #define TDENGINE_VNODESYSTEM_H
 
-#include <stdbool.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/system/detail/src/dnodeMgmt.c b/src/system/detail/src/dnodeMgmt.c
index d3f84639a6..ac651f05f2 100644
--- a/src/system/detail/src/dnodeMgmt.c
+++ b/src/system/detail/src/dnodeMgmt.c
@@ -14,9 +14,8 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <assert.h>
-#include <unistd.h>
+
+#include "os.h"
 
 #include "dnodeSystem.h"
 #include "taosmsg.h"
diff --git a/src/system/detail/src/dnodeService.c b/src/system/detail/src/dnodeService.c
index 86d3b4a795..a14ec1fda6 100644
--- a/src/system/detail/src/dnodeService.c
+++ b/src/system/detail/src/dnodeService.c
@@ -14,20 +14,8 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <errno.h>
-#include <fcntl.h>
-#include <locale.h>
-#include <pthread.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <unistd.h>
-#include <wordexp.h>
+
+#include "os.h"
 
 #include "dnodeSystem.h"
 #include "tglobalcfg.h"
diff --git a/src/system/detail/src/dnodeSystem.c b/src/system/detail/src/dnodeSystem.c
index 1b5d9418b4..a6392cee4d 100644
--- a/src/system/detail/src/dnodeSystem.c
+++ b/src/system/detail/src/dnodeSystem.c
@@ -14,11 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <pthread.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
+#include "os.h"
 
 #include "mgmt.h"
 #include "vnode.h"
diff --git a/src/system/detail/src/mgmtAcct.c b/src/system/detail/src/mgmtAcct.c
index dac67518e9..e5f52b17f9 100644
--- a/src/system/detail/src/mgmtAcct.c
+++ b/src/system/detail/src/mgmtAcct.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
+#include "os.h"
 
 #include "mgmt.h"
 #include "tschemautil.h"
diff --git a/src/system/detail/src/mgmtConn.c b/src/system/detail/src/mgmtConn.c
index b3fb24de6b..40385d2fc4 100644
--- a/src/system/detail/src/mgmtConn.c
+++ b/src/system/detail/src/mgmtConn.c
@@ -14,8 +14,10 @@
  */
 
 #define _DEFAULT_SOURCE
+
+#include "os.h"
+
 #include "mgmt.h"
-#include <arpa/inet.h>
 #include "taosmsg.h"
 #include "tschemautil.h"
 
diff --git a/src/system/detail/src/mgmtDnode.c b/src/system/detail/src/mgmtDnode.c
index 36e3a41595..3a4936041c 100644
--- a/src/system/detail/src/mgmtDnode.c
+++ b/src/system/detail/src/mgmtDnode.c
@@ -15,9 +15,7 @@
 
 #define _DEFAULT_SOURCE
 
-#include <arpa/inet.h>
-#include <endian.h>
-#include <stdbool.h>
+#include "os.h"
 
 #include "dnodeSystem.h"
 #include "mgmt.h"
diff --git a/src/system/detail/src/mgmtDnodeInt.c b/src/system/detail/src/mgmtDnodeInt.c
index e215022869..af86757d51 100644
--- a/src/system/detail/src/mgmtDnodeInt.c
+++ b/src/system/detail/src/mgmtDnodeInt.c
@@ -14,8 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <endian.h>
+#include "os.h"
 
 #include "dnodeSystem.h"
 #include "mgmt.h"
diff --git a/src/system/detail/src/mgmtMeter.c b/src/system/detail/src/mgmtMeter.c
index 2db920fdd7..d4ffabe4b7 100644
--- a/src/system/detail/src/mgmtMeter.c
+++ b/src/system/detail/src/mgmtMeter.c
@@ -14,10 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <assert.h>
-#include <limits.h>
-#include <stdint.h>
+#include "os.h"
 
 #include "mgmt.h"
 #include "mgmtUtil.h"
diff --git a/src/system/detail/src/mgmtProfile.c b/src/system/detail/src/mgmtProfile.c
index e641739e31..bd5540e5ee 100644
--- a/src/system/detail/src/mgmtProfile.c
+++ b/src/system/detail/src/mgmtProfile.c
@@ -14,8 +14,9 @@
  */
 
 #define _DEFAULT_SOURCE
+#include "os.h"
+
 #include "mgmt.h"
-#include <arpa/inet.h>
 #include "mgmtProfile.h"
 #include "taosmsg.h"
 #include "tschemautil.h"
diff --git a/src/system/detail/src/mgmtShell.c b/src/system/detail/src/mgmtShell.c
index f74ee9f51f..efd863a7ef 100644
--- a/src/system/detail/src/mgmtShell.c
+++ b/src/system/detail/src/mgmtShell.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
+#include "os.h"
 
 #include "dnodeSystem.h"
 #include "mgmt.h"
diff --git a/src/system/detail/src/mgmtSupertableQuery.c b/src/system/detail/src/mgmtSupertableQuery.c
index 31f3e29425..f5e0509c24 100644
--- a/src/system/detail/src/mgmtSupertableQuery.c
+++ b/src/system/detail/src/mgmtSupertableQuery.c
@@ -14,10 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <float.h>
-#include <math.h>
-#include <sys/time.h>
+#include "os.h"
 
 #include "mgmt.h"
 #include "mgmtUtil.h"
diff --git a/src/system/detail/src/mgmtSystem.c b/src/system/detail/src/mgmtSystem.c
index bb05c35e9b..375e100a83 100644
--- a/src/system/detail/src/mgmtSystem.c
+++ b/src/system/detail/src/mgmtSystem.c
@@ -14,16 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <syslog.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "dnodeSystem.h"
 #include "mgmt.h"
diff --git a/src/system/detail/src/mgmtUser.c b/src/system/detail/src/mgmtUser.c
index 83e619841b..1acceb1ade 100644
--- a/src/system/detail/src/mgmtUser.c
+++ b/src/system/detail/src/mgmtUser.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
+#include "os.h"
 
 #include "mgmt.h"
 #include "tschemautil.h"
diff --git a/src/system/detail/src/mgmtUtil.c b/src/system/detail/src/mgmtUtil.c
index 3be2e1288d..d31198be64 100644
--- a/src/system/detail/src/mgmtUtil.c
+++ b/src/system/detail/src/mgmtUtil.c
@@ -14,10 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <math.h>
-#include <float.h>
+#include "os.h"
 
 #include "mgmt.h"
 #include "mgmtUtil.h"
diff --git a/src/system/detail/src/mgmtVgroup.c b/src/system/detail/src/mgmtVgroup.c
index 5858be54ca..3b1da25a0a 100644
--- a/src/system/detail/src/mgmtVgroup.c
+++ b/src/system/detail/src/mgmtVgroup.c
@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
+#include "os.h"
 
 #include "mgmt.h"
 #include "tschemautil.h"
diff --git a/src/system/detail/src/vnodeCache.c b/src/system/detail/src/vnodeCache.c
index f4bea682e9..94ac006060 100644
--- a/src/system/detail/src/vnodeCache.c
+++ b/src/system/detail/src/vnodeCache.c
@@ -14,9 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "taosmsg.h"
 #include "vnode.h"
diff --git a/src/system/detail/src/vnodeCommit.c b/src/system/detail/src/vnodeCommit.c
index af14f2be4a..73c891f7bb 100644
--- a/src/system/detail/src/vnodeCommit.c
+++ b/src/system/detail/src/vnodeCommit.c
@@ -14,15 +14,7 @@
  */
 
 #define _GNU_SOURCE /* See feature_test_macros(7) */
-#include <fcntl.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "tsdb.h"
 #include "vnode.h"
diff --git a/src/system/detail/src/vnodeFile.c b/src/system/detail/src/vnodeFile.c
index 132ee3f7de..a2ddca7a28 100644
--- a/src/system/detail/src/vnodeFile.c
+++ b/src/system/detail/src/vnodeFile.c
@@ -14,15 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <sys/stat.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "tscompression.h"
 #include "tutil.h"
diff --git a/src/system/detail/src/vnodeFileUtil.c b/src/system/detail/src/vnodeFileUtil.c
index f8de6c4a42..b40e7cfd41 100644
--- a/src/system/detail/src/vnodeFileUtil.c
+++ b/src/system/detail/src/vnodeFileUtil.c
@@ -14,11 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include "os.h"
 
 #include "vnode.h"
 
diff --git a/src/system/detail/src/vnodeFilterFunc.c b/src/system/detail/src/vnodeFilterFunc.c
index bd829460d9..08fe78c188 100644
--- a/src/system/detail/src/vnodeFilterFunc.c
+++ b/src/system/detail/src/vnodeFilterFunc.c
@@ -14,11 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <float.h>
-#include <math.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
+#include "os.h"
 
 #include "taosmsg.h"
 #include "tsqlfunction.h"
diff --git a/src/system/detail/src/vnodeImport.c b/src/system/detail/src/vnodeImport.c
index de795f820b..260d531200 100644
--- a/src/system/detail/src/vnodeImport.c
+++ b/src/system/detail/src/vnodeImport.c
@@ -14,10 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "trpc.h"
 #include "ttimer.h"
diff --git a/src/system/detail/src/vnodeMeter.c b/src/system/detail/src/vnodeMeter.c
index e3cde9a84d..14cdf9eb78 100644
--- a/src/system/detail/src/vnodeMeter.c
+++ b/src/system/detail/src/vnodeMeter.c
@@ -14,10 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <assert.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include "os.h"
 
 #include "trpc.h"
 #include "tschemautil.h"
diff --git a/src/system/detail/src/vnodeQueryProcess.c b/src/system/detail/src/vnodeQueryProcess.c
index 73d97f5e6e..7378963301 100644
--- a/src/system/detail/src/vnodeQueryProcess.c
+++ b/src/system/detail/src/vnodeQueryProcess.c
@@ -14,10 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <assert.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "os.h"
 
 #include "taosmsg.h"
 #include "textbuffer.h"
diff --git a/src/system/detail/src/vnodeRead.c b/src/system/detail/src/vnodeRead.c
index f35567e720..0f9565a3b5 100644
--- a/src/system/detail/src/vnodeRead.c
+++ b/src/system/detail/src/vnodeRead.c
@@ -14,12 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <time.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "ihash.h"
 #include "taosmsg.h"
diff --git a/src/system/detail/src/vnodeShell.c b/src/system/detail/src/vnodeShell.c
index 5973b01d71..47b7b470bb 100644
--- a/src/system/detail/src/vnodeShell.c
+++ b/src/system/detail/src/vnodeShell.c
@@ -14,10 +14,8 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <assert.h>
-#include <endian.h>
-#include <stdint.h>
+#include "os.h"
+
 #include "taosmsg.h"
 #include "vnode.h"
 #include "vnodeShell.h"
diff --git a/src/system/detail/src/vnodeStore.c b/src/system/detail/src/vnodeStore.c
index e4294d72c6..d299d7fbf8 100644
--- a/src/system/detail/src/vnodeStore.c
+++ b/src/system/detail/src/vnodeStore.c
@@ -14,11 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <dirent.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "dnodeSystem.h"
 #include "trpc.h"
diff --git a/src/system/detail/src/vnodeSystem.c b/src/system/detail/src/vnodeSystem.c
index 2f350db3fa..631e258b25 100644
--- a/src/system/detail/src/vnodeSystem.c
+++ b/src/system/detail/src/vnodeSystem.c
@@ -14,15 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <pthread.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <syslog.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "tsdb.h"
 #include "tsocket.h"
diff --git a/src/system/detail/src/vnodeTagMgmt.c b/src/system/detail/src/vnodeTagMgmt.c
index 9b76e14854..adf4e544bb 100644
--- a/src/system/detail/src/vnodeTagMgmt.c
+++ b/src/system/detail/src/vnodeTagMgmt.c
@@ -14,9 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <assert.h>
-#include <stdbool.h>
-#include <stdlib.h>
+#include "os.h"
 
 #include "tsdb.h"
 #include "tlog.h"
diff --git a/src/system/detail/src/vnodeUtil.c b/src/system/detail/src/vnodeUtil.c
index 6691b2245d..b8c463f50b 100644
--- a/src/system/detail/src/vnodeUtil.c
+++ b/src/system/detail/src/vnodeUtil.c
@@ -14,10 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include "os.h"
 
 #include "tast.h"
 #include "tscUtil.h"
diff --git a/src/util/src/ihash.c b/src/util/src/ihash.c
index 606bddd79b..8c492b03f8 100644
--- a/src/util/src/ihash.c
+++ b/src/util/src/ihash.c
@@ -13,13 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "os.h"
 
 typedef struct _str_node_t {
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index e92ac5d46d..8a2f1347df 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -13,15 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <errno.h>
-#include <pthread.h>
-#include <string.h>
+#include "os.h"
 
 #include "tcache.h"
 #include "tlog.h"
diff --git a/src/util/src/tcompression.c b/src/util/src/tcompression.c
index cd69f30c3f..1ac42377fb 100644
--- a/src/util/src/tcompression.c
+++ b/src/util/src/tcompression.c
@@ -46,12 +46,6 @@
  *   of the XORed value with informations. If not, record the first corresponding bytes.
  *
  */
-#include <assert.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "os.h"
 #include "lz4.h"
diff --git a/src/util/src/textbuffer.c b/src/util/src/textbuffer.c
index ebb6b9e0b8..8944dd4391 100644
--- a/src/util/src/textbuffer.c
+++ b/src/util/src/textbuffer.c
@@ -13,17 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <assert.h>
-#include <float.h>
-#include <math.h>
-
-#include <errno.h>
-
 #include "os.h"
 #include "taos.h"
 #include "taosmsg.h"
diff --git a/src/util/src/thash.c b/src/util/src/thash.c
index 3b9cec0df5..e3c6fe26b4 100644
--- a/src/util/src/thash.c
+++ b/src/util/src/thash.c
@@ -13,13 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 "tmempool.h"
 
diff --git a/src/util/src/thistogram.c b/src/util/src/thistogram.c
index 6cd02cc72e..5fef9077ea 100644
--- a/src/util/src/thistogram.c
+++ b/src/util/src/thistogram.c
@@ -13,13 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <float.h>
-#include <math.h>
-#include <memory.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "os.h"
 
 #include "taosmsg.h"
 #include "thistogram.h"
diff --git a/src/util/src/tidpool.c b/src/util/src/tidpool.c
index a9cc78a026..c50c38aa3c 100644
--- a/src/util/src/tidpool.c
+++ b/src/util/src/tidpool.c
@@ -13,10 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "os.h"
 #include "tlog.h"
 
 typedef struct {
diff --git a/src/util/src/tlog.c b/src/util/src/tlog.c
index b88cb7dc17..1a7f672e00 100644
--- a/src/util/src/tlog.c
+++ b/src/util/src/tlog.c
@@ -13,22 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/types.h>
-#include <time.h>
-
 #include "os.h"
 #include "tlog.h"
 #include "tutil.h"
diff --git a/src/util/src/tmem.c b/src/util/src/tmem.c
index c2bb836635..462da884b9 100644
--- a/src/util/src/tmem.c
+++ b/src/util/src/tmem.c
@@ -13,13 +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 <stdbool.h>
-#include <errno.h>
-
+#include "os.h"
 #include "tlog.h"
 
 extern int32_t taosGetTimestampSec();
diff --git a/src/util/src/tmodule.c b/src/util/src/tmodule.c
index fabdc1ed4f..54669a20be 100644
--- a/src/util/src/tmodule.c
+++ b/src/util/src/tmodule.c
@@ -13,12 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-
 #include "os.h"
 #include "tmodule.h"
 #include "tutil.h"
diff --git a/src/util/src/tsched.c b/src/util/src/tsched.c
index ee16b92b65..bd49c670f6 100644
--- a/src/util/src/tsched.c
+++ b/src/util/src/tsched.c
@@ -13,14 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "os.h"
 #include "tlog.h"
 #include "tsched.h"
diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c
index be352eb7ad..8de70f8a01 100644
--- a/src/util/src/tsocket.c
+++ b/src/util/src/tsocket.c
@@ -13,17 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <ctype.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdarg.h>
-#include <sys/types.h>
-
 #include "os.h"
 #include "tglobalcfg.h"
 #include "tlog.h"
diff --git a/src/util/src/ttimer.c b/src/util/src/ttimer.c
index cf09aaee5e..9dad1e4e1e 100644
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
@@ -13,12 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <sched.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "os.h"
 #include "tlog.h"
 #include "tsched.h"
diff --git a/src/util/src/ttypes.c b/src/util/src/ttypes.c
index 3b36b1b31c..185a63c0eb 100644
--- a/src/util/src/ttypes.c
+++ b/src/util/src/ttypes.c
@@ -13,15 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <errno.h>
-#include <float.h>
-#include <math.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "os.h"
 #include "taos.h"
 #include "tsdb.h"
diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c
index af75a3ce0f..8413294bcc 100644
--- a/src/util/src/tutil.c
+++ b/src/util/src/tutil.c
@@ -13,14 +13,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
-#include <locale.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <errno.h>
-
 #include "os.h"
 
 #ifdef USE_LIBICONV