diff --git a/src/inc/tnote.h b/src/inc/tnote.h
index 1b53be22a29aa0cdc93bf7f7502208dbfc6cb88b..4f86736be4b1075d3a6a897ce1d996b136c11b70 100644
--- a/src/inc/tnote.h
+++ b/src/inc/tnote.h
@@ -20,7 +20,6 @@
 extern "C" {
 #endif
 
-#include "unistd.h"
 #include "os.h"
 #include "tutil.h"
 #include "tglobalcfg.h"
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index e2897da698b3891ddcf06e8ba17813008bef10d8..2eb98935566a74f712c3dc3db3880ecf84d066fd 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -21,6 +21,7 @@
 #include "shellCommand.h"
 #include "ttime.h"
 #include "tutil.h"
+#include <regex.h>
 
 /**************** Global variables ****************/
 #ifdef WINDOWS
diff --git a/src/os/windows/inc/os.h b/src/os/windows/inc/os.h
index a1a4bdfa5c47e97010c05451a97ea363de928d60..9c0add2c319829e10d192de8a94dc43038c3155d 100644
--- a/src/os/windows/inc/os.h
+++ b/src/os/windows/inc/os.h
@@ -16,20 +16,30 @@
 #ifndef TDENGINE_PLATFORM_WINDOWS_H
 #define TDENGINE_PLATFORM_WINDOWS_H
 
+#include <assert.h>
+#include <ctype.h>
+#include <direct.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <float.h>
+#include <locale.h>
+#include <intrin.h>
 #include <io.h>
+#include <math.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 <signal.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <pthread.h>
-#include <direct.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
 #include "winsock2.h"
 #include <WS2tcpip.h>
-#include <assert.h>
-#include <math.h>
-#include <string.h>
-#include <assert.h>
-#include <intrin.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -366,6 +376,8 @@ int fsendfile(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count);
 
 char *strndup(const char *s, size_t n);
 
+void taosSetCoreDump();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/os/windows/src/twindows.c b/src/os/windows/src/twindows.c
index 9089f90d6ad8b0ae2c3bfeee9f1043c29926f144..98be6b60ba16e52b2177971d95930f7f717785aa 100644
--- a/src/os/windows/src/twindows.c
+++ b/src/os/windows/src/twindows.c
@@ -394,4 +394,6 @@ char *strndup(const char *s, size_t n) {
   memcpy(r, s, len);
   r[len] = 0;
   return r;
-}
\ No newline at end of file
+}
+
+void taosSetCoreDump() {}
\ No newline at end of file
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index e73428353e76bfda2b11f86efeadd44b97d73138..5e84f3feadbf4f8cee66c334ac62465ed081936e 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -37,7 +37,6 @@ ELSEIF (TD_WINDOWS_64)
   LIST(APPEND SRC ./src/ihash.c)
   LIST(APPEND SRC ./src/lz4.c)
   LIST(APPEND SRC ./src/shash.c)
-  LIST(APPEND SRC ./src/sql.c)
   LIST(APPEND SRC ./src/tbase64.c)
   LIST(APPEND SRC ./src/tcache.c)
   LIST(APPEND SRC ./src/tcompression.c)
@@ -59,8 +58,6 @@ ELSEIF (TD_WINDOWS_64)
   LIST(APPEND SRC ./src/tskiplist.c)
   LIST(APPEND SRC ./src/tsocket.c)
   LIST(APPEND SRC ./src/tstatus.c)
-  LIST(APPEND SRC ./src/tstoken.c)
-  LIST(APPEND SRC ./src/tstoken.c)
   LIST(APPEND SRC ./src/tstrbuild.c)
   LIST(APPEND SRC ./src/ttime.c)
   LIST(APPEND SRC ./src/ttimer.c)