diff --git a/include/zmq.h b/include/zmq.h
index 87145d7d..cc70a72a 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -512,15 +512,18 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
 
 
 /******************************************************************************/
-/*  0MQ General                                                               */
+/*  0MQ Internal Use                                                          */
 /******************************************************************************/
 
-#define ZMQ_UNUSED(object) (void)object
+#define LIBZMQ_UNUSED(object) (void)object
 #define LIBZMQ_DELETE(p_object) {\
     delete p_object; \
     p_object = 0; \
 }
 
+
+/******************************************************************************/
+
 #undef ZMQ_EXPORT
 
 #ifdef __cplusplus
diff --git a/src/client.cpp b/src/client.cpp
index 1270e818..e8885cca 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -43,7 +43,7 @@ zmq::client_t::~client_t ()
 
 void zmq::client_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	ZMQ_UNUSED(subscribe_to_all_);
+	LIBZMQ_UNUSED(subscribe_to_all_);
 
     zmq_assert (pipe_);    
 
diff --git a/src/dealer.cpp b/src/dealer.cpp
index 6587414b..301478e7 100644
--- a/src/dealer.cpp
+++ b/src/dealer.cpp
@@ -44,7 +44,7 @@ zmq::dealer_t::~dealer_t ()
 
 void zmq::dealer_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	ZMQ_UNUSED(subscribe_to_all_);
+	LIBZMQ_UNUSED(subscribe_to_all_);
 
     zmq_assert (pipe_);
 
diff --git a/src/pair.cpp b/src/pair.cpp
index 48b25deb..e3dd786a 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -47,7 +47,7 @@ zmq::pair_t::~pair_t ()
 
 void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	ZMQ_UNUSED(subscribe_to_all_);
+	LIBZMQ_UNUSED(subscribe_to_all_);
 
     zmq_assert (pipe_ != NULL);
 
diff --git a/src/pull.cpp b/src/pull.cpp
index 20724ae0..3153f852 100644
--- a/src/pull.cpp
+++ b/src/pull.cpp
@@ -44,7 +44,7 @@ zmq::pull_t::~pull_t ()
 
 void zmq::pull_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	ZMQ_UNUSED(subscribe_to_all_);
+	LIBZMQ_UNUSED(subscribe_to_all_);
 
     zmq_assert (pipe_);
     fq.attach (pipe_);
diff --git a/src/push.cpp b/src/push.cpp
index cc53f149..fdbca661 100644
--- a/src/push.cpp
+++ b/src/push.cpp
@@ -44,7 +44,7 @@ zmq::push_t::~push_t ()
 
 void zmq::push_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	ZMQ_UNUSED(subscribe_to_all_);
+	LIBZMQ_UNUSED(subscribe_to_all_);
 
     //  Don't delay pipe termination as there is no one
     //  to receive the delimiter.
diff --git a/src/router.cpp b/src/router.cpp
index 29e53cdb..47a774ec 100644
--- a/src/router.cpp
+++ b/src/router.cpp
@@ -66,7 +66,7 @@ zmq::router_t::~router_t ()
 
 void zmq::router_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	ZMQ_UNUSED(subscribe_to_all_);
+	LIBZMQ_UNUSED(subscribe_to_all_);
 
     zmq_assert (pipe_);
 
diff --git a/src/server.cpp b/src/server.cpp
index dc549f8e..37796897 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -48,7 +48,7 @@ zmq::server_t::~server_t ()
 
 void zmq::server_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	ZMQ_UNUSED(subscribe_to_all_);
+	LIBZMQ_UNUSED(subscribe_to_all_);
 
     zmq_assert (pipe_);    
 
diff --git a/src/stream.cpp b/src/stream.cpp
index 479da01e..6a486b89 100644
--- a/src/stream.cpp
+++ b/src/stream.cpp
@@ -58,7 +58,7 @@ zmq::stream_t::~stream_t ()
 
 void zmq::stream_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	ZMQ_UNUSED(subscribe_to_all_);
+	LIBZMQ_UNUSED(subscribe_to_all_);
 
     zmq_assert (pipe_);
 
diff --git a/src/tcp.cpp b/src/tcp.cpp
index 1a978371..76423bce 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -94,13 +94,13 @@ void zmq::set_tcp_receive_buffer (fd_t sockfd_, int bufsize_)
 void zmq::tune_tcp_keepalives (fd_t s_, int keepalive_, int keepalive_cnt_, int keepalive_idle_, int keepalive_intvl_)
 {
     // These options are used only under certain #ifdefs below.
-    ZMQ_UNUSED(keepalive_);
-    ZMQ_UNUSED(keepalive_cnt_);
-    ZMQ_UNUSED(keepalive_idle_);
-    ZMQ_UNUSED(keepalive_intvl_);
+    LIBZMQ_UNUSED(keepalive_);
+    LIBZMQ_UNUSED(keepalive_cnt_);
+    LIBZMQ_UNUSED(keepalive_idle_);
+    LIBZMQ_UNUSED(keepalive_intvl_);
 
     // If none of the #ifdefs apply, then s_ is unused.
-	ZMQ_UNUSED(s_);
+	LIBZMQ_UNUSED(s_);
 
     //  Tuning TCP keep-alives if platform allows it
     //  All values = -1 means skip and leave it for OS
diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp
index 5b2959ac..21ee9479 100644
--- a/src/tcp_address.cpp
+++ b/src/tcp_address.cpp
@@ -56,7 +56,7 @@
 int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
 {
     //  TODO: Unused parameter, IPv6 support not implemented for Solaris.
-	ZMQ_UNUSED(ipv6_);
+	LIBZMQ_UNUSED(ipv6_);
 
     //  Create a socket.
     const int fd = open_socket (AF_INET, SOCK_DGRAM, 0);
@@ -123,7 +123,7 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_
 int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
 {
     //  TODO: Unused parameter, IPv6 support not implemented for AIX or HP/UX.
-    ZMQ_UNUSED(ipv6_);
+    LIBZMQ_UNUSED(ipv6_);
 
     //  Create a socket.
     const int sd = open_socket (AF_INET, SOCK_DGRAM, 0);
@@ -209,8 +209,8 @@ int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_
 //  This is true especially of Windows.
 int zmq::tcp_address_t::resolve_nic_name (const char *nic_, bool ipv6_, bool is_src_)
 {
-	ZMQ_UNUSED(nic_);
-	ZMQ_UNUSED(ipv6_);
+	LIBZMQ_UNUSED(nic_);
+	LIBZMQ_UNUSED(ipv6_);
 
     errno = ENODEV;
     return -1;
diff --git a/src/xsub.cpp b/src/xsub.cpp
index d01f8b08..2614f979 100644
--- a/src/xsub.cpp
+++ b/src/xsub.cpp
@@ -55,7 +55,7 @@ zmq::xsub_t::~xsub_t ()
 
 void zmq::xsub_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-    ZMQ_UNUSED(subscribe_to_all_);
+    LIBZMQ_UNUSED(subscribe_to_all_);
 
     zmq_assert (pipe_);
     fq.attach (pipe_);