ifdef's for BSD and cleanup

src/zm_comms.cpp

@@ -26,15 +26,9 @@
 #include <stdarg.h>
 //#include <memory.h>
 #include <alloca.h>
-#include <string.h>
 //#include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
-#if defined(BSD)
-#include <sys/uio.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
 #include <netinet/tcp.h>
 
 int CommsBase::readV( int iovcnt, /* const void *, int, */ ... )

src/zm_comms.h

@@ -22,6 +22,7 @@
 
 #include "zm_exception.h"
 
+#include <string.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <errno.h>
@@ -30,6 +31,12 @@
 #include <set>
 #include <vector>
 
+#if defined(BSD)
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#endif
+
 class CommsException : public Exception
 {
 public: