Problem: name conflicts from windows.h, draft API declared in pch.

src/zmq.cpp

@@ -40,16 +40,14 @@
 #include <poll.h>
 #endif
 
+// TODO: determine if this is an issue, since zmq.h is being loaded from pch.
 // zmq.h must be included *after* poll.h for AIX to build properly
-#include "../include/zmq.h"
+//#include "../include/zmq.h"
 
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
+#if !defined ZMQ_HAVE_WINDOWS
 #include <unistd.h>
 #endif
 
-
 // XSI vector I/O
 #if defined ZMQ_HAVE_UIO
 #include <sys/uio.h>
@@ -60,7 +58,6 @@ struct iovec {
 };
 #endif
 
-
 #include <string.h>
 #include <stdlib.h>
 #include <new>