diff --git a/Makefile.am b/Makefile.am
index 586a8fa6..fd86a8dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,7 @@ AM_CPPFLAGS = \
lib_LTLIBRARIES = src/libzmq.la
include_HEADERS = \
- include/zmq.h \
- include/zmq_utils.h
+ include/zmq.h
src_libzmq_la_SOURCES = \
src/address.cpp \
@@ -231,7 +230,6 @@ src_libzmq_la_SOURCES = \
src/socket_poller.hpp \
src/socket_poller.cpp
-
if ON_MINGW
src_libzmq_la_LDFLAGS = \
-no-undefined \
diff --git a/builds/cygwin/Makefile.cygwin b/builds/cygwin/Makefile.cygwin
index ba93277a..80eaea22 100755
--- a/builds/cygwin/Makefile.cygwin
+++ b/builds/cygwin/Makefile.cygwin
@@ -18,6 +18,7 @@ OBJS = ctx.o reaper.o dist.o err.o \
pgm_socket.o pgm_receiver.o pgm_sender.o \
raw_decoder.o raw_encoder.o \
v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
+ udp_address.o upd_engine.o radio.o dish.o \
socket_base.o session_base.o options.o \
req.o rep.o push.o pull.o pub.o sub.o pair.o \
dealer.o router.o xpub.o xsub.o stream.o \
diff --git a/builds/mingw32/Makefile.mingw32 b/builds/mingw32/Makefile.mingw32
index 840fad98..bf4ac0fb 100644
--- a/builds/mingw32/Makefile.mingw32
+++ b/builds/mingw32/Makefile.mingw32
@@ -18,6 +18,7 @@ OBJS = ctx.o reaper.o dist.o err.o \
pgm_socket.o pgm_receiver.o pgm_sender.o \
raw_decoder.o raw_encoder.o \
v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
+ udp_address.o upd_engine.o radio.o dish.o \
socket_base.o session_base.o options.o \
req.o rep.o push.o pull.o pub.o sub.o pair.o \
dealer.o router.o xpub.o xsub.o stream.o \
diff --git a/builds/msvc/vs2008/libzmq/libzmq.vcproj b/builds/msvc/vs2008/libzmq/libzmq.vcproj
index 51432e86..0a16630d 100644
--- a/builds/msvc/vs2008/libzmq/libzmq.vcproj
+++ b/builds/msvc/vs2008/libzmq/libzmq.vcproj
@@ -100,6 +100,7 @@
+
@@ -109,7 +110,6 @@
-
@@ -168,12 +168,15 @@
+
+
+
@@ -189,7 +192,6 @@
-
@@ -256,6 +258,8 @@
+
+
diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
index 322cf0e9..c7d08f6d 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
@@ -67,8 +67,9 @@
+
+
-
@@ -121,7 +122,6 @@
-
@@ -154,6 +154,8 @@
+
+
@@ -162,7 +164,6 @@
-
@@ -244,6 +245,8 @@
+
+
diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
index 2866e117..bde688db 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
@@ -243,9 +243,6 @@
-
- include
-
include
@@ -567,4 +564,4 @@
resource
-
\ No newline at end of file
+
diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
index 265e90a0..d8d08797 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
@@ -67,8 +67,9 @@
+
+
-
@@ -121,7 +122,6 @@
-
@@ -154,6 +154,8 @@
+
+
@@ -162,7 +164,6 @@
-
@@ -244,6 +245,8 @@
+
+
diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
index 2866e117..bde688db 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
@@ -243,9 +243,6 @@
-
- include
-
include
@@ -567,4 +564,4 @@
resource
-
\ No newline at end of file
+
diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
index ba31fb89..a5889721 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
@@ -67,8 +67,9 @@
+
+
-
@@ -121,7 +122,6 @@
-
@@ -154,6 +154,8 @@
+
+
@@ -162,7 +164,6 @@
-
@@ -244,6 +245,8 @@
+
+
diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
index e9acdfc4..27b71d9a 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
@@ -243,9 +243,6 @@
-
- include
-
include
@@ -567,4 +564,4 @@
resource
-
\ No newline at end of file
+
diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj b/builds/msvc/vs2015/libzmq/libzmq.vcxproj
index 5201d076..4999d942 100644
--- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj
@@ -75,8 +75,9 @@
+
+
-
@@ -129,9 +130,6 @@
-
-
-
@@ -164,6 +162,8 @@
+
+
@@ -172,7 +172,6 @@
-
@@ -256,6 +255,8 @@
+
+
@@ -275,4 +276,4 @@
-
\ No newline at end of file
+
diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters
index 54a0bd2f..e32e6bf5 100644
--- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters
@@ -258,9 +258,6 @@
-
- include
-
include
@@ -597,4 +594,4 @@
resource
-
\ No newline at end of file
+
diff --git a/src/options.cpp b/src/options.cpp
index ce970c8a..f13b187c 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -32,7 +32,6 @@
#include "options.hpp"
#include "err.hpp"
#include "macros.hpp"
-#include "../include/zmq_utils.h"
zmq::options_t::options_t () :
sndhwm (1000),