diff --git a/CMakeLists.txt b/CMakeLists.txt
index b054f6a157867535f48579f83b5752d7f4a9022d..bc5014fad0848265bc62726ae63190580c19a7a5 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,12 +17,16 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
 
 endif()
 
-file(GLOB DAP_SERVER_CORE_SOURCES src/*.c)
-file(GLOB DAP_SERVER_CORE_HEADERS include/*.h)
+if(WIN32)
+    file(GLOB DAP_SERVER_CORE_SOURCES src/*.c ../sources/wepoll/*.c)
+    file(GLOB DAP_SERVER_CORE_HEADERS include/*.h ../sources/wepoll/*.h)
+else()
+    file(GLOB DAP_SERVER_CORE_SOURCES src/*.c)
+    file(GLOB DAP_SERVER_CORE_HEADERS include/*.h)
+endif()
 
 if(WIN32)
   include_directories(../libdap/src/win32/)
-  include_directories(../3rdparty/wepoll/include/)
   include_directories(../3rdparty/uthash/src/)
   include_directories(../3rdparty/libjson-c/)
   include_directories(../3rdparty/curl/include/)
@@ -31,7 +35,7 @@ endif()
 add_library(${PROJECT_NAME} STATIC ${DAP_SERVER_CORE_HEADERS} ${DAP_SERVER_CORE_SOURCES})
 
 if(WIN32)
-  target_link_libraries(${PROJECT_NAME} dap_core dap_crypto ${CMAKE_CURRENT_SOURCE_DIR}/../lib/[x86_64CLANG]/wepoll[x86_64CLANG].a)
+  target_link_libraries(${PROJECT_NAME} dap_core dap_crypto)
 endif()
 
 if(UNIX)
diff --git a/include/dap_events_socket.h b/include/dap_events_socket.h
index cdd7d7b9f5d6e5b8e4802eb68b6ed2368d1b92f1..1e87beebbdc30a0dd9aefeab6eb967b006e7f0f3 100755
--- a/include/dap_events_socket.h
+++ b/include/dap_events_socket.h
@@ -29,6 +29,8 @@
 #include "uthash.h"
 #ifndef _WIN32
 #include <sys/epoll.h>
+#else
+#include "wepoll.h"
 #endif
 
 struct dap_events;
diff --git a/src/dap_client_remote.c b/src/dap_client_remote.c
index 0ed0956395e23b8687ed81297cd0c5833f327818..bedf02657d1bb535acee9e94419c93ae5f6d8c63 100755
--- a/src/dap_client_remote.c
+++ b/src/dap_client_remote.c
@@ -37,7 +37,6 @@
 #include <ws2tcpip.h>
 #include <io.h>
 //#include "wrappers.h"
-#include <wepoll.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/dap_events.c b/src/dap_events.c
index fbb50f167eb40ea0842a0315fdba2444e539b533..3f6e9eb37928c43ad101f07286b268c51b32414e 100755
--- a/src/dap_events.c
+++ b/src/dap_events.c
@@ -54,16 +54,12 @@
 #endif
 
 #else
-
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
 #include <winsock2.h>
 #include <windows.h>
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #include <io.h>
 #include "wrappers.h"
-#include <wepoll.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/dap_events_socket.c b/src/dap_events_socket.c
index 75c9ae20f8088061bd8ead55d7ddbe1071c5cbcc..2f431a0ff4d671db49f2d78bf1d0714244b12772 100755
--- a/src/dap_events_socket.c
+++ b/src/dap_events_socket.c
@@ -33,14 +33,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 #else
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
 #include <winsock2.h>
 #include <windows.h>
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #include <io.h>
-#include <wepoll.h>
+#include "wepoll.h"
 #include <pthread.h>
 #endif
 
diff --git a/src/dap_memcached.c b/src/dap_memcached.c
new file mode 100755
index 0000000000000000000000000000000000000000..3b41bd62ae36dc90ce8512c9303134acb2ff719c
--- /dev/null
+++ b/src/dap_memcached.c
@@ -0,0 +1,81 @@
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <windows.h>
+#include <mswsock.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#include <pthread.h>
+
+#endif
+
+#include "dap_memcached.h"
+
+#include <libmemcached/memcached.h>
+
+#define LOG_TAG "dap_memcached"
+
+static memcached_st *_memc;
+static bool _is_module_enable = false;
+
+int dap_memcached_init(const char *server_host, uint16_t port)
+{
+    memcached_return rc;
+    memcached_server_st *servers = NULL;
+
+    char *test_key = "test_key";
+    char *test_value = "test_value";
+
+    _memc = memcached_create(NULL);
+
+    servers= memcached_server_list_append(servers, server_host, port, &rc);
+    rc= memcached_server_push(_memc, servers);
+
+    if (rc != MEMCACHED_SUCCESS) {
+        log_it(L_ERROR, "Couldn't add server: %s", memcached_strerror(_memc, rc));
+        return -1;
+    }
+
+    if(dap_memcache_put(test_key, test_value, strlen(test_value), 0) != true) {
+        return -2;
+    }
+
+    _is_module_enable = true;
+    return 0;
+}
+
+bool dap_memcache_is_enable()
+{
+    return _is_module_enable;
+}
+
+bool dap_memcache_put(const char* key, void *value, size_t value_size, time_t expiration)
+{
+    memcached_return rc;
+    rc = memcached_set(_memc, key, strlen(key), value, value_size, expiration, (uint32_t)0);
+    if (rc != MEMCACHED_SUCCESS) {
+        log_it(L_ERROR, "%s", memcached_strerror(_memc, rc));
+        return false;
+    }
+    return true;
+}
+
+bool dap_memcache_get(const char* key, size_t * value_size, void ** result)
+{
+    memcached_return rc;
+    *result = memcached_get(_memc, key, strlen(key), value_size, NULL, &rc);
+    return rc == MEMCACHED_SUCCESS;
+}
+
+bool dap_memcache_delete(const char* key)
+{
+    return memcached_delete(_memc, key, strlen(key), 0) == MEMCACHED_SUCCESS;
+}
+
+/**
+ * @brief dap_memcached_deinit
+ */
+void dap_memcached_deinit()
+{
+    _is_module_enable = false;
+}
diff --git a/src/dap_server.c b/src/dap_server.c
index 0ba01d727a34d6b43e42c0868b9d6c02a49317dc..b423f7de752f46711649298a958dd1bbacb851c1 100755
--- a/src/dap_server.c
+++ b/src/dap_server.c
@@ -46,15 +46,12 @@
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
 #else
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
 #include <winsock2.h>
 #include <windows.h>
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #include "wrappers.h"
 #include <io.h>
-#include <wepoll.h>
 #include <pthread.h>
 #endif
 
diff --git a/src/dap_traffic_track.c b/src/dap_traffic_track.c
index 872e3616e34b5286aeffb57fc6a26a3ea93778af..7b7ccb72203b21b2e29c50728b3b1350e17a2bcd 100755
--- a/src/dap_traffic_track.c
+++ b/src/dap_traffic_track.c
@@ -32,14 +32,11 @@
 #include <pthread.h>
 #include <ev.h>
 #else
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
 #include <winsock2.h>
 #include <windows.h>
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #include <io.h>
-#include <wepoll.h>
 #include <pthread.h>
 #endif