diff --git a/MSVC/opendht.vcxproj b/MSVC/opendht.vcxproj
index 4f6fa4724195993bf7e23303c16f18a1eacb24c4..38158f9c992fd099c82d77973bc64a649b22dda9 100644
--- a/MSVC/opendht.vcxproj
+++ b/MSVC/opendht.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\opendht-old\MSVC\wingetopt.c" />
+    <ClCompile Include="wingetopt.c" />
     <ClCompile Include="..\src\base64.cpp" />
     <ClCompile Include="..\src\callbacks.cpp" />
     <ClCompile Include="..\src\crypto.cpp" />
@@ -39,8 +39,8 @@
     <ClCompile Include="..\src\value.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\opendht-old\MSVC\unistd.h" />
-    <ClInclude Include="..\..\opendht-old\MSVC\wingetopt.h" />
+    <ClInclude Include="unistd.h" />
+    <ClInclude Include="wingetopt.h" />
     <ClInclude Include="..\include\opendht.h" />
     <ClInclude Include="..\include\opendht\callbacks.h" />
     <ClInclude Include="..\include\opendht\crypto.h" />
@@ -224,7 +224,7 @@ copy ..\include\opendht.h $(OutDir)\include\</Command>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)contrib\build\include;$(ProjectDir)..\include;$(ProjectDir)..\include\opendht;$(ProjectDir)contrib\build\msgpack-c\include;$(ProjectDir)contrib\build\argon2\include;$(ProjectDir)..\..\include;$(ProjectDir)..\..\argon2\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32_NATIVE;WIN32_LEAN_AND_MEAN;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4804;4800;4101;4267;4244;4503;4273;</DisableSpecificWarnings>
       <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
     </ClCompile>
diff --git a/MSVC/opendht.vcxproj.filters b/MSVC/opendht.vcxproj.filters
index a26b105b738e37d32986fd9984f726cc4f06fb03..c0c9bb8605695c2a58e414a0239f62ff9a1ada38 100644
--- a/MSVC/opendht.vcxproj.filters
+++ b/MSVC/opendht.vcxproj.filters
@@ -43,7 +43,6 @@
     <ClCompile Include="..\src\value.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\opendht-old\MSVC\wingetopt.c" />
     <ClCompile Include="..\src\base64.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -53,14 +52,13 @@
     <ClCompile Include="..\src\indexation\pht.cpp">
       <Filter>Source Files\indexation</Filter>
     </ClCompile>
+    <ClCompile Include="wingetopt.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\opendht\def.h" />
     <ClInclude Include="..\include\opendht\sockaddr.h" />
     <ClInclude Include="..\src\net.h" />
     <ClInclude Include="..\src\parsed_message.h" />
-    <ClInclude Include="..\..\opendht-old\MSVC\unistd.h" />
-    <ClInclude Include="..\..\opendht-old\MSVC\wingetopt.h" />
     <ClInclude Include="..\src\base64.h">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -139,6 +137,8 @@
     <ClInclude Include="..\include\opendht\indexation\pht.h">
       <Filter>Header Files\opendht\indexation</Filter>
     </ClInclude>
+    <ClInclude Include="unistd.h" />
+    <ClInclude Include="wingetopt.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">