diff --git a/node/Defaults.hpp b/node/Defaults.hpp
index fe79d5255..787193dce 100644
--- a/node/Defaults.hpp
+++ b/node/Defaults.hpp
@@ -32,6 +32,7 @@
 #include <string>
 #include <vector>
 #include <map>
+
 #include "Identity.hpp"
 #include "InetAddress.hpp"
 
diff --git a/node/Dictionary.hpp b/node/Dictionary.hpp
index 178810fff..a0a64cec4 100644
--- a/node/Dictionary.hpp
+++ b/node/Dictionary.hpp
@@ -31,6 +31,7 @@
 #include <string>
 #include <map>
 #include <stdexcept>
+ 
 #include "Constants.hpp"
 
 namespace ZeroTier {
diff --git a/node/InetAddress.cpp b/node/InetAddress.cpp
index b24768938..3f643639e 100644
--- a/node/InetAddress.cpp
+++ b/node/InetAddress.cpp
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
+
 #include <string>
 
 #include "Constants.hpp"
diff --git a/node/Multicaster.hpp b/node/Multicaster.hpp
index 3a4f355dc..77c7c532e 100644
--- a/node/Multicaster.hpp
+++ b/node/Multicaster.hpp
@@ -178,7 +178,7 @@ public:
 		throw()
 	{
 		for(unsigned int i=0;i<ZT_MULTICAST_DEDUP_HISTORY_LENGTH;++i) {
-			if ((_multicastHistory[i][0] == crc)&&((now - _multicastHistory[i][1]) < ZT_MULTICAST_DEDUP_HISTORY_EXPIRE))
+			if ((_multicastHistory[i][0] == crc)&&((now - _multicastHistory[i][1]) <= ZT_MULTICAST_DEDUP_HISTORY_EXPIRE))
 				return true;
 		}
 		return false;
diff --git a/node/Network.cpp b/node/Network.cpp
index 6a28228b6..b9ab513d0 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include "Constants.hpp"
 #include "RuntimeEnvironment.hpp"
 #include "NodeConfig.hpp"
 #include "Network.hpp"
diff --git a/node/Switch.hpp b/node/Switch.hpp
index 71e1e3866..edfb6f159 100644
--- a/node/Switch.hpp
+++ b/node/Switch.hpp
@@ -33,10 +33,10 @@
 #include <vector>
 #include <list>
 
+#include "Constants.hpp"
 #include "Mutex.hpp"
 #include "MAC.hpp"
 #include "NonCopyable.hpp"
-#include "Constants.hpp"
 #include "Packet.hpp"
 #include "Utils.hpp"
 #include "InetAddress.hpp"