diff --git a/src/kit/shell/src/shellCommand.c b/src/kit/shell/src/shellCommand.c
index 9bf182ab0e7cbbe0be007d024c6a832902a3232b..46aa04c1d73f43e9279536b4ac31ea7c2dc0dbeb 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 34f51e3b3f1136b2e0a876aa882b86f07857236a..e2897da698b3891ddcf06e8ba17813008bef10d8 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 145025cbe1c1230ecf7a40df6a14d76dd19d9cff..0ece4efbb2a923a81fef4cdcf05c78ccbfe6c47d 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 63c9eac0db5ddb5001a5516df29f674b4d94c19c..82333020f15fd1c1c760c5efb5e29080c9311201 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 49ff3562bfce15e594c2033881474d591cfc92a1..ae8f9eeaaded7da8fe316aee08705644f2967c3f 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 6ecb64eda5b173acd205080318ab95527af9547b..dc3dc1cfdfd991ed7f340e153ee6cc49f45d71e8 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 4cc6feeea3355724cf73249cc16920e870604bcc..2c46e53258968df951fc00c4270036c08c076270 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 960d1fc5f6a534f9de9055ac5b2590a98e31f8d2..a46f182b1d21b31e08c040b4990e74a27971b46e 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 41c628e169be5413b0021622a0e857ca5dc03bf4..de21598dd92c54ca83c8e575ebbf45d035af01ea 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 e12f1e1728ec96a97326b5278c7ac997a0f6b89c..8e6f91a66158722afc3b601538a21554ad847d50 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 b6b0e07230773fdf6633cba5b1b90ac37091c9a6..04078abb648debb86229d831e4801da56770e4b6 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 1940c89e85eecee1c8fa116cbe621ec9a0de9874..7a4961f90c2b7d71991ece4d4d64afac32e33fd6 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 1a9a7fefb4f1f2eafd6aa485f6217811841ddbce..4b9aa3392853424618e574b03a50b17a51f2b320 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 59e3d7e0398f0c1af175f867b7408fe3db545d84..326e9a4df2fcfbaf6b86567737c8c6c282a73d9a 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 1d1f325ec2db81edecf5bbac0aea064d4fd96c11..702eb008758a2974990db5ada64dd4d92bc6be04 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 4157458a7f3d864e576ed004ba416c4cf3b562ef..7d478416accbc0b4e4cb5a56ef6f50daa8203320 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 1262d7e834f705d9a67f8f61dff3b70f9793f954..44bb0331e1908ecd49b973b4ea0297d07f261cc0 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 373d9e713bfa50543770ce25094a0b0a9cec3dab..35b5c010ab45087ae2c1b86aeb7f15169498d0b6 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 d44143e619b36c6faaf3dbf078bf5a9f92655fb4..4f17e66a70d8ffc0727021a17359e7f58161cff4 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 c00af3b8e981ab20c1d033d1032b1b05a2452f0d..810105d638821d9d46c36c87eb15f4f9324a5aae 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 20f49354f2fee5ab1c7d027ff9437a18c54942f2..1de9f97e82ad83e2e6c70b36a0c7b7aca9165dc6 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 d0194a1765fc55d859c9ec645a1ca247f55ed79b..e450983dd7ef6d90d33f9eb5e1d4e2e502fefd32 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 d4eedd4ce00cfd9ff5f52b9740c99221d1e049ec..638bcb54bb40f7621a8712591775e5f4e676e704 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 e69b0b9f1e38f919819199473839edd1246ae776..e436288fc149cb5381b1e7f583d9450fd8772f5d 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 d3f84639a687f4f0b2f0e509ef3fa35368842de0..ac651f05f291f1d92744da465fead6707b45cb4e 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 86d3b4a795a789aebf51ab2e529737f55811b815..a14ec1fda6aee8d3e7942b5890d1301fb11c66df 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 1b5d9418b424ec0212d58bcaa3e461b69fe371df..a6392cee4d6e116cf3e858016a9441bcb317b394 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 dac67518e9225c0966e26985e4c4395f44b1bd43..e5f52b17f963dfeaf915c21aeedf61e9655d8cd1 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 b3fb24de6b19963348666cffc05c2745d47639a5..40385d2fc4b6d61727c679d7781ec8cc6c5e49f5 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 36e3a415955bd76a0b76759935590c0846730719..3a4936041c54f3cec2f5b2c1fb91213bc1997acf 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 e2150228691414e821401803ee230d9b06796873..af86757d5165b4ccec638443282a55f9924184fe 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 2db920fdd71a6005d45d442aff4c108a31dc9c72..d4ffabe4b7a5444cbc6a71ee29c02e03035a4e9e 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 e641739e31c9e8498e12c6b6cab1525c8a66791e..bd5540e5ee806ad0534dca0b238f63906fe7053f 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 f74ee9f51f6a9c1e2aabd26ccf1843b161b1c176..efd863a7efb08ffb447d58ec8959e0b1e6a98385 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 31f3e29425b1842722d8eca374b0a5bf7b4fb784..f5e0509c24baa8a8a1ecedcd3258c50306801cde 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 bb05c35e9be40fcb338395fb7f1086d99aff4ac1..375e100a83668f0288fb25fc05f689b3e52b0c91 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 83e619841b18b44aeac999ba1d60c5a8672e1531..1acceb1ade7c7cecc66d972adf6e295719e9357c 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 3be2e1288d225147b95f511c865d0c425c1dee23..d31198be645b8f92792336a52512c2f94d73950d 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 5858be54cab7e5394d994427d5105f62f8331e02..3b1da25a0a7aff4a86ca50537cb88b394d4ccff2 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 f4bea682e93c951d7bc7d7fd9b581b4033eac471..94ac006060c83785f24ced70bddd4269105a2b7d 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 af14f2be4a8fb56c305967a66c2e94b8cc864873..73c891f7bbc36df2b101889e12c739abf815a76b 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 132ee3f7ded421245bd67c8b79c914565e78e156..a2ddca7a28c357f4d71e80107bf185840f360f70 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 f8de6c4a42453e35e6d3676890f9f6942c0a6fba..b40e7cfd41eed93e08c4959d55fd379bdc206c4d 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 bd829460d9dea0b2defeee046d55656bbbe99fc0..08fe78c188b2d0e1536bd57c40867783f24b4a16 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 de795f820b18254c7c8362bbb80c24de7e4b91d4..260d5312002880d8396a032049355933a05d6eb2 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 e3cde9a84d8544933bef675936d4f8a4d3fff0fe..14cdf9eb78ef5bc5ce85c08b196c856b2b571929 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 73d97f5e6e11896870287a9ac340f07c336d8b01..7378963301fc7fa8b26146b0c5e40c5441b631b9 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 f35567e7200ec578ac59d91385076da78eefe426..0f9565a3b5d42db5532cea9d9d5411a90faf312b 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 5973b01d71b5b0743497c4f14f2f0ad563e19144..47b7b470bb1a4a220f51c1606ca6e1398645c5fe 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 e4294d72c692472016e3e7c66da7009dc932bfb8..d299d7fbf8971ff07baa8618828ab0c31440c979 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 2f350db3fa4acee7aef6951b770ca5a62ae05acd..631e258b2589aa548062e5661e937d7917665403 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 9b76e148546267ebebd445d90856cf4d9201dc4d..adf4e544bbf9efea877aa3f688afc981437815e6 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 6691b2245d33706219a83294f0fae189a8ffb1ca..b8c463f50b1d97c9ba23b17eb572f2c237a7220a 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 606bddd79b53bf843971dafdf39caca8c6df604a..8c492b03f867036d3fcb3a52f872f57142cba7ec 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 e92ac5d46d9f81a680feeba07ae39558dbb74b90..8a2f1347df9e7eb7d7fb29623eab4120b5484aeb 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 cd69f30c3f212bc4e027f4eac3f05659cd143c0d..1ac42377fb62c9f9da1186d068da6ce603a77eea 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 ebb6b9e0b8ca302210654f61280835bdff3b0d11..8944dd4391c9da676da4c9837964b62acc85d59c 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 3b9cec0df5b9388710d28620bcaa68a58c2d44a9..e3c6fe26b4e98185d48ff55d8cbfecd08a16ddbb 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 6cd02cc72e7ab4b09271a00b03aa1ac558fcc8f3..5fef9077ea8157c347ae062db55bb257f38cd675 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 a9cc78a026f4108c758ad6e47ffacce148e56001..c50c38aa3cabd74266d4164f0ebdf4581ce670f6 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 b88cb7dc170435e2b8f4e086413ac29fd6474dbc..1a7f672e00321c0891aa54ae9f3cc3efedb89d54 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 c2bb8366354109efdb54ec589e9204af0826e1f1..462da884b9da8aaaac82d61c8332a2cb795f1486 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 fabdc1ed4f1c0f93e2c43e1395bb01bd316909b9..54669a20bed2bae1474222fe95790414aceee215 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 ee16b92b658afde6e25fb6b3adb27a3a3dcdc63c..bd49c670f6515f3e29dd5e37df8f333213f4aef3 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 be352eb7adf908701224388a1138cade5fd40e4f..8de70f8a01147d211dced1ef73f57ef87c4c22ee 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 cf09aaee5e937f8a3c833290b2e4069e1f2b58f8..9dad1e4e1e70fa74bbdc95f64a66328520208922 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 3b36b1b31c94f6e9681eced3f721f0d3e2a15056..185a63c0ebd1fd84200c4e9fdfd4c8c9ac276118 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 af75a3ce0f9eef5d762bd5b11b4488123faea186..8413294bcceee6690204422c8d8cd8e0316ef65b 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