diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip
index 288e9b141..694926239 100644
--- a/ext/installfiles/windows/ZeroTier One.aip	
+++ b/ext/installfiles/windows/ZeroTier One.aip	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="11.2.1" Modules="professional" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="11.3" Modules="professional" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}">
   <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
     <ROW Name="HiddenItems" Value="UpdaterComponent;SerValComponent;PreReqComponent;MsiMergeModsComponent;MsiRegsComponent;MsiExtComponent;MsiAssemblyComponent;ActSyncAppComponent;MsiThemeComponent;BackgroundImagesComponent;DictionaryComponent;MsiEnvComponent;CPLAppletComponent;MsiClassComponent;WebApplicationsComponent;MsiOdbcDataSrcComponent;MsiAppSearchComponent"/>
   </COMPONENT>
@@ -20,10 +20,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
     <ROW Property="Manufacturer" Value="ZeroTier Networks LLC"/>
-    <ROW Property="ProductCode" Value="1033:{71E78B40-7DAC-4F5B-B591-CC09F1CF277D} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{984911DE-6DED-42B7-8287-6865A2A7CB19} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ZeroTier One"/>
-    <ROW Property="ProductVersion" Value="0.9.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="0.9.1" Type="32"/>
     <ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
@@ -291,7 +291,7 @@
     <ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent">
-    <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Order="2" Flags="14" Text="0"/>
+    <ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Order="2" Flags="14" Text="1"/>
     <ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Order="0" Flags="14" Text="false"/>
     <ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Order="0" Flags="14" Text="0"/>
     <ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Order="1" Flags="14" Text="9"/>
diff --git a/version.h b/version.h
index 8f75a81ed..21dc6ac50 100644
--- a/version.h
+++ b/version.h
@@ -41,6 +41,6 @@
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 0
+#define ZEROTIER_ONE_VERSION_REVISION 1
 
 #endif
