diff --git a/src/client.cpp b/src/client.cpp
index 7ed01f88..c8cd61fd 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -44,7 +44,7 @@ zmq::client_t::~client_t ()
 
 void zmq::client_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	LIBZMQ_UNUSED(subscribe_to_all_);
+    LIBZMQ_UNUSED (subscribe_to_all_);
 
     zmq_assert (pipe_);    
 
diff --git a/src/dealer.cpp b/src/dealer.cpp
index 87c2721f..0086508f 100644
--- a/src/dealer.cpp
+++ b/src/dealer.cpp
@@ -45,7 +45,7 @@ zmq::dealer_t::~dealer_t ()
 
 void zmq::dealer_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	LIBZMQ_UNUSED(subscribe_to_all_);
+    LIBZMQ_UNUSED (subscribe_to_all_);
 
     zmq_assert (pipe_);
 
diff --git a/src/pair.cpp b/src/pair.cpp
index 18e5cb66..3e540142 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -48,7 +48,7 @@ zmq::pair_t::~pair_t ()
 
 void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	LIBZMQ_UNUSED(subscribe_to_all_);
+    LIBZMQ_UNUSED (subscribe_to_all_);
 
     zmq_assert (pipe_ != NULL);
 
diff --git a/src/pull.cpp b/src/pull.cpp
index a958b4c9..fd4ea3ea 100644
--- a/src/pull.cpp
+++ b/src/pull.cpp
@@ -45,7 +45,7 @@ zmq::pull_t::~pull_t ()
 
 void zmq::pull_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	LIBZMQ_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 31b1b0f5..90e7d441 100644
--- a/src/push.cpp
+++ b/src/push.cpp
@@ -45,7 +45,7 @@ zmq::push_t::~push_t ()
 
 void zmq::push_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	LIBZMQ_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 0e11e4b7..468225ee 100644
--- a/src/router.cpp
+++ b/src/router.cpp
@@ -67,7 +67,7 @@ zmq::router_t::~router_t ()
 
 void zmq::router_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	LIBZMQ_UNUSED(subscribe_to_all_);
+    LIBZMQ_UNUSED (subscribe_to_all_);
 
     zmq_assert (pipe_);
 
diff --git a/src/server.cpp b/src/server.cpp
index 9552482c..52bd256e 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -49,7 +49,7 @@ zmq::server_t::~server_t ()
 
 void zmq::server_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-	LIBZMQ_UNUSED(subscribe_to_all_);
+    LIBZMQ_UNUSED (subscribe_to_all_);
 
     zmq_assert (pipe_);    
 
diff --git a/src/tcp.cpp b/src/tcp.cpp
index 80e1721f..1260f186 100644
--- a/src/tcp.cpp
+++ b/src/tcp.cpp
@@ -95,13 +95,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.
-    LIBZMQ_UNUSED(keepalive_);
-    LIBZMQ_UNUSED(keepalive_cnt_);
-    LIBZMQ_UNUSED(keepalive_idle_);
-    LIBZMQ_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.
-	LIBZMQ_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 e2b4e800..5a8043e5 100644
--- a/src/tcp_address.cpp
+++ b/src/tcp_address.cpp
@@ -57,7 +57,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.
-	LIBZMQ_UNUSED(ipv6_);
+    LIBZMQ_UNUSED (ipv6_);
 
     //  Create a socket.
     const int fd = open_socket (AF_INET, SOCK_DGRAM, 0);
@@ -124,7 +124,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.
-    LIBZMQ_UNUSED(ipv6_);
+    LIBZMQ_UNUSED (ipv6_);
 
     //  Create a socket.
     const int sd = open_socket (AF_INET, SOCK_DGRAM, 0);
@@ -210,8 +210,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_)
 {
-	LIBZMQ_UNUSED(nic_);
-	LIBZMQ_UNUSED(ipv6_);
+    LIBZMQ_UNUSED (nic_);
+    LIBZMQ_UNUSED (ipv6_);
 
     errno = ENODEV;
     return -1;
diff --git a/src/xsub.cpp b/src/xsub.cpp
index 61c2a329..a9d2c925 100644
--- a/src/xsub.cpp
+++ b/src/xsub.cpp
@@ -56,7 +56,7 @@ zmq::xsub_t::~xsub_t ()
 
 void zmq::xsub_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-    LIBZMQ_UNUSED(subscribe_to_all_);
+    LIBZMQ_UNUSED (subscribe_to_all_);
 
     zmq_assert (pipe_);
     fq.attach (pipe_);