diff --git a/node/Node.hpp b/node/Node.hpp
index 64c9fcb46..d7b039b86 100644
--- a/node/Node.hpp
+++ b/node/Node.hpp
@@ -65,6 +65,12 @@ public:
 	Node(void *uptr,const struct ZT_Node_Callbacks *callbacks,uint64_t now);
 	virtual ~Node();
 
+	// Get rid of alignment warnings on 32-bit Windows and possibly improve performance
+#ifdef __WINDOWS__
+	void * operator new(size_t i) { return _mm_malloc(i,16); }
+	void operator delete(void* p) { _mm_free(p); }
+#endif
+
 	// Public API Functions ----------------------------------------------------
 
 	ZT_ResultCode processWirePacket(
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index 2a6545eb2..6a2ca5202 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@@ -25,7 +25,6 @@
     <ClCompile Include="..\..\ext\libnatpmp\getgateway.c" />
     <ClCompile Include="..\..\ext\libnatpmp\natpmp.c" />
     <ClCompile Include="..\..\ext\libnatpmp\wingettimeofday.c" />
-    <ClCompile Include="..\..\ext\lz4\lz4.c" />
     <ClCompile Include="..\..\ext\miniupnpc\connecthostport.c" />
     <ClCompile Include="..\..\ext\miniupnpc\igd_desc_parse.c" />
     <ClCompile Include="..\..\ext\miniupnpc\minisoap.c" />
@@ -81,28 +80,11 @@
     <ClCompile Include="ZeroTierOneService.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\codelength.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\connecthostport.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\igd_desc_parse.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minisoap.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minissdpc.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpc.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpcstrings.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpctypes.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpc_declspec.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniwget.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minixml.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\portlistingparse.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\receivedata.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpcommands.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnperrors.h" />
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpreplyparse.h" />
     <ClInclude Include="..\..\ext\http-parser\http_parser.h" />
-    <ClInclude Include="..\..\ext\json-parser\json.h" />
+    <ClInclude Include="..\..\ext\json\json.hpp" />
     <ClInclude Include="..\..\ext\libnatpmp\getgateway.h" />
     <ClInclude Include="..\..\ext\libnatpmp\natpmp.h" />
     <ClInclude Include="..\..\ext\libnatpmp\wingettimeofday.h" />
-    <ClInclude Include="..\..\ext\lz4\lz4.h" />
     <ClInclude Include="..\..\ext\miniupnpc\codelength.h" />
     <ClInclude Include="..\..\ext\miniupnpc\connecthostport.h" />
     <ClInclude Include="..\..\ext\miniupnpc\igd_desc_parse.h" />
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
index 8a426d4bb..ff3d48210 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
@@ -40,18 +40,9 @@
     <Filter Include="Header Files\ext\http-parser">
       <UniqueIdentifier>{17ae9a01-d39f-4c6d-a800-8f2cd0804c96}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\ext\json-parser">
-      <UniqueIdentifier>{736aad7f-8d95-4602-88df-3bb970869c6f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\lz4">
-      <UniqueIdentifier>{3636527c-bc03-4852-bd3c-20ee25e56d82}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\ext">
       <UniqueIdentifier>{7784af31-5b60-4300-b07e-44cf864c54db}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\ext\lz4">
-      <UniqueIdentifier>{29164186-10fc-45f5-b253-6d03f0ddd4db}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\ext\http-parser">
       <UniqueIdentifier>{f8a1c208-15b8-4d85-a4cb-11d2b82f2d1e}</UniqueIdentifier>
     </Filter>
@@ -67,15 +58,6 @@
     <Filter Include="Header Files\windows\ZeroTierOne">
       <UniqueIdentifier>{bf604491-14c4-4a74-81a6-6105d07c5c7c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\ext\bin">
-      <UniqueIdentifier>{5939db69-ab17-47c6-97fb-185e2c678737}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\bin\miniupnpc">
-      <UniqueIdentifier>{3666f510-b6da-47cb-8039-56441f2dac3e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\ext\bin\miniupnpc\include">
-      <UniqueIdentifier>{1a47071e-e51b-4535-89ae-858946f03118}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\ext\miniupnpc">
       <UniqueIdentifier>{5423fb64-896b-432e-a19d-88d4467f89f9}</UniqueIdentifier>
     </Filter>
@@ -91,6 +73,9 @@
     <Filter Include="Source Files\controller">
       <UniqueIdentifier>{3cad34c8-c436-43ae-8323-57803637c832}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\ext\json">
+      <UniqueIdentifier>{ff20532b-d9a2-440d-a7b4-b49e26a9b2f8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\service\ControlPlane.cpp">
@@ -165,9 +150,6 @@
     <ClCompile Include="..\..\node\Utils.cpp">
       <Filter>Source Files\node</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\lz4\lz4.c">
-      <Filter>Source Files\ext\lz4</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\http-parser\http_parser.c">
       <Filter>Source Files\ext\http-parser</Filter>
     </ClCompile>
@@ -404,12 +386,6 @@
     <ClInclude Include="..\..\node\Utils.hpp">
       <Filter>Header Files\node</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\lz4\lz4.h">
-      <Filter>Header Files\ext\lz4</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\json-parser\json.h">
-      <Filter>Header Files\ext\json-parser</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\http-parser\http_parser.h">
       <Filter>Header Files\ext\http-parser</Filter>
     </ClInclude>
@@ -425,54 +401,6 @@
     <ClInclude Include="..\..\osdep\BackgroundResolver.hpp">
       <Filter>Header Files\osdep</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\codelength.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\connecthostport.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\igd_desc_parse.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minisoap.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minissdpc.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpc.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpc_declspec.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpcstrings.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniupnpctypes.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\miniwget.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\minixml.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\portlistingparse.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\receivedata.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpcommands.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnperrors.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\bin\miniupnpc\include\miniupnpc\upnpreplyparse.h">
-      <Filter>Header Files\ext\bin\miniupnpc\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\node\BinarySemaphore.hpp">
       <Filter>Header Files\node</Filter>
     </ClInclude>
@@ -557,6 +485,9 @@
     <ClInclude Include="..\..\service\SoftwareUpdater.hpp">
       <Filter>Header Files\service</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\ext\json\json.hpp">
+      <Filter>Header Files\ext\json</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZeroTierOne.rc">