Updated filters and included files in the VS2015 project

Closes #795

Signed-off-by: Haru <haru@dotalux.com>

8 files changed, 303 insertions, 142 deletions

diff --git a/vcproj-14/char-server.vcxproj b/vcproj-14/char-server.vcxproj
index 27c42430d..9400077fa 100644
--- a/vcproj-14/char-server.vcxproj
+++ b/vcproj-14/char-server.vcxproj
@@ -138,14 +138,19 @@
     <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
     <ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
+    <ClInclude Include="..\src\common\atomic.h" />
     <ClInclude Include="..\src\common\cbasetypes.h" />
     <ClInclude Include="..\src\common\conf.h" />
     <ClInclude Include="..\src\common\core.h" />
     <ClInclude Include="..\src\common\console.h" />
     <ClInclude Include="..\src\common\db.h" />
+    <ClInclude Include="..\src\common\des.h" />
     <ClInclude Include="..\src\common\ers.h" />
+    <ClInclude Include="..\src\common\hercules.h" />
     <ClInclude Include="..\src\common\HPM.h" />
+    <ClInclude Include="..\src\common\HPMDataCheck.h" />
     <ClInclude Include="..\src\common\HPMi.h" />
+    <ClInclude Include="..\src\common\HPMSymbols.inc.h" />
     <ClInclude Include="..\src\common\memmgr.h" />
     <ClInclude Include="..\src\common\mapindex.h" />
     <ClInclude Include="..\src\common\mmo.h" />
@@ -154,6 +159,7 @@
     <ClInclude Include="..\src\common\random.h" />
     <ClInclude Include="..\src\common\showmsg.h" />
     <ClInclude Include="..\src\common\socket.h" />
+    <ClInclude Include="..\src\common\spinlock.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
     <ClInclude Include="..\src\common\sysinfo.h" />
@@ -178,6 +184,11 @@
     <ClInclude Include="..\src\char\loginif.h" />
     <ClInclude Include="..\src\char\mapif.h" />
     <ClInclude Include="..\src\char\pincode.h" />
+    <ClInclude Include="..\src\config\classes\general.h" />
+    <ClInclude Include="..\src\config\const.h" />
+    <ClInclude Include="..\src\config\core.h" />
+    <ClInclude Include="..\src\config\renewal.h" />
+    <ClInclude Include="..\src\config\secure.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\3rdparty\libconfig\grammar.c" />
@@ -190,6 +201,7 @@
     <ClCompile Include="..\src\common\core.c" />
     <ClCompile Include="..\src\common\console.c" />
     <ClCompile Include="..\src\common\db.c" />
+    <ClCompile Include="..\src\common\des.c" />
     <ClCompile Include="..\src\common\ers.c" />
     <ClCompile Include="..\src\common\HPM.c" />
     <ClCompile Include="..\src\common\memmgr.c" />
diff --git a/vcproj-14/char-server.vcxproj.filters b/vcproj-14/char-server.vcxproj.filters
index 2f232b2cc..751afc993 100644
--- a/vcproj-14/char-server.vcxproj.filters
+++ b/vcproj-14/char-server.vcxproj.filters
@@ -53,55 +53,55 @@
       <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\HPMchar.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\char.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\geoip.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_auction.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_elemental.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_guild.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_homun.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_mail.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_mercenary.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_party.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_pet.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_quest.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\int_storage.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\inter.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\loginif.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\mapif.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\src\char\pincode.c">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClCompile>
     <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
       <Filter>3rdparty\mt19937ar</Filter>
@@ -127,6 +127,9 @@
     <ClCompile Include="..\src\common\mutex.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\des.c">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\common\cbasetypes.h">
@@ -190,55 +193,55 @@
       <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\HPMchar.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\char.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\geoip.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_auction.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_elemental.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_guild.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_homun.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_mail.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_mercenary.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_party.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_pet.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_quest.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\int_storage.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\inter.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\loginif.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\mapif.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\src\char\pincode.h">
-      <Filter>char_sql</Filter>
+      <Filter>char</Filter>
     </ClInclude>
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
       <Filter>3rdparty\mt19937ar</Filter>
