diff --git a/Makefile.am b/Makefile.am
index 4cf539dc..d701936a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ SUBDIRS = contrib src m4 .
 W32COMMON = w32/common/gen_dll_res.ps1 w32/common/microhttpd_dll_res_vc.rc.in w32/common/microhttpd_dll_res_vc.rc \
   w32/common/MHD_config.h w32/common/vs_dirs.props w32/common/common-build-settings.vcxproj \
   w32/common/libmicrohttpd-build-settings.vcxproj w32/common/libmicrohttpd-files.vcxproj w32/common/libmicrohttpd-filters.vcxproj \
-  w32/common/hellobrowser-build-settings.vcxproj w32/common/hellobrowser-files.vcxproj w32/common/hellobrowser-filters.vcxproj
+  w32/common/hellobrowser-files.vcxproj w32/common/hellobrowser-filters.vcxproj \
+  w32/common/apps-build-settings.vcxproj
 W32VS2013 = w32/VS2013/libmicrohttpd.vcxproj w32/VS2013/libmicrohttpd.vcxproj.filters \
   w32/VS2013/hellobrowser.vcxproj w32/VS2013/hellobrowser.vcxproj.filters \
   w32/VS2013/libmicrohttpd.sln 
diff --git a/w32/.gitignore b/w32/.gitignore
index 8199bd81..f135e603 100644
--- a/w32/.gitignore
+++ b/w32/.gitignore
@@ -10,4 +10,5 @@
 *.tlog
 *.idb
 *.rc
+*.VC.db
 .vs
diff --git a/w32/VS2013/hellobrowser.vcxproj b/w32/VS2013/hellobrowser.vcxproj
index 21970cbc..450f1485 100644
--- a/w32/VS2013/hellobrowser.vcxproj
+++ b/w32/VS2013/hellobrowser.vcxproj
@@ -78,7 +78,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <Import Project="$(MhdW32Common)common-build-settings.vcxproj" />
-  <Import Project="$(MhdW32Common)hellobrowser-build-settings.vcxproj" />
+  <Import Project="$(MhdW32Common)apps-build-settings.vcxproj" />
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile />
diff --git a/w32/VS2015/hellobrowser.vcxproj b/w32/VS2015/hellobrowser.vcxproj
index a831969d..d546c5de 100644
--- a/w32/VS2015/hellobrowser.vcxproj
+++ b/w32/VS2015/hellobrowser.vcxproj
@@ -78,7 +78,7 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <Import Project="$(MhdW32Common)common-build-settings.vcxproj" />
-  <Import Project="$(MhdW32Common)hellobrowser-build-settings.vcxproj" />
+  <Import Project="$(MhdW32Common)apps-build-settings.vcxproj" />
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile />
diff --git a/w32/common/hellobrowser-build-settings.vcxproj b/w32/common/apps-build-settings.vcxproj
similarity index 100%
rename from w32/common/hellobrowser-build-settings.vcxproj
rename to w32/common/apps-build-settings.vcxproj
diff --git a/w32/common/hellobrowser-filters.vcxproj b/w32/common/hellobrowser-filters.vcxproj
index c985906e..14384940 100644
--- a/w32/common/hellobrowser-filters.vcxproj
+++ b/w32/common/hellobrowser-filters.vcxproj
@@ -5,14 +5,6 @@
       <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;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>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MhdRoot)doc\examples\hellobrowser.c">