diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06617e683ce703cff2edf8dc0566fc1ca652904c..3596dbe75a8f234ff9dc5de9dbe672bf215f3639 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,13 +21,10 @@ if(WIN32)
   file(GLOB CORE_SRCS 
       src/*.c 
       src/etc/*.c 
-      src/win32/*.c 
       src/rpmalloc/*.c
   )
   file(GLOB CORE_HEADERS 
       include/*.h 
-      src/win32/*.h 
-      src/win32/*.h 
   )
 endif()
 
@@ -81,7 +78,7 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
 	endif()
 endif()
 
-add_library(${PROJECT_NAME} STATIC ${CORE_SRCS} ${CORE_UNIX_SRCS})
+add_library(${PROJECT_NAME} STATIC ${CORE_SRCS} ${CORE_HEADERS})
 
 #This paths will be used by project-dependent project libraries
 target_include_directories(${PROJECT_NAME} INTERFACE include/ src/rpmalloc/)
@@ -109,6 +106,11 @@ if(ANDROID)
     target_link_libraries(${PROJECT_NAME} dap_core_android)
 endif()
 
+if (WIN32)
+    add_subdirectory(src/win32)
+    target_link_libraries(${PROJECT_NAME} dap_core_win32)
+endif()
+
 if(BUILD_DAP_TESTS)
     enable_testing()
     add_subdirectory(test)
diff --git a/src/win32/CMakeLists.txt b/src/win32/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f3d0c43a6662887771ccebe815b8f8102824b6e1
--- /dev/null
+++ b/src/win32/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.0)
+
+project (dap_core_win32 C)
+
+file(GLOB CORE_SRCS *.c)
+file(GLOB CORE_HEADERS *.h)
+
+add_library(${PROJECT_NAME} STATIC ${CORE_SRCS} ${CORE_HEADERS})
+
+target_include_directories(${PROJECT_NAME} INTERFACE .)
\ No newline at end of file