@@ -273,14 +276,44 @@
     <ClInclude Include="..\src\common\mutex.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\atomic.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\des.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\hercules.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\HPMDataCheck.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\HPMSymbols.inc.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\spinlock.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\const.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\secure.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\classes\general.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
       <UniqueIdentifier>{623f21b1-c166-4848-83d8-8b4fe0e2e2df}</UniqueIdentifier>
     </Filter>
-    <Filter Include="char_sql">
-      <UniqueIdentifier>{83b1ecf5-21d1-4dac-915f-95ff77a90899}</UniqueIdentifier>
-    </Filter>
     <Filter Include="3rdparty">
       <UniqueIdentifier>{b3f5c857-79c0-4a55-b8c5-7e7f56a8f948}</UniqueIdentifier>
     </Filter>
@@ -290,5 +323,11 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{9e8badd7-548f-4eb4-9e87-613e87e772ff}</UniqueIdentifier>
     </Filter>
+    <Filter Include="char">
+      <UniqueIdentifier>{83b1ecf5-21d1-4dac-915f-95ff77a90899}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{d2dbc907-ce23-48c3-85ac-049ff2a8c728}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/vcproj-14/login-server.vcxproj b/vcproj-14/login-server.vcxproj
index 02539ef61..201611016 100644
--- a/vcproj-14/login-server.vcxproj
+++ b/vcproj-14/login-server.vcxproj
@@ -140,9 +140,21 @@
     <ClInclude Include="..\3rdparty\libconfig\scanner.h" />
     <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
     <ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
+    <ClInclude Include="..\src\common\atomic.h" />
+    <ClInclude Include="..\src\common\conf.h" />
+    <ClInclude Include="..\src\common\des.h" />
+    <ClInclude Include="..\src\common\hercules.h" />
+    <ClInclude Include="..\src\common\HPMDataCheck.h" />
+    <ClInclude Include="..\src\common\HPMSymbols.inc.h" />
     <ClInclude Include="..\src\common\mutex.h" />
+    <ClInclude Include="..\src\common\spinlock.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\winapi.h" />
+    <ClInclude Include="..\src\config\classes\general.h" />
+    <ClInclude Include="..\src\config\const.h" />
+    <ClInclude Include="..\src\config\core.h" />
+    <ClInclude Include="..\src\config\renewal.h" />
+    <ClInclude Include="..\src\config\secure.h" />
     <ClInclude Include="..\src\login\account.h" />
     <ClInclude Include="..\src\login\HPMlogin.h" />
     <ClInclude Include="..\src\login\ipban.h" />
@@ -176,6 +188,7 @@
     <ClCompile Include="..\3rdparty\libconfig\scanctx.c" />
     <ClCompile Include="..\3rdparty\libconfig\scanner.c" />
     <ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
+    <ClCompile Include="..\src\common\des.c" />
     <ClCompile Include="..\src\common\mutex.c" />
     <ClCompile Include="..\src\common\thread.c" />
     <ClCompile Include="..\src\login\account_sql.c" />
diff --git a/vcproj-14/login-server.vcxproj.filters b/vcproj-14/login-server.vcxproj.filters
index 0d27feaea..29cbe05d3 100644
--- a/vcproj-14/login-server.vcxproj.filters
+++ b/vcproj-14/login-server.vcxproj.filters
@@ -2,19 +2,19 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\src\login\account_sql.c">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClCompile>
     <ClCompile Include="..\src\login\HPMlogin.c">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClCompile>
     <ClCompile Include="..\src\login\ipban_sql.c">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClCompile>
     <ClCompile Include="..\src\login\login.c">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClCompile>
     <ClCompile Include="..\src\login\loginlog_sql.c">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\conf.c">
       <Filter>common</Filter>
@@ -91,22 +91,25 @@
     <ClCompile Include="..\src\common\mutex.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\des.c">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\login\account.h">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClInclude>
     <ClInclude Include="..\src\login\HPMlogin.h">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClInclude>
     <ClInclude Include="..\src\login\ipban.h">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClInclude>
     <ClInclude Include="..\src\login\loginlog.h">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClInclude>
     <ClInclude Include="..\src\login\login.h">
