diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6b30f2bcea3c1d422d4e13c62b97ff06413dee4..ed63026eb4b6211e0be7bac7521bae0a63c2187e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ if(WIN32)
   add_definitions("-DHAVE_PREAD")
   add_definitions("-DHAVE_MMAP")
   add_definitions("-DHAVE_STRNDUP")
-  add_definitions("-DWINVER=0x0600 -D_WIN32_WINNT=0x0600")
+  add_compile_definitions(WINVER=0x0600 _WIN32_WINNT=0x0600)
 
   if(DAP_RELEASE)
     set(_CCOPT "-static -std=gnu11 -Wall -O3 -fno-ident -ffast-math -ftree-vectorize -mfpmath=sse -mmmx -msse2 -fno-asynchronous-unwind-tables -ffunction-sections -Wl,--gc-sections -Wl,--strip-all")
diff --git a/libdap-chain b/libdap-chain
index 85dc96c77b8f1aef5a256bb8d375935dc9db70c1..82d31a4b2a4cd401cf0971c1aeef12dc591dd340 160000
--- a/libdap-chain
+++ b/libdap-chain
@@ -1 +1 @@
-Subproject commit 85dc96c77b8f1aef5a256bb8d375935dc9db70c1
+Subproject commit 82d31a4b2a4cd401cf0971c1aeef12dc591dd340
diff --git a/libdap-chain-gdb b/libdap-chain-gdb
index c5a7111b857d5784c33a9aaeb6abbe69d9bdf6a5..ee099ca92248d70adca2b23fdeef3283e2823605 160000
--- a/libdap-chain-gdb
+++ b/libdap-chain-gdb
@@ -1 +1 @@
-Subproject commit c5a7111b857d5784c33a9aaeb6abbe69d9bdf6a5
+Subproject commit ee099ca92248d70adca2b23fdeef3283e2823605
diff --git a/libdap-chain-global-db b/libdap-chain-global-db
index 4449476079faf4ab3180eed488edc4883c385a50..fe79d9ea3e9c88c35f0f33a726c7cd4e8a6829a3 160000
--- a/libdap-chain-global-db
+++ b/libdap-chain-global-db
@@ -1 +1 @@
-Subproject commit 4449476079faf4ab3180eed488edc4883c385a50
+Subproject commit fe79d9ea3e9c88c35f0f33a726c7cd4e8a6829a3
diff --git a/libdap-chain-net b/libdap-chain-net
index 95108040ee58ffdab6378aff52c59d4fb27caa59..a766e1e570af6bbbe2858f6fb92aedefab0f56ee 160000
--- a/libdap-chain-net
+++ b/libdap-chain-net
@@ -1 +1 @@
-Subproject commit 95108040ee58ffdab6378aff52c59d4fb27caa59
+Subproject commit a766e1e570af6bbbe2858f6fb92aedefab0f56ee
diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv
index 04e23e07662555083adf19059732bf9768e28f6e..620d2eff0406ff4202d5bfb7b79c2ce3752bad84 160000
--- a/libdap-chain-net-srv
+++ b/libdap-chain-net-srv
@@ -1 +1 @@
-Subproject commit 04e23e07662555083adf19059732bf9768e28f6e
+Subproject commit 620d2eff0406ff4202d5bfb7b79c2ce3752bad84
diff --git a/libdap-client b/libdap-client
index 8186a9c5d8e45a39b8e91a41e2cf668e7189d612..1ae33a38297c2c9aa77a691ff0b642d2650199d3 160000
--- a/libdap-client
+++ b/libdap-client
@@ -1 +1 @@
-Subproject commit 8186a9c5d8e45a39b8e91a41e2cf668e7189d612
+Subproject commit 1ae33a38297c2c9aa77a691ff0b642d2650199d3
diff --git a/libdap-server b/libdap-server
index 7c8b817b0a0833fca2b9e265b2f30d7dd5521e97..f135c654fe0fc145b9629f126f0eb8aa73626d31 160000
--- a/libdap-server
+++ b/libdap-server
@@ -1 +1 @@
-Subproject commit 7c8b817b0a0833fca2b9e265b2f30d7dd5521e97
+Subproject commit f135c654fe0fc145b9629f126f0eb8aa73626d31
diff --git a/libdap-server-core b/libdap-server-core
index 2d5e41760206d229bf0978270c8d5725bf9d237f..ef34431d8483a61493b02dd4e70b301e29c4873d 160000
--- a/libdap-server-core
+++ b/libdap-server-core
@@ -1 +1 @@
-Subproject commit 2d5e41760206d229bf0978270c8d5725bf9d237f
+Subproject commit ef34431d8483a61493b02dd4e70b301e29c4873d
diff --git a/libdap-server-udp b/libdap-server-udp
index 85eb1b45da29cb72d4df23eac50606bced02171a..09dd9065b1f5b1bd9c5e2f1853dfd161c4778101 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit 85eb1b45da29cb72d4df23eac50606bced02171a
+Subproject commit 09dd9065b1f5b1bd9c5e2f1853dfd161c4778101
diff --git a/libdap-stream-ch b/libdap-stream-ch
index 270768f0b85a96eba3578bd0ffe3cf25ac76dc5a..84e0d96f6301339572b62c363b5d46feab354521 160000
--- a/libdap-stream-ch
+++ b/libdap-stream-ch
@@ -1 +1 @@
-Subproject commit 270768f0b85a96eba3578bd0ffe3cf25ac76dc5a
+Subproject commit 84e0d96f6301339572b62c363b5d46feab354521
diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain
index d05bf6589b3a83ea9d1f8a5aa4b590ea253a613e..95c1da982b1caf20029ff97f779fdc057eda9907 160000
--- a/libdap-stream-ch-chain
+++ b/libdap-stream-ch-chain
@@ -1 +1 @@
-Subproject commit d05bf6589b3a83ea9d1f8a5aa4b590ea253a613e
+Subproject commit 95c1da982b1caf20029ff97f779fdc057eda9907
diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net
index c819e1c4c8b6d77d7093f6a6a43584e828250f72..dbc74e7e45af0512395025d01cc3cffe548bd63b 160000
--- a/libdap-stream-ch-chain-net
+++ b/libdap-stream-ch-chain-net
@@ -1 +1 @@
-Subproject commit c819e1c4c8b6d77d7093f6a6a43584e828250f72
+Subproject commit dbc74e7e45af0512395025d01cc3cffe548bd63b
diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv
index 68ebab00ae1544c4854c3c919472dab935b856fc..0c96cf2c10c9d2812a90d4bb7d45ba721c602e87 160000
--- a/libdap-stream-ch-chain-net-srv
+++ b/libdap-stream-ch-chain-net-srv
@@ -1 +1 @@
-Subproject commit 68ebab00ae1544c4854c3c919472dab935b856fc
+Subproject commit 0c96cf2c10c9d2812a90d4bb7d45ba721c602e87
diff --git a/sources/main.c b/sources/main.c
index c283e77a0bc54c4adaac4467ede273797c9e12d1..0665052d4549b9fa5232d56801b37c1d4b7489af 100755
--- a/sources/main.c
+++ b/sources/main.c
@@ -39,7 +39,6 @@
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #include <io.h>
-//#include "wrappers.h"
 #include <pthread.h>
 #include "userenv.h"
 