diff --git a/windows/SelfTest/SelfTest.vcxproj b/windows/SelfTest/SelfTest.vcxproj
deleted file mode 100644
index 5fb9e5f13..000000000
--- a/windows/SelfTest/SelfTest.vcxproj
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\ext\lz4\lz4.h" />
-    <ClInclude Include="..\..\ext\lz4\lz4hc.h" />
-    <ClInclude Include="..\..\node\Address.hpp" />
-    <ClInclude Include="..\..\node\Array.hpp" />
-    <ClInclude Include="..\..\node\AtomicCounter.hpp" />
-    <ClInclude Include="..\..\node\BandwidthAccount.hpp" />
-    <ClInclude Include="..\..\node\Buffer.hpp" />
-    <ClInclude Include="..\..\node\C25519.hpp" />
-    <ClInclude Include="..\..\node\CertificateOfMembership.hpp" />
-    <ClInclude Include="..\..\node\CMWC4096.hpp" />
-    <ClInclude Include="..\..\node\Condition.hpp" />
-    <ClInclude Include="..\..\node\Constants.hpp" />
-    <ClInclude Include="..\..\node\Defaults.hpp" />
-    <ClInclude Include="..\..\node\Demarc.hpp" />
-    <ClInclude Include="..\..\node\Dictionary.hpp" />
-    <ClInclude Include="..\..\node\EthernetTap.hpp" />
-    <ClInclude Include="..\..\node\HttpClient.hpp" />
-    <ClInclude Include="..\..\node\Identity.hpp" />
-    <ClInclude Include="..\..\node\InetAddress.hpp" />
-    <ClInclude Include="..\..\node\Logger.hpp" />
-    <ClInclude Include="..\..\node\MAC.hpp" />
-    <ClInclude Include="..\..\node\Multicaster.hpp" />
-    <ClInclude Include="..\..\node\MulticastGroup.hpp" />
-    <ClInclude Include="..\..\node\Mutex.hpp" />
-    <ClInclude Include="..\..\node\Network.hpp" />
-    <ClInclude Include="..\..\node\NetworkConfig.hpp" />
-    <ClInclude Include="..\..\node\Node.hpp" />
-    <ClInclude Include="..\..\node\NodeConfig.hpp" />
-    <ClInclude Include="..\..\node\NonCopyable.hpp" />
-    <ClInclude Include="..\..\node\Packet.hpp" />
-    <ClInclude Include="..\..\node\PacketDecoder.hpp" />
-    <ClInclude Include="..\..\node\Peer.hpp" />
-    <ClInclude Include="..\..\node\Poly1305.hpp" />
-    <ClInclude Include="..\..\node\RuntimeEnvironment.hpp" />
-    <ClInclude Include="..\..\node\Salsa20.hpp" />
-    <ClInclude Include="..\..\node\Service.hpp" />
-    <ClInclude Include="..\..\node\SHA512.hpp" />
-    <ClInclude Include="..\..\node\SharedPtr.hpp" />
-    <ClInclude Include="..\..\node\SoftwareUpdater.hpp" />
-    <ClInclude Include="..\..\node\Switch.hpp" />
-    <ClInclude Include="..\..\node\SysEnv.hpp" />
-    <ClInclude Include="..\..\node\Thread.hpp" />
-    <ClInclude Include="..\..\node\Topology.hpp" />
-    <ClInclude Include="..\..\node\UdpSocket.hpp" />
-    <ClInclude Include="..\..\node\Utils.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\ext\lz4\lz4.c" />
-    <ClCompile Include="..\..\ext\lz4\lz4hc.c" />
-    <ClCompile Include="..\..\node\C25519.cpp" />
-    <ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
-    <ClCompile Include="..\..\node\Defaults.cpp" />
-    <ClCompile Include="..\..\node\Demarc.cpp" />
-    <ClCompile Include="..\..\node\EthernetTap.cpp" />
-    <ClCompile Include="..\..\node\HttpClient.cpp" />
-    <ClCompile Include="..\..\node\Identity.cpp" />
-    <ClCompile Include="..\..\node\InetAddress.cpp" />
-    <ClCompile Include="..\..\node\Logger.cpp" />
-    <ClCompile Include="..\..\node\Multicaster.cpp" />
-    <ClCompile Include="..\..\node\Network.cpp" />
-    <ClCompile Include="..\..\node\NetworkConfig.cpp" />
-    <ClCompile Include="..\..\node\Node.cpp" />
-    <ClCompile Include="..\..\node\NodeConfig.cpp" />
-    <ClCompile Include="..\..\node\Packet.cpp" />
-    <ClCompile Include="..\..\node\PacketDecoder.cpp" />
-    <ClCompile Include="..\..\node\Peer.cpp" />
-    <ClCompile Include="..\..\node\Poly1305.cpp" />
-    <ClCompile Include="..\..\node\Salsa20.cpp" />
-    <ClCompile Include="..\..\node\Service.cpp" />
-    <ClCompile Include="..\..\node\SHA512.cpp" />
-    <ClCompile Include="..\..\node\SoftwareUpdater.cpp" />
-    <ClCompile Include="..\..\node\Switch.cpp" />
-    <ClCompile Include="..\..\node\SysEnv.cpp" />
-    <ClCompile Include="..\..\node\Topology.cpp" />
-    <ClCompile Include="..\..\node\UdpSocket.cpp" />
-    <ClCompile Include="..\..\node\Utils.cpp" />
-    <ClCompile Include="..\..\selftest.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SelfTest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)\Build\$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\ext\bin\libcrypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;winhttp.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\ext\bin\libcrypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;winhttp.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\ext\bin\libcrypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;winhttp.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\ext\bin\libcrypto\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>wsock32.lib;ws2_32.lib;winhttp.lib;Iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/windows/SelfTest/SelfTest.vcxproj.filters b/windows/SelfTest/SelfTest.vcxproj.filters
deleted file mode 100644
index 38981ab05..000000000
--- a/windows/SelfTest/SelfTest.vcxproj.filters
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\node\Address.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Array.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\AtomicCounter.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\BandwidthAccount.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Buffer.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\C25519.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\CertificateOfMembership.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\CMWC4096.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Condition.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Constants.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Defaults.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Demarc.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Dictionary.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\EthernetTap.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\HttpClient.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Identity.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\InetAddress.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Logger.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\MAC.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Multicaster.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\MulticastGroup.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Mutex.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Network.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\NetworkConfig.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Node.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\NodeConfig.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\NonCopyable.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Packet.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\PacketDecoder.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Peer.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Poly1305.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\RuntimeEnvironment.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Salsa20.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Service.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SHA512.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SharedPtr.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SoftwareUpdater.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Switch.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\SysEnv.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Thread.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Topology.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\UdpSocket.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\node\Utils.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\lz4\lz4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ext\lz4\lz4hc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\node\C25519.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\CertificateOfMembership.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Defaults.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Demarc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\EthernetTap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\HttpClient.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Identity.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\InetAddress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Logger.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Multicaster.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Network.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\NetworkConfig.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Node.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\NodeConfig.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Packet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\PacketDecoder.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Peer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Poly1305.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Salsa20.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Service.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\SHA512.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\SoftwareUpdater.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Switch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\SysEnv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Topology.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\UdpSocket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\node\Utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\selftest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\lz4\lz4.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ext\lz4\lz4hc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/windows/SelfTest/targetver.h b/windows/SelfTest/targetver.h
deleted file mode 100644
index 87c0086de..000000000
--- a/windows/SelfTest/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
diff --git a/windows/ZeroTierOne.sln b/windows/ZeroTierOne.sln
index b363b8e3a..00ae7a025 100644
--- a/windows/ZeroTierOne.sln
+++ b/windows/ZeroTierOne.sln
@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SelfTest", "SelfTest\SelfTest.vcxproj", "{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver", "TapDriver\TapDriver.vcxproj", "{689210B1-467C-4850-BB7D-2E10D5B4A3DA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapDriver Package", "TapDriver Package\TapDriver Package.vcxproj", "{FDA1DD8D-1D56-4BC1-B402-FCC0B550D946}"
@@ -71,116 +69,6 @@ Global
 		Win8 Release|x86 = Win8 Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|Any CPU.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|Mixed Platforms.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|Mixed Platforms.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|Win32.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|Win32.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|Win32.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|x64.ActiveCfg = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|x64.Build.0 = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|x64.Deploy.0 = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|x86.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|x86.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.CD_ROM|x86.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|Win32.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|Win32.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|x64.ActiveCfg = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|x64.Build.0 = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|x86.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|x86.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|x86.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Any CPU.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Mixed Platforms.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Mixed Platforms.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Win32.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Win32.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Win32.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|x64.ActiveCfg = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|x64.Build.0 = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|x64.Deploy.0 = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|x86.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|x86.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|x86.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Release|Any CPU.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Release|Win32.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Release|Win32.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Release|x64.ActiveCfg = Release|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Release|x86.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Release|x86.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Release|x86.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|Any CPU.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|Mixed Platforms.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|Mixed Platforms.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|Mixed Platforms.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|Win32.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|Win32.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|Win32.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|x64.ActiveCfg = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|x64.Build.0 = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|x64.Deploy.0 = Debug|x64
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|x86.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|x86.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.SingleImage|x86.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|Any CPU.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|Win32.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|Win32.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|Win32.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|x64.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|x86.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|x86.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Debug|x86.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|Any CPU.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|Win32.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|Win32.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|Win32.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|x64.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|x86.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|x86.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Vista Release|x86.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|Any CPU.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|Win32.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|Win32.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|Win32.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|x64.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|x86.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|x86.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Debug|x86.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|Any CPU.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|Win32.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|Win32.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|Win32.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|x64.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|x86.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|x86.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win7 Release|x86.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|Any CPU.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|Win32.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|Win32.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|Win32.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|x64.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|x86.ActiveCfg = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|x86.Build.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Debug|x86.Deploy.0 = Debug|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|Any CPU.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|Win32.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|Win32.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|Win32.Deploy.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|x64.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|x86.ActiveCfg = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|x86.Build.0 = Release|Win32
-		{DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Win8 Release|x86.Deploy.0 = Release|Win32
 		{689210B1-467C-4850-BB7D-2E10D5B4A3DA}.CD_ROM|Any CPU.ActiveCfg = Vista Release|Win32
 		{689210B1-467C-4850-BB7D-2E10D5B4A3DA}.CD_ROM|Mixed Platforms.ActiveCfg = Vista Release|Win32
 		{689210B1-467C-4850-BB7D-2E10D5B4A3DA}.CD_ROM|Mixed Platforms.Build.0 = Vista Release|Win32
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index 8e41be065..d564b57ee 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@@ -225,6 +225,9 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
       <StringPooling>true</StringPooling>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -246,6 +249,9 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <StringPooling>true</StringPooling>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>