diff --git a/builds/msvc/vs2008/libzmq/libzmq.vcproj b/builds/msvc/vs2008/libzmq/libzmq.vcproj
index 0a16630d..1315c592 100644
--- a/builds/msvc/vs2008/libzmq/libzmq.vcproj
+++ b/builds/msvc/vs2008/libzmq/libzmq.vcproj
@@ -106,6 +106,7 @@
+
@@ -181,12 +182,14 @@
+
+
diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
index 2db6be69..d214729a 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
@@ -70,10 +70,12 @@
+
+
@@ -85,6 +87,7 @@
+
@@ -178,6 +181,7 @@
+
diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
index 9b93a830..930b009b 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
@@ -16,6 +16,9 @@
src
+
+ src
+
src
@@ -282,6 +285,9 @@
src\include
+
+ src\include
+
src\include
@@ -297,6 +303,9 @@
src\include
+
+ src\include
+
src\include
@@ -567,6 +576,9 @@
src\include
+
+ src\include
+
diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
index d053b24c..478c0644 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
@@ -70,6 +70,8 @@
+
+
@@ -85,6 +87,7 @@
+
@@ -178,6 +181,7 @@
+
diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
index 9b93a830..930b009b 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
@@ -16,6 +16,9 @@
src
+
+ src
+
src
@@ -282,6 +285,9 @@
src\include
+
+ src\include
+
src\include
@@ -297,6 +303,9 @@
src\include
+
+ src\include
+
src\include
@@ -567,6 +576,9 @@
src\include
+
+ src\include
+
diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
index 5346239c..799b7688 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
@@ -67,14 +67,15 @@
-
+
+
@@ -86,6 +87,7 @@
+
@@ -179,6 +181,7 @@
+
diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
index 6b4a9d30..930b009b 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
@@ -16,6 +16,9 @@
src
+
+ src
+
src
@@ -282,6 +285,9 @@
src\include
+
+ src\include
+
src\include
@@ -297,6 +303,9 @@
src\include
+
+ src\include
+
src\include
diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj b/builds/msvc/vs2015/libzmq/libzmq.vcxproj
index 6d4080dd..a4ceaac2 100644
--- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj
@@ -70,10 +70,12 @@
+
+
@@ -85,6 +87,7 @@
+
@@ -178,6 +181,7 @@
+
diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters
index 9b93a830..930b009b 100644
--- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters
@@ -16,6 +16,9 @@
src
+
+ src
+
src
@@ -282,6 +285,9 @@
src\include
+
+ src\include
+
src\include
@@ -297,6 +303,9 @@
src\include
+
+ src\include
+
src\include
@@ -567,6 +576,9 @@
src\include
+
+ src\include
+
diff --git a/src/udp_engine.cpp b/src/udp_engine.cpp
index 3c963ab1..25b37271 100644
--- a/src/udp_engine.cpp
+++ b/src/udp_engine.cpp
@@ -167,9 +167,9 @@ void zmq::udp_engine_t::sockaddr_to_msg (zmq::msg_t *msg, sockaddr_in* addr)
char* name = inet_ntoa(addr->sin_addr);
char port[6];
- sprintf (port, "%d", (int)ntohs (addr->sin_port));
+ sprintf (port, "%d", (int) ntohs (addr->sin_port));
- int size = strlen (name) + strlen (port) + 1 + 1; // Colon + NULL
+ int size = (int) strlen (name) + (int) strlen (port) + 1 + 1; // Colon + NULL
int rc = msg->init_size (size);
errno_assert (rc == 0);
msg->set_flags (msg_t::more);
@@ -188,7 +188,7 @@ int zmq::udp_engine_t::resolve_raw_address (char *name_, size_t length_)
// Find delimiter, cannot use memrchr as it is not supported on windows
if (length_ != 0) {
- int chars_left = length_;
+ int chars_left = (int) length_;
char *current_char = name_ + length_;
do {
if (*(--current_char) == ':') {