diff --git a/node/Demarc.hpp b/node/Demarc.hpp
index 79db26d5d..767cc864a 100644
--- a/node/Demarc.hpp
+++ b/node/Demarc.hpp
@@ -30,8 +30,10 @@
 
 #include <stdlib.h>
 #include <stdint.h>
+
 #include <map>
 #include <string>
+
 #include "Mutex.hpp"
 #include "InetAddress.hpp"
 
diff --git a/node/Logger.hpp b/node/Logger.hpp
index 8ecfc0d63..de71ed39a 100644
--- a/node/Logger.hpp
+++ b/node/Logger.hpp
@@ -29,8 +29,10 @@
 #define _ZT_LOGGER_HPP
 
 #include <stdio.h>
+
 #include <string>
 #include <stdexcept>
+
 #include "NonCopyable.hpp"
 #include "Mutex.hpp"
 
diff --git a/node/MulticastGroup.hpp b/node/MulticastGroup.hpp
index 9b96d6e8c..bb025ab16 100644
--- a/node/MulticastGroup.hpp
+++ b/node/MulticastGroup.hpp
@@ -29,7 +29,9 @@
 #define _ZT_MULTICASTGROUP_HPP
 
 #include <stdint.h>
+
 #include <string>
+
 #include "MAC.hpp"
 #include "InetAddress.hpp"
 
diff --git a/node/NodeConfig.hpp b/node/NodeConfig.hpp
index a2da444f0..c32d14d92 100644
--- a/node/NodeConfig.hpp
+++ b/node/NodeConfig.hpp
@@ -28,13 +28,14 @@
 #ifndef _ZT_NODECONFIG_HPP
 #define _ZT_NODECONFIG_HPP
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 #include <stdexcept>
 
-#include <stdint.h>
 #include "SharedPtr.hpp"
 #include "Network.hpp"
 #include "Utils.hpp"
diff --git a/node/Packet.hpp b/node/Packet.hpp
index f42198e12..0c5c4aa96 100644
--- a/node/Packet.hpp
+++ b/node/Packet.hpp
@@ -31,6 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
+
 #include <string>
 #include <iostream>
 
diff --git a/node/RuntimeEnvironment.hpp b/node/RuntimeEnvironment.hpp
index f8b395972..c0b5bcbe6 100644
--- a/node/RuntimeEnvironment.hpp
+++ b/node/RuntimeEnvironment.hpp
@@ -29,6 +29,7 @@
 #define _ZT_RUNTIMEENVIRONMENT_HPP
 
 #include <string>
+
 #include "Constants.hpp"
 #include "Identity.hpp"
 #include "Condition.hpp"
diff --git a/node/Salsa20.hpp b/node/Salsa20.hpp
index 488d87541..fa95ed393 100644
--- a/node/Salsa20.hpp
+++ b/node/Salsa20.hpp
@@ -8,6 +8,7 @@
 #define _ZT_SALSA20_HPP
 
 #include <stdint.h>
+
 #include "Constants.hpp"
 
 namespace ZeroTier {
diff --git a/node/SysEnv.cpp b/node/SysEnv.cpp
index 20b8e7d1c..150b26a86 100644
--- a/node/SysEnv.cpp
+++ b/node/SysEnv.cpp
@@ -31,6 +31,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
+
 #include <set>
 #include <string>
 
diff --git a/node/Topology.hpp b/node/Topology.hpp
index 3c504218f..23f04ae45 100644
--- a/node/Topology.hpp
+++ b/node/Topology.hpp
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include <map>
 #include <set>
 #include <list>