diff --git a/doc/zmq.txt b/doc/zmq.txt
index cb70dbb2..84c061dc 100644
--- a/doc/zmq.txt
+++ b/doc/zmq.txt
@@ -136,10 +136,10 @@ Establishing a message flow::
     linkzmq:zmq_connect[3]
 
 Sending and receiving messages::
+    linkzmq:zmq_msg_send[3]
+    linkzmq:zmq_msg_recv[3]
     linkzmq:zmq_send[3]
-    linkzmq:zmq_sendmsg[3]
     linkzmq:zmq_recv[3]
-    linkzmq:zmq_recvmsg[3]
 
 .Input/output multiplexing
 0MQ provides a mechanism for applications to multiplex input/output events over
diff --git a/include/zmq.h b/include/zmq.h
index ed0ab131..1829e4fe 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -256,6 +256,8 @@ ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg, int option, int optval);
 /*  Send/recv options.                                                        */
 #define ZMQ_DONTWAIT 1
 #define ZMQ_SNDMORE 2
+/*  Deprecated aliases                                                        */
+#define ZMQ_NOBLOCK ZMQ_DONTWAIT
 
 /******************************************************************************/
 /*  0MQ socket events and monitoring                                          */
diff --git a/src/device.cpp b/src/device.cpp
index 3829d4e6..08999e58 100644
--- a/src/device.cpp
+++ b/src/device.cpp
@@ -1,6 +1,6 @@
 /*
-    Copyright (c) 2007-2011 iMatix Corporation
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2012 iMatix Corporation
+    Copyright (c) 2007-2012 Other contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -19,34 +19,8 @@
 */
 
 #include <stddef.h>
-
-#include "platform.hpp"
-
-#if defined ZMQ_FORCE_SELECT
-#define ZMQ_POLL_BASED_ON_SELECT
-#elif defined ZMQ_FORCE_POLL
-#define ZMQ_POLL_BASED_ON_POLL
-#elif defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_FREEBSD ||\
-    defined ZMQ_HAVE_OPENBSD || defined ZMQ_HAVE_SOLARIS ||\
-    defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_QNXNTO ||\
-    defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_AIX ||\
-    defined ZMQ_HAVE_NETBSD
-#define ZMQ_POLL_BASED_ON_POLL
-#elif defined ZMQ_HAVE_WINDOWS || defined ZMQ_HAVE_OPENVMS ||\
-     defined ZMQ_HAVE_CYGWIN
-#define ZMQ_POLL_BASED_ON_SELECT
-#endif
-
-//  On AIX platform, poll.h has to be included first to get consistent
-//  definition of pollfd structure (AIX uses 'reqevents' and 'retnevents'
-//  instead of 'events' and 'revents' and defines macros to map from POSIX-y
-//  names to AIX-specific names).
-#if defined ZMQ_POLL_BASED_ON_POLL
-#include <poll.h>
-#endif
-
 #include "../include/zmq.h"
-
+#include "platform.hpp"
 #include "device.hpp"
 #include "socket_base.hpp"
 #include "likely.hpp"