diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index a8664669d00e15af8f97d681675e15c071f6635b..b4ad4ad915df055fe08b9c8e5f3e9ac7621d0c7a 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -6,11 +6,11 @@ IF (TD_LINUX_64)
 ELSEIF (TD_LINUX_32)
   ADD_SUBDIRECTORY(src/linux32)
 ELSEIF (TD_DARWIN_64)
-  ADD_SUBDIRECTORY(src/darwin64)  
+  ADD_SUBDIRECTORY(src/darwin)  
 ELSEIF (TD_WINDOWS_64)
-  ADD_SUBDIRECTORY(src/windows64)
+  ADD_SUBDIRECTORY(src/windows)
 ELSEIF (TD_WINDOWS_32)
-  ADD_SUBDIRECTORY(src/windows32)
+  ADD_SUBDIRECTORY(src/windows)
 ENDIF ()
 
 ADD_SUBDIRECTORY(src/detail)
diff --git a/src/os/src/darwin/darwinEnv.c b/src/os/src/darwin/darwinEnv.c
index 71df78c92308b837464f97d16e941fa628b2971b..7e1031a5af6e2ed59fae7fa607d1ce7fc3790043 100644
--- a/src/os/src/darwin/darwinEnv.c
+++ b/src/os/src/darwin/darwinEnv.c
@@ -16,7 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tglobal.h"
-#include "tulog.h"
 
 void osInit() {
   strcpy(configDir, "~/TDengine/cfg");
diff --git a/src/os/src/darwin/darwinFile.c b/src/os/src/darwin/darwinFile.c
index 113ea7f1faea02754cd322dd10f92036134c428e..66bdb5b939d77ab03b30f024466fe3e3ff4e9388 100644
--- a/src/os/src/darwin/darwinFile.c
+++ b/src/os/src/darwin/darwinFile.c
@@ -15,13 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "ttimer.h"
 #include "tulog.h"
-#include "tutil.h"
 
 #define _SEND_FILE_STEP_ 1000
 
diff --git a/src/os/src/darwin/darwinSemphone.c b/src/os/src/darwin/darwinSemphone.c
index 71571c8ba555020911e25e1c903e054d74e1e63c..97ff5437895c3715bbe3eeaf2abe178ffbd5d733 100644
--- a/src/os/src/darwin/darwinSemphone.c
+++ b/src/os/src/darwin/darwinSemphone.c
@@ -15,13 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "ttimer.h"
-#include "tulog.h"
-#include "tutil.h"
 
 int tsem_init(dispatch_semaphore_t *sem, int pshared, unsigned int value) {
   *sem = dispatch_semaphore_create(value);
diff --git a/src/os/src/darwin/darwinSocket.c b/src/os/src/darwin/darwinSocket.c
index 32832b9d63c26b48b5905a2a4003d00d7427fe09..e51f2c4fba4f91474189709b9b410bb886a2e9b3 100644
--- a/src/os/src/darwin/darwinSocket.c
+++ b/src/os/src/darwin/darwinSocket.c
@@ -15,13 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "ttimer.h"
-#include "tulog.h"
-#include "tutil.h"
 
 int taosSetSockOpt(int socketfd, int level, int optname, void *optval, int optlen) {
   if (level == SOL_SOCKET && optname == SO_SNDBUF) {
diff --git a/src/os/src/darwin/darwinSysInfo.c b/src/os/src/darwin/darwinSysInfo.c
index ee2f82b307932554f9bf0ac9d0c259b88e2db3ca..108cc6239f82105f49ef1ada0a326e14db3233b9 100644
--- a/src/os/src/darwin/darwinSysInfo.c
+++ b/src/os/src/darwin/darwinSysInfo.c
@@ -15,13 +15,9 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
 #include "tconfig.h"
-#include "ttimer.h"
+#include "tglobal.h"
 #include "tulog.h"
-#include "tutil.h"
 
 static void taosGetSystemTimezone() {
   // get and set default timezone
diff --git a/src/os/src/darwin/darwinTimer.c b/src/os/src/darwin/darwinTimer.c
index 93546088f3bc64d79d6d5dbb730972512769651f..5fe65fb99ed72357d88ecbf5d4699bcbb42360c6 100644
--- a/src/os/src/darwin/darwinTimer.c
+++ b/src/os/src/darwin/darwinTimer.c
@@ -15,13 +15,6 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "tconfig.h"
-#include "ttimer.h"
-#include "tulog.h"
-#include "tutil.h"
 
 int taosInitTimer(void (*callback)(int), int ms) {
   signal(SIGALRM, callback);