diff --git a/w32/common/libmicrohttpd-filters.vcxproj b/w32/common/libmicrohttpd-filters.vcxproj
index b74ad25a..14294af2 100644
--- a/w32/common/libmicrohttpd-filters.vcxproj
+++ b/w32/common/libmicrohttpd-filters.vcxproj
@@ -5,11 +5,15 @@
       <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">
+    <Filter Include="Internal Headers">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
+    <Filter Include="Public Headers">
+      <UniqueIdentifier>{ec88d605-3383-4989-8e25-bc8efa824720}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+   <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
@@ -19,20 +23,88 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(MhdSrc)include\microhttpd.h">
-      <Filter>Header Files</Filter>
+      <Filter>Public Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MhdSrc)include\autoinit_funcs.h">
+      <Filter>Internal Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(MhdSrc)include\platform.h">
-      <Filter>Header Files</Filter>
+      <Filter>Internal Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(MhdSrc)include\mhd_options.h">
-      <Filter>Header Files</Filter>
+      <Filter>Internal Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(MhdW32Common)MHD_config.h">
-      <Filter>Header Files</Filter>
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\base64.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\connection.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\internal.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\md5.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\sha256.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\response.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_assert.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_bithelpers.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\sysfdsetsize.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_str.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_threads.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_locks.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_sockets.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc_types.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_send.h">
+      <Filter>Internal Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MhdSrc)microhttpd\mhd_compat.h">
+      <Filter>Internal Headers</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -60,9 +132,6 @@
     <ClCompile Include="$(MhdSrc)microhttpd\sha256.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\sha256.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\memorypool.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -81,87 +150,24 @@
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_mono_clock.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\base64.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\connection.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\internal.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\md5.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\memorypool.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\response.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\tsearch.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_assert.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_limits.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_bithelpers.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_byteorder.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_mono_clock.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\sysfdsetsize.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\sysfdsetsize.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_str.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_str.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_threads.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_threads.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_locks.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_sockets.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_sockets.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc_types.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_itc.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_itc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_send.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_send.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="$(MhdSrc)microhttpd\mhd_compat.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClCompile Include="$(MhdSrc)microhttpd\mhd_compat.c">
       <Filter>Source Files</Filter>
     </ClCompile>