diff --git a/sources/main_node_cli_net.c b/sources/main_node_cli_net.c
index 35c81bbab7b9e45875dd9be24877921df6310238..7a8006dc0e672b164f13710f4d860ba5c0d7aca4 100644
--- a/sources/main_node_cli_net.c
+++ b/sources/main_node_cli_net.c
@@ -44,7 +44,6 @@
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #include <io.h>
-//#include "wrappers.h"
 #include <pthread.h>
 #else
 #include <sys/socket.h>
diff --git a/sources/main_node_cli_shell.c b/sources/main_node_cli_shell.c
index 797d81778608bb26183343f6ad45e15bafad0ebd..c72067016439ef04871b1be835a0f4fe0c5f9a20 100644
--- a/sources/main_node_cli_shell.c
+++ b/sources/main_node_cli_shell.c
@@ -20,7 +20,6 @@
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #include <io.h>
-//#include "wrappers.h"
 #include <pthread.h>
 #else
 #include <sys/ttydefaults.h>
diff --git a/sources/main_node_tool.c b/sources/main_node_tool.c
index f9185835270f6d53a45d12b96be2f196682ee44c..404b2da0c82ddd7c87a1cdf56f81eee7d20c3326 100644
--- a/sources/main_node_tool.c
+++ b/sources/main_node_tool.c
@@ -34,7 +34,6 @@
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #include <io.h>
-//#include "wrappers.h"
 #endif
 
 #include <pthread.h>