-      <Filter>login_sql</Filter>
+      <Filter>login</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\cbasetypes.h">
       <Filter>common</Filter>
@@ -117,7 +120,7 @@
     <ClInclude Include="..\src\common\core.h">
       <Filter>common</Filter>
     </ClInclude>
-	<ClInclude Include="..\src\common\console.h">
+    <ClInclude Include="..\src\common\console.h">
       <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\db.h">
@@ -201,14 +204,44 @@
     <ClInclude Include="..\src\common\mutex.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\atomic.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\des.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\hercules.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\HPMDataCheck.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\HPMSymbols.inc.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\spinlock.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\const.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\secure.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\classes\general.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
       <UniqueIdentifier>{b50ee803-e71d-4d41-8f7d-2dad5839df50}</UniqueIdentifier>
     </Filter>
-    <Filter Include="login_sql">
-      <UniqueIdentifier>{8eea96ed-d379-4694-ae2e-ffb0be95170c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="3rdparty">
       <UniqueIdentifier>{ab5c90ec-923d-4847-a214-45b40818211e}</UniqueIdentifier>
     </Filter>
@@ -218,5 +251,11 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{779e8145-9bb2-4a88-9149-60586ab0bdd4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="login">
+      <UniqueIdentifier>{8eea96ed-d379-4694-ae2e-ffb0be95170c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{d8fb6ac7-c87d-4d6b-aea4-98a0ea800666}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/vcproj-14/map-server.vcxproj b/vcproj-14/map-server.vcxproj
index 425c864f6..5ed3e7538 100644
--- a/vcproj-14/map-server.vcxproj
+++ b/vcproj-14/map-server.vcxproj
@@ -95,7 +95,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\src;..\3rdparty;..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src;..\3rdparty;..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -136,6 +136,7 @@
     <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
     <ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
+    <ClInclude Include="..\src\common\atomic.h" />
     <ClInclude Include="..\src\common\cbasetypes.h" />
     <ClInclude Include="..\src\common\conf.h" />
     <ClInclude Include="..\src\common\core.h" />
@@ -144,8 +145,11 @@
     <ClInclude Include="..\src\common\des.h" />
     <ClInclude Include="..\src\common\ers.h" />
     <ClInclude Include="..\src\common\grfio.h" />
+    <ClInclude Include="..\src\common\hercules.h" />
     <ClInclude Include="..\src\common\HPM.h" />
+    <ClInclude Include="..\src\common\HPMDataCheck.h" />
     <ClInclude Include="..\src\common\HPMi.h" />
+    <ClInclude Include="..\src\common\HPMSymbols.inc.h" />
     <ClInclude Include="..\src\common\memmgr.h" />
     <ClInclude Include="..\src\common\mapindex.h" />
     <ClInclude Include="..\src\common\md5calc.h" />
@@ -155,6 +159,7 @@
     <ClInclude Include="..\src\common\random.h" />
     <ClInclude Include="..\src\common\showmsg.h" />
     <ClInclude Include="..\src\common\socket.h" />
+    <ClInclude Include="..\src\common\spinlock.h" />
     <ClInclude Include="..\src\common\sql.h" />
     <ClInclude Include="..\src\common\strlib.h" />
     <ClInclude Include="..\src\common\sysinfo.h" />
diff --git a/vcproj-14/map-server.vcxproj.filters b/vcproj-14/map-server.vcxproj.filters
index 40ace58c8..13192d108 100644
--- a/vcproj-14/map-server.vcxproj.filters
+++ b/vcproj-14/map-server.vcxproj.filters
@@ -2,118 +2,118 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\src\map\atcommand.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\battle.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\battleground.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\buyingstore.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\chat.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\chrif.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\clif.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\date.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\duel.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\elemental.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\guild.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\homunculus.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\HPMmap.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\instance.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\intif.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\irc-bot.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\itemdb.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\log.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\mail.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\map.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\mapreg_sql.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\mercenary.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\mob.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\npc.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\npc_chat.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\party.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\path.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\pc.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\pet.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\quest.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\script.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\searchstore.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\skill.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\status.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\storage.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\trade.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\unit.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\vending.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\core.c">
       <Filter>common</Filter>
@@ -173,7 +173,7 @@
       <Filter>common</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\pc_groups.c">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\showmsg.c">
       <Filter>common</Filter>
@@ -202,125 +202,127 @@
     <ClCompile Include="..\src\common\mutex.c">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\map\channel.c" />
+    <ClCompile Include="..\src\map\channel.c">
+      <Filter>map</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\map\atcommand.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\battle.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\battleground.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\buyingstore.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\chat.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\chrif.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\clif.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\date.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\duel.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\elemental.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\guild.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\homunculus.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\HPMmap.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\instance.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\intif.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\irc-bot.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\itemdb.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\log.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\mail.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\map.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\mapreg.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\mercenary.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\mob.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\npc.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\packets.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\packets_struct.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\party.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\path.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\pc.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\pet.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\quest.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\script.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\searchstore.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\skill.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\status.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\storage.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\trade.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\unit.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\vending.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\cbasetypes.h">
       <Filter>common</Filter>
@@ -385,16 +387,11 @@
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\config\const.h" />
-    <ClInclude Include="..\src\config\core.h" />
-    <ClInclude Include="..\src\config\renewal.h" />
-    <ClInclude Include="..\src\config\secure.h" />
-    <ClInclude Include="..\src\config\classes\general.h" />
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
     <ClInclude Include="..\src\map\pc_groups.h">
-      <Filter>map_sql</Filter>
+      <Filter>map</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\showmsg.h">
       <Filter>common</Filter>
@@ -432,15 +429,44 @@
     <ClInclude Include="..\src\common\mutex.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\map\channel.h" />
+    <ClInclude Include="..\src\map\channel.h">
+      <Filter>map</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\atomic.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\hercules.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\HPMDataCheck.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\HPMSymbols.inc.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\spinlock.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\const.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\classes\general.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\secure.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
       <UniqueIdentifier>{3a137217-ebf7-44ee-95d9-3d7c51d2a199}</UniqueIdentifier>
     </Filter>
-    <Filter Include="map_sql">
-      <UniqueIdentifier>{8c01a080-5a78-4fb7-96f2-862c33a02230}</UniqueIdentifier>
-    </Filter>
     <Filter Include="3rdparty">
       <UniqueIdentifier>{c4845ea8-bcc7-411b-af29-e3842adb6714}</UniqueIdentifier>
     </Filter>
@@ -450,5 +476,11 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{9caf40b7-c4d1-43b4-bd1f-0376b4f920e7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="map">
+      <UniqueIdentifier>{8c01a080-5a78-4fb7-96f2-862c33a02230}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{d7d16c66-c973-45d7-b47f-a1f80a898b9b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/vcproj-14/mapcache.vcxproj b/vcproj-14/mapcache.vcxproj
index 7304b8df4..6b4ea92df 100644
--- a/vcproj-14/mapcache.vcxproj
+++ b/vcproj-14/mapcache.vcxproj
@@ -151,7 +151,11 @@
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\winapi.h" />
     <ClInclude Include="..\src\common\nullpo.h" />
+    <ClInclude Include="..\src\config\classes\general.h" />
+    <ClInclude Include="..\src\config\const.h" />
+    <ClInclude Include="..\src\config\core.h" />
     <ClInclude Include="..\src\config\renewal.h" />
+    <ClInclude Include="..\src\config\secure.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/vcproj-14/mapcache.vcxproj.filters b/vcproj-14/mapcache.vcxproj.filters
index 957cabac8..0e8702591 100644
--- a/vcproj-14/mapcache.vcxproj.filters
+++ b/vcproj-14/mapcache.vcxproj.filters
@@ -75,7 +75,21 @@
     <ClInclude Include="..\src\common\nullpo.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\config\renewal.h" />
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\const.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\secure.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\classes\general.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -84,5 +98,8 @@
     <Filter Include="mapcache">
       <UniqueIdentifier>{5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{4d14995f-43fd-4eb0-abcb-78d1d05a8606}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>
\ No newline at end of file