diff --git a/control/NodeControlClient.cpp b/control/NodeControlClient.cpp
index 6fd7b12ed..e5ea2c20e 100644
--- a/control/NodeControlClient.cpp
+++ b/control/NodeControlClient.cpp
@@ -33,6 +33,8 @@
 #include "IpcListener.hpp"
 #include "NodeControlService.hpp"
 
+#include "stddef.h"
+
 #ifdef __WINDOWS__
 #include <WinSock2.h>
 #include <Windows.h>
diff --git a/main.cpp b/main.cpp
index 438144c62..c18f726a6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -573,8 +573,8 @@ static void printHelp(const char *cn,FILE *out)
 	fprintf(out,"Available switches:"ZT_EOL_S);
 	fprintf(out,"  -h                - Display this help"ZT_EOL_S);
 	fprintf(out,"  -v                - Show version"ZT_EOL_S);
-	fprintf(out,"  -p<port>          - Port for UDP (default: 9993)"ZT_EOL_S);
-	fprintf(out,"  -t<port>          - Port for TCP (default: disabled)"ZT_EOL_S);
+	fprintf(out,"  -p <port>         - Port for UDP (default: 9993)"ZT_EOL_S);
+	fprintf(out,"  -t <port>         - Port for TCP (default: disabled)"ZT_EOL_S);
 	//fprintf(out,"  -T<path>          - Override root topology, do not authenticate or update"ZT_EOL_S);
 #ifdef __UNIX_LIKE__
 	fprintf(out,"  -d                - Fork and run as daemon (Unix-ish OSes)"ZT_EOL_S);
diff --git a/node/Array.hpp b/node/Array.hpp
index ce179c16c..a1779909a 100644
--- a/node/Array.hpp
+++ b/node/Array.hpp
@@ -31,12 +31,14 @@
 #include <string>
 #include <algorithm>
 
+#include "stddef.h"
+
 namespace ZeroTier {
 
 /**
  * Static array -- a simple thing that's belonged in STL since the time of the dinosaurs
  */
-template<typename T,std::size_t S>
+template<typename T,size_t S>
 class Array
 {
 public:
@@ -44,19 +46,19 @@ public:
 
 	Array(const Array &a)
 	{
-		for(std::size_t i=0;i<S;++i)
+		for(size_t i=0;i<S;++i)
 			data[i] = a.data[i];
 	}
 
 	Array(const T *ptr)
 	{
-		for(std::size_t i=0;i<S;++i)
+		for(size_t i=0;i<S;++i)
 			data[i] = ptr[i];
 	}
 
 	inline Array &operator=(const Array &a)
 	{
-		for(std::size_t i=0;i<S;++i)
+		for(size_t i=0;i<S;++i)
 			data[i] = a.data[i];
 		return *this;
 	}
@@ -68,8 +70,8 @@ public:
 	typedef const T& const_reference;
 	typedef T* iterator;
 	typedef const T* const_iterator;
-	typedef std::size_t size_type;
-	typedef std::ptrdiff_t difference_type;
+	typedef size_t size_type;
+	typedef ptrdiff_t difference_type;
 	typedef std::reverse_iterator<iterator> reverse_iterator;
 	typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
 
@@ -83,11 +85,11 @@ public:
 	inline const_reverse_iterator rbegin() const throw() { return const_reverse_iterator(begin()); }
 	inline const_reverse_iterator rend() const throw() { return const_reverse_iterator(end()); }
 
-	inline std::size_t size() const throw() { return S; }
-	inline std::size_t max_size() const throw() { return S; }
+	inline size_t size() const throw() { return S; }
+	inline size_t max_size() const throw() { return S; }
 
-	inline reference operator[](const std::size_t n) throw() { return data[n]; }
-	inline const_reference operator[](const std::size_t n) const throw() { return data[n]; }
+	inline reference operator[](const size_t n) throw() { return data[n]; }
+	inline const_reference operator[](const size_t n) const throw() { return data[n]; }
 
 	inline reference front() throw() { return data[0]; }
 	inline const_reference front() const throw() { return data[0]; }
diff --git a/node/InetAddress.cpp b/node/InetAddress.cpp
index 832acf04c..5e36be0d5 100644
--- a/node/InetAddress.cpp
+++ b/node/InetAddress.cpp
@@ -137,7 +137,7 @@ std::string InetAddress::toString() const
 
 void InetAddress::fromString(const std::string &ipSlashPort)
 {
-	std::size_t slashAt = ipSlashPort.find('/');
+	size_t slashAt = ipSlashPort.find('/');
 	if ((slashAt == std::string::npos)||(slashAt >= ipSlashPort.length()))
 		set(ipSlashPort,0);
 	else {
diff --git a/node/Packet.hpp b/node/Packet.hpp
index 35cc5c7d2..a0647078e 100644
--- a/node/Packet.hpp
+++ b/node/Packet.hpp
@@ -33,7 +33,6 @@
 #include <stdio.h>
 
 #include <string>
-#include <iostream>
 
 #include "Constants.hpp"