diff --git a/VS2017/common_lib/common_lib.vcxproj b/VS2017/common_lib/common_lib.vcxproj
deleted file mode 100644
index 5447a31..0000000
--- a/VS2017/common_lib/common_lib.vcxproj
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{11561197-1120-428C-A43D-7BCDFBCF79B8}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>common_lib</RootNamespace>
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </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 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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\common\m4;$(ProjectDir)..\..\common\m4\lib;$(ProjectDir)..\..\common\misc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4146;4308</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\common\m4;$(ProjectDir)..\..\common\m4\lib;$(ProjectDir)..\..\common\misc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4146;4308</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\common\m4\lib\binary-io.h" />
-    <ClInclude Include="..\..\common\m4\lib\c-stack.h" />
-    <ClInclude Include="..\..\common\m4\lib\clean-temp.h" />
-    <ClInclude Include="..\..\common\m4\lib\cloexec.h" />
-    <ClInclude Include="..\..\common\m4\lib\close-stream.h" />
-    <ClInclude Include="..\..\common\m4\lib\closein.h" />
-    <ClInclude Include="..\..\common\m4\lib\closeout.h" />
-    <ClInclude Include="..\..\common\m4\lib\execute.h" />
-    <ClInclude Include="..\..\common\m4\lib\filenamecat.h" />
-    <ClInclude Include="..\..\common\m4\lib\fpending.h" />
-    <ClInclude Include="..\..\common\m4\lib\freadahead.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash_list1.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash_list2.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anylinked_list1.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anylinked_list2.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anytree_oset.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_array_list.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_avltree_oset.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_linkedhash_list.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_list.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_oset.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_xlist.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_xoset.h" />
-    <ClInclude Include="..\..\common\m4\lib\ignore-value.h" />
-    <ClInclude Include="..\..\common\m4\lib\malloca.h" />
-    <ClInclude Include="..\..\common\m4\lib\memchr2.h" />
-    <ClInclude Include="..\..\common\m4\lib\pathmax.h" />
-    <ClInclude Include="..\..\common\m4\lib\printf-args.h" />
-    <ClInclude Include="..\..\common\m4\lib\printf-parse.h" />
-    <ClInclude Include="..\..\common\m4\lib\progname.h" />
-    <ClInclude Include="..\..\common\m4\lib\regex.h" />
-    <ClInclude Include="..\..\common\m4\lib\regex_internal.h" />
-    <ClInclude Include="..\..\common\m4\lib\stdio--.h" />
-    <ClInclude Include="..\..\common\m4\lib\stdlib--.h" />
-    <ClInclude Include="..\..\common\m4\lib\stdlib-safer.h" />
-    <ClInclude Include="..\..\common\m4\lib\tempname.h" />
-    <ClInclude Include="..\..\common\m4\lib\tmpdir.h" />
-    <ClInclude Include="..\..\common\m4\lib\unistd--.h" />
-    <ClInclude Include="..\..\common\m4\lib\unistd-safer.h" />
-    <ClInclude Include="..\..\common\m4\lib\vasnprintf.h" />
-    <ClInclude Include="..\..\common\m4\lib\verror.h" />
-    <ClInclude Include="..\..\common\m4\lib\version-etc.h" />
-    <ClInclude Include="..\..\common\m4\lib\w32spawn.h" />
-    <ClInclude Include="..\..\common\m4\lib\xmalloca.h" />
-    <ClInclude Include="..\..\common\m4\lib\xprintf.h" />
-    <ClInclude Include="..\..\common\m4\lib\xsize.h" />
-    <ClInclude Include="..\..\common\m4\lib\xvasprintf.h" />
-    <ClInclude Include="..\..\common\m4\m4.h" />
-    <ClInclude Include="..\..\common\misc\arg-nonnull.h" />
-    <ClInclude Include="..\..\common\misc\argmatch.h" />
-    <ClInclude Include="..\..\common\misc\bbitset.h" />
-    <ClInclude Include="..\..\common\misc\bitrotate.h" />
-    <ClInclude Include="..\..\common\misc\bitset.h" />
-    <ClInclude Include="..\..\common\misc\bitsetv.h" />
-    <ClInclude Include="..\..\common\misc\bitset\array.h" />
-    <ClInclude Include="..\..\common\misc\bitset\base.h" />
-    <ClInclude Include="..\..\common\misc\bitset\list.h" />
-    <ClInclude Include="..\..\common\misc\bitset\stats.h" />
-    <ClInclude Include="..\..\common\misc\bitset\table.h" />
-    <ClInclude Include="..\..\common\misc\bitset\vector.h" />
-    <ClInclude Include="..\..\common\misc\c-ctype.h" />
-    <ClInclude Include="..\..\common\misc\c-strcase.h" />
-    <ClInclude Include="..\..\common\misc\c-strcaseeq.h" />
-    <ClInclude Include="..\..\common\misc\cjk.h" />
-    <ClInclude Include="..\..\common\misc\concat-filename.h" />
-    <ClInclude Include="..\..\common\misc\config.h" />
-    <ClInclude Include="..\..\common\misc\diffseq.h" />
-    <ClInclude Include="..\..\common\misc\dirname.h" />
-    <ClInclude Include="..\..\common\misc\dosname.h" />
-    <ClInclude Include="..\..\common\misc\error.h" />
-    <ClInclude Include="..\..\common\misc\exitfail.h" />
-    <ClInclude Include="..\..\common\misc\filename.h" />
-    <ClInclude Include="..\..\common\misc\fstrcmp.h" />
-    <ClInclude Include="..\..\common\misc\get-errno.h" />
-    <ClInclude Include="..\..\common\misc\gethrxtime.h" />
-    <ClInclude Include="..\..\common\misc\getopt.h" />
-    <ClInclude Include="..\..\common\misc\getopt_int.h" />
-    <ClInclude Include="..\..\common\misc\gettext.h" />
-    <ClInclude Include="..\..\common\misc\gl_hash_map.h" />
-    <ClInclude Include="..\..\common\misc\gl_map.h" />
-    <ClInclude Include="..\..\common\misc\gl_xmap.h" />
-    <ClInclude Include="..\..\common\misc\glthread\lock.h" />
-    <ClInclude Include="..\..\common\misc\glthread\tls.h" />
-    <ClInclude Include="..\..\common\misc\hash.h" />
-    <ClInclude Include="..\..\common\misc\ialloc.h" />
-    <ClInclude Include="..\..\common\misc\idx.h" />
-    <ClInclude Include="..\..\common\misc\integer_length.h" />
-    <ClInclude Include="..\..\common\misc\intprops.h" />
-    <ClInclude Include="..\..\common\misc\libiberty.h" />
-    <ClInclude Include="..\..\common\misc\localcharset.h" />
-    <ClInclude Include="..\..\common\misc\mbchar.h" />
-    <ClInclude Include="..\..\common\misc\mbfile.h" />
-    <ClInclude Include="..\..\common\misc\mbswidth.h" />
-    <ClInclude Include="..\..\common\misc\obstack.h" />
-    <ClInclude Include="..\..\common\misc\path-join.h" />
-    <ClInclude Include="..\..\common\misc\progname.h" />
-    <ClInclude Include="..\..\common\misc\quote.h" />
-    <ClInclude Include="..\..\common\misc\quotearg.h" />
-    <ClInclude Include="..\..\common\misc\relocatable.h" />
-    <ClInclude Include="..\..\common\misc\stdbool.h" />
-    <ClInclude Include="..\..\common\misc\stdio-safer.h" />
-    <ClInclude Include="..\..\common\misc\streq.h" />
-    <ClInclude Include="..\..\common\misc\system.h" />
-    <ClInclude Include="..\..\common\misc\timespec.h" />
-    <ClInclude Include="..\..\common\misc\timevar.h" />
-    <ClInclude Include="..\..\common\misc\unitypes.in.h" />
-    <ClInclude Include="..\..\common\misc\uniwidth.in.h" />
-    <ClInclude Include="..\..\common\misc\verify.h" />
-    <ClInclude Include="..\..\common\misc\xalloc.h" />
-    <ClInclude Include="..\..\common\misc\xmemdup0.h" />
-    <ClInclude Include="..\..\common\misc\xstrndup.h" />
-    <ClInclude Include="..\..\common\misc\xtime.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\common\m4\builtin.c" />
-    <ClCompile Include="..\..\common\m4\debug.c" />
-    <ClCompile Include="..\..\common\m4\eval.c" />
-    <ClCompile Include="..\..\common\m4\format.c" />
-    <ClCompile Include="..\..\common\m4\freeze.c" />
-    <ClCompile Include="..\..\common\m4\input.c" />
-    <ClCompile Include="..\..\common\m4\lib\clean-temp.c" />
-    <ClCompile Include="..\..\common\m4\lib\cloexec.c" />
-    <ClCompile Include="..\..\common\m4\lib\close-stream.c" />
-    <ClCompile Include="..\..\common\m4\lib\closein.c" />
-    <ClCompile Include="..\..\common\m4\lib\closeout.c" />
-    <ClCompile Include="..\..\common\m4\lib\execute.c" />
-    <ClCompile Include="..\..\common\m4\lib\fd-safer.c" />
-    <ClCompile Include="..\..\common\m4\lib\filenamecat-lgpl.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_array_list.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_avltree_oset.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_linkedhash_list.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_list.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_oset.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_xlist.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_xoset.c" />
-    <ClCompile Include="..\..\common\m4\lib\memchr2.c" />
-    <ClCompile Include="..\..\common\m4\lib\mkdtemp.c" />
-    <ClCompile Include="..\..\common\m4\lib\mkstemp-safer.c" />
-    <ClCompile Include="..\..\common\m4\lib\mkstemp.c" />
-    <ClCompile Include="..\..\common\m4\lib\printf-args.c" />
-    <ClCompile Include="..\..\common\m4\lib\printf-parse.c" />
-    <ClCompile Include="..\..\common\m4\lib\regex.c" />
-    <ClCompile Include="..\..\common\m4\lib\regex_internal.c" />
-    <ClCompile Include="..\..\common\m4\lib\tempname.c" />
-    <ClCompile Include="..\..\common\m4\lib\tmpdir.c" />
-    <ClCompile Include="..\..\common\m4\lib\vasnprintf.c" />
-    <ClCompile Include="..\..\common\m4\lib\vasprintf.c" />
-    <ClCompile Include="..\..\common\m4\lib\verror.c" />
-    <ClCompile Include="..\..\common\m4\lib\xasprintf.c" />
-    <ClCompile Include="..\..\common\m4\lib\xprintf.c" />
-    <ClCompile Include="..\..\common\m4\lib\xvasprintf.c" />
-    <ClCompile Include="..\..\common\m4\m4.c" />
-    <ClCompile Include="..\..\common\m4\macro.c" />
-    <ClCompile Include="..\..\common\m4\output.c" />
-    <ClCompile Include="..\..\common\m4\path.c" />
-    <ClCompile Include="..\..\common\m4\symtab.c" />
-    <ClCompile Include="..\..\common\misc\app_path.c" />
-    <ClCompile Include="..\..\common\misc\argmatch.c" />
-    <ClCompile Include="..\..\common\misc\basename-lgpl.c" />
-    <ClCompile Include="..\..\common\misc\bitset.c" />
-    <ClCompile Include="..\..\common\misc\bitsetv.c" />
-    <ClCompile Include="..\..\common\misc\bitset\array.c" />
-    <ClCompile Include="..\..\common\misc\bitset\list.c" />
-    <ClCompile Include="..\..\common\misc\bitset\stats.c" />
-    <ClCompile Include="..\..\common\misc\bitset\table.c" />
-    <ClCompile Include="..\..\common\misc\bitset\vector.c" />
-    <ClCompile Include="..\..\common\misc\c-ctype.c" />
-    <ClCompile Include="..\..\common\misc\c-strcasecmp.c" />
-    <ClCompile Include="..\..\common\misc\c-strncasecmp.c" />
-    <ClCompile Include="..\..\common\misc\concat-filename.c" />
-    <ClCompile Include="..\..\common\misc\dirname-lgpl.c" />
-    <ClCompile Include="..\..\common\misc\dirname.c" />
-    <ClCompile Include="..\..\common\misc\error.c" />
-    <ClCompile Include="..\..\common\misc\exitfail.c" />
-    <ClCompile Include="..\..\common\misc\fstrcmp.c" />
-    <ClCompile Include="..\..\common\misc\get-errno.c" />
-    <ClCompile Include="..\..\common\misc\getdelim.c" />
-    <ClCompile Include="..\..\common\misc\gethrxtime.c" />
-    <ClCompile Include="..\..\common\misc\getline.c" />
-    <ClCompile Include="..\..\common\misc\getopt.c" />
-    <ClCompile Include="..\..\common\misc\getopt1.c" />
-    <ClCompile Include="..\..\common\misc\gl_hash_map.c" />
-    <ClCompile Include="..\..\common\misc\glthread\lock.c" />
-    <ClCompile Include="..\..\common\misc\glthread\threadlib.c" />
-    <ClCompile Include="..\..\common\misc\glthread\tls.c" />
-    <ClCompile Include="..\..\common\misc\hash.c" />
-    <ClCompile Include="..\..\common\misc\integer_length_l.c" />
-    <ClCompile Include="..\..\common\misc\localcharset.c" />
-    <ClCompile Include="..\..\common\misc\mbchar.c" />
-    <ClCompile Include="..\..\common\misc\mbfile.c" />
-    <ClCompile Include="..\..\common\misc\mbswidth.c" />
-    <ClCompile Include="..\..\common\misc\obstack.c" />
-    <ClCompile Include="..\..\common\misc\obstack_printf.c" />
-    <ClCompile Include="..\..\common\misc\path-join.c" />
-    <ClCompile Include="..\..\common\misc\progname.c" />
-    <ClCompile Include="..\..\common\misc\quotearg.c" />
-    <ClCompile Include="..\..\common\misc\reallocarray.c" />
-    <ClCompile Include="..\..\common\misc\relocatable.c" />
-    <ClCompile Include="..\..\common\misc\strverscmp.c" />
-    <ClCompile Include="..\..\common\misc\timespec.c" />
-    <ClCompile Include="..\..\common\misc\timevar.c" />
-    <ClCompile Include="..\..\common\misc\wcwidth.c" />
-    <ClCompile Include="..\..\common\misc\width.c" />
-    <ClCompile Include="..\..\common\misc\xalloc-die.c" />
-    <ClCompile Include="..\..\common\misc\xconcat-filename.c" />
-    <ClCompile Include="..\..\common\misc\xhash.c" />
-    <ClCompile Include="..\..\common\misc\xmalloc.c" />
-    <ClCompile Include="..\..\common\misc\xmemdup0.c" />
-    <ClCompile Include="..\..\common\misc\xstrndup.c" />
-    <ClCompile Include="..\..\common\misc\xtime.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2017/common_lib/common_lib.vcxproj.filters b/VS2017/common_lib/common_lib.vcxproj.filters
deleted file mode 100644
index 836e466..0000000
--- a/VS2017/common_lib/common_lib.vcxproj.filters
+++ /dev/null
@@ -1,648 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="m4">
-      <UniqueIdentifier>{b1d835d0-3f7c-4fb5-8616-88bdc0be8264}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc">
-      <UniqueIdentifier>{8813a4b0-8702-4f1b-b5ab-9404f668ab83}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc\glthread">
-      <UniqueIdentifier>{ba687f4a-b909-48b6-aff8-38299da51c3c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc\bitset">
-      <UniqueIdentifier>{06be121f-0873-46e8-afe6-d8264f435821}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="m4\lib">
-      <UniqueIdentifier>{027839e3-b6aa-40d3-99a7-0bec96f85f06}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\common\misc\glthread\lock.h">
-      <Filter>misc\glthread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\glthread\tls.h">
-      <Filter>misc\glthread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\m4.h">
-      <Filter>m4</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\array.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\base.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\list.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\stats.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\table.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\vector.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\argmatch.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\arg-nonnull.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bbitset.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitrotate.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitsetv.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\c-ctype.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\cjk.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\concat-filename.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\config.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\c-strcase.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\c-strcaseeq.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\diffseq.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\dirname.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\dosname.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\error.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\exitfail.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\filename.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\fstrcmp.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\get-errno.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gethrxtime.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\getopt.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\getopt_int.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gettext.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gl_hash_map.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gl_map.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gl_xmap.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\hash.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\ialloc.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\idx.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\integer_length.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\intprops.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\libiberty.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\localcharset.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\mbchar.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\mbfile.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\mbswidth.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\obstack.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\path-join.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\progname.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\quote.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\quotearg.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\relocatable.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\stdbool.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\stdio-safer.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\streq.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\system.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\timespec.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\timevar.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\unitypes.in.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\uniwidth.in.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\verify.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\xalloc.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\xmemdup0.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\xstrndup.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\xtime.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\binary-io.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\clean-temp.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\cloexec.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\closein.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\closeout.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\close-stream.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\c-stack.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\execute.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\filenamecat.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\fpending.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\freadahead.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash_list1.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash_list2.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anylinked_list1.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anylinked_list2.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anytree_oset.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_array_list.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_avltree_oset.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_linkedhash_list.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_list.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_oset.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_xlist.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_xoset.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\ignore-value.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\malloca.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\memchr2.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\pathmax.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\printf-args.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\printf-parse.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\progname.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\regex.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\regex_internal.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\stdio--.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\stdlib--.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\stdlib-safer.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\tempname.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\tmpdir.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\unistd--.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\unistd-safer.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\vasnprintf.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\verror.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\version-etc.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\w32spawn.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\xmalloca.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\xprintf.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\xsize.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\xvasprintf.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\common\misc\glthread\lock.c">
-      <Filter>misc\glthread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\glthread\threadlib.c">
-      <Filter>misc\glthread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\glthread\tls.c">
-      <Filter>misc\glthread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\builtin.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\debug.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\eval.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\format.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\freeze.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\input.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\m4.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\macro.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\output.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\path.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\symtab.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\array.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\list.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\stats.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\table.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\vector.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\app_path.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\argmatch.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\basename-lgpl.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitsetv.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\c-ctype.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\concat-filename.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\c-strcasecmp.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\c-strncasecmp.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\dirname.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\dirname-lgpl.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\error.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\exitfail.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\fstrcmp.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getdelim.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\get-errno.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\gethrxtime.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getline.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getopt.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getopt1.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\gl_hash_map.c" />
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\hash.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\integer_length_l.c" />
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\localcharset.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\mbchar.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\mbfile.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\mbswidth.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\obstack.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\obstack_printf.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\path-join.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\progname.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\quotearg.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\reallocarray.c" />
-     <Filter>misc</Filter>
-   </ClCompile>
-   <ClCompile Include="..\..\common\misc\relocatable.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\strverscmp.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\timespec.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\timevar.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\wcwidth.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\width.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xalloc-die.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xconcat-filename.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xmalloc.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xmemdup0.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xstrndup.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xtime.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\clean-temp.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\cloexec.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\closein.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\closeout.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\close-stream.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\execute.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\fd-safer.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\filenamecat-lgpl.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_array_list.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_avltree_oset.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_linkedhash_list.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_list.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_oset.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_xlist.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_xoset.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\memchr2.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\mkdtemp.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\mkstemp.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\mkstemp-safer.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\printf-args.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\printf-parse.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\regex.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\regex_internal.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\tempname.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\tmpdir.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\vasnprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\vasprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\verror.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\xasprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\xprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\xvasprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xhash.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2017/win_bison/win_bison.vcxproj b/VS2017/win_bison/win_bison.vcxproj
deleted file mode 100644
index a0c82f2..0000000
--- a/VS2017/win_bison/win_bison.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F49DC041-3A12-4D54-A15E-F38504D1D8B2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>win_bison</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </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 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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)..\bin\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)..\bin\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\bison;$(ProjectDir)..\..\bison\src;$(ProjectDir)..\..\common\m4;$(ProjectDir)..\..\common\m4\lib;$(ProjectDir)..\..\common\misc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;common_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)..\bin\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\UNISTD_ERROR.readme" "$(TargetDir)"
-copy "$(ProjectDir)..\..\changelog.md" "$(TargetDir)"
-xcopy "$(ProjectDir)..\..\custom_build_rules\*" "$(TargetDir)\custom_build_rules" /s /i /y
-xcopy "$(ProjectDir)..\..\bison\data\*" "$(TargetDir)\data" /s /i /y</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\bison;$(ProjectDir)..\..\bison\src;$(ProjectDir)..\..\common\m4;$(ProjectDir)..\..\common\m4\lib;$(ProjectDir)..\..\common\misc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;common_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)..\bin\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\UNISTD_ERROR.readme" "$(TargetDir)"
-copy "$(ProjectDir)..\..\changelog.md" "$(TargetDir)"
-xcopy "$(ProjectDir)..\..\custom_build_rules\*" "$(TargetDir)\custom_build_rules" /s /i /y
-xcopy "$(ProjectDir)..\..\bison\data\*" "$(TargetDir)\data" /s /i /y</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\bison\src\AnnotationList.c" />
-    <ClCompile Include="..\..\bison\src\assoc.c" />
-    <ClCompile Include="..\..\bison\src\closure.c" />
-    <ClCompile Include="..\..\bison\src\complain.c" />
-    <ClCompile Include="..\..\bison\src\conflicts.c" />
-    <ClCompile Include="..\..\bison\src\derives.c" />
-    <ClCompile Include="..\..\bison\src\files.c" />
-    <ClCompile Include="..\..\bison\src\fixits.c" />
-    <ClCompile Include="..\..\bison\src\getargs.c" />
-    <ClCompile Include="..\..\bison\src\gram.c" />
-    <ClCompile Include="..\..\bison\src\graphviz.c" />
-    <ClCompile Include="..\..\bison\src\ielr.c" />
-    <ClCompile Include="..\..\bison\src\InadequacyList.c" />
-    <ClCompile Include="..\..\bison\src\lalr.c" />
-    <ClCompile Include="..\..\bison\src\location.c" />
-    <ClCompile Include="..\..\bison\src\LR0.c" />
-    <ClCompile Include="..\..\bison\src\main.c" />
-    <ClCompile Include="..\..\bison\src\muscle-tab.c" />
-    <ClCompile Include="..\..\bison\src\named-ref.c" />
-    <ClCompile Include="..\..\bison\src\nullable.c" />
-    <ClCompile Include="..\..\bison\src\output.c" />
-    <ClCompile Include="..\..\bison\src\parse-gram.c" />
-    <ClCompile Include="..\..\bison\src\print-graph.c" />
-    <ClCompile Include="..\..\bison\src\print-xml.c" />
-    <ClCompile Include="..\..\bison\src\print.c" />
-    <ClCompile Include="..\..\bison\src\reader.c" />
-    <ClCompile Include="..\..\bison\src\reduce.c" />
-    <ClCompile Include="..\..\bison\src\relation.c" />
-    <ClCompile Include="..\..\bison\src\Sbitset.c" />
-    <ClCompile Include="..\..\bison\src\scan-code-c.c" />
-    <ClCompile Include="..\..\bison\src\scan-gram-c.c" />
-    <ClCompile Include="..\..\bison\src\scan-skel-c.c" />
-    <ClCompile Include="..\..\bison\src\state.c" />
-    <ClCompile Include="..\..\bison\src\symlist.c" />
-    <ClCompile Include="..\..\bison\src\symtab.c" />
-    <ClCompile Include="..\..\bison\src\tables.c" />
-    <ClCompile Include="..\..\bison\src\uniqstr.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\bison\src\AnnotationList.h" />
-    <ClInclude Include="..\..\bison\src\assoc.h" />
-    <ClInclude Include="..\..\bison\src\closure.h" />
-    <ClInclude Include="..\..\bison\src\complain.h" />
-    <ClInclude Include="..\..\bison\src\config.h" />
-    <ClInclude Include="..\..\bison\src\conflicts.h" />
-    <ClInclude Include="..\..\bison\src\derives.h" />
-    <ClInclude Include="..\..\bison\src\files.h" />
-    <ClInclude Include="..\..\bison\src\fixits.h" />
-    <ClInclude Include="..\..\bison\src\flex-scanner.h" />
-    <ClInclude Include="..\..\bison\src\getargs.h" />
-    <ClInclude Include="..\..\bison\src\gram.h" />
-    <ClInclude Include="..\..\bison\src\graphviz.h" />
-    <ClInclude Include="..\..\bison\src\ielr.h" />
-    <ClInclude Include="..\..\bison\src\InadequacyList.h" />
-    <ClInclude Include="..\..\bison\src\lalr.h" />
-    <ClInclude Include="..\..\bison\src\location.h" />
-    <ClInclude Include="..\..\bison\src\LR0.h" />
-    <ClInclude Include="..\..\bison\src\muscle-tab.h" />
-    <ClInclude Include="..\..\bison\src\named-ref.h" />
-    <ClInclude Include="..\..\bison\src\nullable.h" />
-    <ClInclude Include="..\..\bison\src\output.h" />
-    <ClInclude Include="..\..\bison\src\parse-gram.h" />
-    <ClInclude Include="..\..\bison\src\print-graph.h" />
-    <ClInclude Include="..\..\bison\src\print-xml.h" />
-    <ClInclude Include="..\..\bison\src\print.h" />
-    <ClInclude Include="..\..\bison\src\reader.h" />
-    <ClInclude Include="..\..\bison\src\reduce.h" />
-    <ClInclude Include="..\..\bison\src\relation.h" />
-    <ClInclude Include="..\..\bison\src\Sbitset.h" />
-    <ClInclude Include="..\..\bison\src\scan-code.h" />
-    <ClInclude Include="..\..\bison\src\scan-gram.h" />
-    <ClInclude Include="..\..\bison\src\scan-skel.h" />
-    <ClInclude Include="..\..\bison\src\state.h" />
-    <ClInclude Include="..\..\bison\src\symlist.h" />
-    <ClInclude Include="..\..\bison\src\symtab.h" />
-    <ClInclude Include="..\..\bison\src\system.h" />
-    <ClInclude Include="..\..\bison\src\tables.h" />
-    <ClInclude Include="..\..\bison\src\uniqstr.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2017/win_bison/win_bison.vcxproj.filters b/VS2017/win_bison/win_bison.vcxproj.filters
deleted file mode 100644
index 02fc230..0000000
--- a/VS2017/win_bison/win_bison.vcxproj.filters
+++ /dev/null
@@ -1,245 +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;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\bison\src\AnnotationList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\assoc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\closure.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\complain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\conflicts.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\derives.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\files.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\getargs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\gram.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\graphviz.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\ielr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\InadequacyList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\lalr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\location.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\LR0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\muscle-tab.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\named-ref.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\nullable.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\output.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\parse-gram.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\print.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\print-xml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\reader.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\reduce.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\relation.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\Sbitset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\state.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\symlist.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\symtab.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\tables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\uniqstr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\fixits.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\print-graph.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\scan-code-c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\scan-gram-c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\scan-skel-c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\bison\src\AnnotationList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\assoc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\closure.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\complain.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\conflicts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\derives.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\files.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\flex-scanner.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\getargs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\gram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\graphviz.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\ielr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\InadequacyList.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\lalr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\location.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\LR0.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\muscle-tab.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\named-ref.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\nullable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\output.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\parse-gram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\print.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\print-xml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\reader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\reduce.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\relation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\Sbitset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\scan-code.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\scan-gram.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\scan-skel.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\state.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\symlist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\symtab.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\system.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\tables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\uniqstr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\fixits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\print-graph.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2017/win_flex/win_flex.vcxproj b/VS2017/win_flex/win_flex.vcxproj
deleted file mode 100644
index 57d6d51..0000000
--- a/VS2017/win_flex/win_flex.vcxproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>win_flex</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </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 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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)..\bin\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)..\bin\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\flex\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(SolutionDir)..\bin\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;Ws2_32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;common_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\flex\src\FlexLexer.h" "$(TargetDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\flex\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(SolutionDir)..\bin\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;Ws2_32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;common_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\flex\src\FlexLexer.h" "$(TargetDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\flex\src\flexdef.h" />
-    <ClInclude Include="..\..\flex\src\flexint.h" />
-    <ClInclude Include="..\..\flex\src\gettext.h" />
-    <ClInclude Include="..\..\flex\src\options.h" />
-    <ClInclude Include="..\..\flex\src\parse.h" />
-    <ClInclude Include="..\..\flex\src\regex.h" />
-    <ClInclude Include="..\..\flex\src\scanopt.h" />
-    <ClInclude Include="..\..\flex\src\tables.h" />
-    <ClInclude Include="..\..\flex\src\tables_shared.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\flex\src\buf.c" />
-    <ClCompile Include="..\..\flex\src\ccl.c" />
-    <ClCompile Include="..\..\flex\src\dfa.c" />
-    <ClCompile Include="..\..\flex\src\ecs.c" />
-    <ClCompile Include="..\..\flex\src\filter.c" />
-    <ClCompile Include="..\..\flex\src\gen.c" />
-    <ClCompile Include="..\..\flex\src\main.c" />
-    <ClCompile Include="..\..\flex\src\misc.c" />
-    <ClCompile Include="..\..\flex\src\nfa.c" />
-    <ClCompile Include="..\..\flex\src\options.c" />
-    <ClCompile Include="..\..\flex\src\parse.c" />
-    <ClCompile Include="..\..\flex\src\regex.c" />
-    <ClCompile Include="..\..\flex\src\scan.c" />
-    <ClCompile Include="..\..\flex\src\scanflags.c" />
-    <ClCompile Include="..\..\flex\src\scanopt.c" />
-    <ClCompile Include="..\..\flex\src\skel.c" />
-    <ClCompile Include="..\..\flex\src\sym.c" />
-    <ClCompile Include="..\..\flex\src\tables.c" />
-    <ClCompile Include="..\..\flex\src\tables_shared.c" />
-    <ClCompile Include="..\..\flex\src\tblcmp.c" />
-    <ClCompile Include="..\..\flex\src\yylex.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2017/win_flex/win_flex.vcxproj.filters b/VS2017/win_flex/win_flex.vcxproj.filters
deleted file mode 100644
index 1eb993a..0000000
--- a/VS2017/win_flex/win_flex.vcxproj.filters
+++ /dev/null
@@ -1,111 +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;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>
-    <ClInclude Include="..\..\flex\src\flexdef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\flexint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\gettext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\options.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\parse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\scanopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\tables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\tables_shared.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\flex\src\buf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\ccl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\dfa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\ecs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\filter.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\gen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\misc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\nfa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\options.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\parse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\regex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\scan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\scanflags.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\scanopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\skel.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\sym.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\tables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\tables_shared.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\tblcmp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\yylex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2017/winflexbison.sln b/VS2017/winflexbison.sln
deleted file mode 100644
index c2388df..0000000
--- a/VS2017/winflexbison.sln
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2047
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_lib", "common_lib\common_lib.vcxproj", "{11561197-1120-428C-A43D-7BCDFBCF79B8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_bison", "win_bison\win_bison.vcxproj", "{F49DC041-3A12-4D54-A15E-F38504D1D8B2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{11561197-1120-428C-A43D-7BCDFBCF79B8} = {11561197-1120-428C-A43D-7BCDFBCF79B8}
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0} = {47C40EF9-255C-475F-B5A6-B9CB85D40AD0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_flex", "win_flex\win_flex.vcxproj", "{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{11561197-1120-428C-A43D-7BCDFBCF79B8} = {11561197-1120-428C-A43D-7BCDFBCF79B8}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{11561197-1120-428C-A43D-7BCDFBCF79B8}.Debug|x86.ActiveCfg = Debug|Win32
-		{11561197-1120-428C-A43D-7BCDFBCF79B8}.Debug|x86.Build.0 = Debug|Win32
-		{11561197-1120-428C-A43D-7BCDFBCF79B8}.Release|x86.ActiveCfg = Release|Win32
-		{11561197-1120-428C-A43D-7BCDFBCF79B8}.Release|x86.Build.0 = Release|Win32
-		{F49DC041-3A12-4D54-A15E-F38504D1D8B2}.Debug|x86.ActiveCfg = Debug|Win32
-		{F49DC041-3A12-4D54-A15E-F38504D1D8B2}.Debug|x86.Build.0 = Debug|Win32
-		{F49DC041-3A12-4D54-A15E-F38504D1D8B2}.Release|x86.ActiveCfg = Release|Win32
-		{F49DC041-3A12-4D54-A15E-F38504D1D8B2}.Release|x86.Build.0 = Release|Win32
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}.Debug|x86.ActiveCfg = Debug|Win32
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}.Debug|x86.Build.0 = Debug|Win32
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}.Release|x86.ActiveCfg = Release|Win32
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C798034B-A54B-44A3-B979-AD30AB6ABA16}
-	EndGlobalSection
-EndGlobal
diff --git a/VS2019/common_lib/common_lib.vcxproj b/VS2019/common_lib/common_lib.vcxproj
deleted file mode 100644
index 787746b..0000000
--- a/VS2019/common_lib/common_lib.vcxproj
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{11561197-1120-428C-A43D-7BCDFBCF79B8}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>common_lib</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </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 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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\common\m4;$(ProjectDir)..\..\common\m4\lib;$(ProjectDir)..\..\common\misc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4146;4308</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\common\m4;$(ProjectDir)..\..\common\m4\lib;$(ProjectDir)..\..\common\misc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4146;4308</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\common\m4\lib\binary-io.h" />
-    <ClInclude Include="..\..\common\m4\lib\c-stack.h" />
-    <ClInclude Include="..\..\common\m4\lib\clean-temp.h" />
-    <ClInclude Include="..\..\common\m4\lib\cloexec.h" />
-    <ClInclude Include="..\..\common\m4\lib\close-stream.h" />
-    <ClInclude Include="..\..\common\m4\lib\closein.h" />
-    <ClInclude Include="..\..\common\m4\lib\closeout.h" />
-    <ClInclude Include="..\..\common\m4\lib\execute.h" />
-    <ClInclude Include="..\..\common\m4\lib\filenamecat.h" />
-    <ClInclude Include="..\..\common\m4\lib\fpending.h" />
-    <ClInclude Include="..\..\common\m4\lib\freadahead.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash1.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash_list1.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash_list2.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anylinked_list1.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anylinked_list2.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_anytree_oset.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_array_list.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_linkedhash_list.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_linked_list.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_list.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_oset.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_rbtreehash_list.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_rbtree_ordered.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_rbtree_oset.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_xlist.h" />
-    <ClInclude Include="..\..\common\m4\lib\gl_xoset.h" />
-    <ClInclude Include="..\..\common\m4\lib\ignore-value.h" />
-    <ClInclude Include="..\..\common\m4\lib\malloca.h" />
-    <ClInclude Include="..\..\common\m4\lib\memchr2.h" />
-    <ClInclude Include="..\..\common\m4\lib\pathmax.h" />
-    <ClInclude Include="..\..\common\m4\lib\printf-args.h" />
-    <ClInclude Include="..\..\common\m4\lib\printf-parse.h" />
-    <ClInclude Include="..\..\common\m4\lib\progname.h" />
-    <ClInclude Include="..\..\common\m4\lib\regex.h" />
-    <ClInclude Include="..\..\common\m4\lib\regex_internal.h" />
-    <ClInclude Include="..\..\common\m4\lib\stdio--.h" />
-    <ClInclude Include="..\..\common\m4\lib\stdlib--.h" />
-    <ClInclude Include="..\..\common\m4\lib\stdlib-safer.h" />
-    <ClInclude Include="..\..\common\m4\lib\tempname.h" />
-    <ClInclude Include="..\..\common\m4\lib\tmpdir.h" />
-    <ClInclude Include="..\..\common\m4\lib\unicodeio.h" />
-    <ClInclude Include="..\..\common\m4\lib\unistd--.h" />
-    <ClInclude Include="..\..\common\m4\lib\unistd-safer.h" />
-    <ClInclude Include="..\..\common\m4\lib\vasnprintf.h" />
-    <ClInclude Include="..\..\common\m4\lib\verror.h" />
-    <ClInclude Include="..\..\common\m4\lib\version-etc.h" />
-    <ClInclude Include="..\..\common\m4\lib\w32spawn.h" />
-    <ClInclude Include="..\..\common\m4\lib\xmalloca.h" />
-    <ClInclude Include="..\..\common\m4\lib\xprintf.h" />
-    <ClInclude Include="..\..\common\m4\lib\xsize.h" />
-    <ClInclude Include="..\..\common\m4\lib\xvasprintf.h" />
-    <ClInclude Include="..\..\common\m4\m4.h" />
-    <ClInclude Include="..\..\common\misc\alignof.h" />
-    <ClInclude Include="..\..\common\misc\arg-nonnull.h" />
-    <ClInclude Include="..\..\common\misc\argmatch.h" />
-    <ClInclude Include="..\..\common\misc\attribute.h" />
-    <ClInclude Include="..\..\common\misc\basename-lgpl.h" />
-    <ClInclude Include="..\..\common\misc\bbitset.h" />
-    <ClInclude Include="..\..\common\misc\bitrotate.h" />
-    <ClInclude Include="..\..\common\misc\bitset.h" />
-    <ClInclude Include="..\..\common\misc\bitsetv.h" />
-    <ClInclude Include="..\..\common\misc\bitset\array.h" />
-    <ClInclude Include="..\..\common\misc\bitset\base.h" />
-    <ClInclude Include="..\..\common\misc\bitset\list.h" />
-    <ClInclude Include="..\..\common\misc\bitset\stats.h" />
-    <ClInclude Include="..\..\common\misc\bitset\table.h" />
-    <ClInclude Include="..\..\common\misc\bitset\vector.h" />
-    <ClInclude Include="..\..\common\misc\c-ctype.h" />
-    <ClInclude Include="..\..\common\misc\c-strcase.h" />
-    <ClInclude Include="..\..\common\misc\c-strcaseeq.h" />
-    <ClInclude Include="..\..\common\misc\cjk.h" />
-    <ClInclude Include="..\..\common\misc\concat-filename.h" />
-    <ClInclude Include="..\..\common\misc\config.h" />
-    <ClInclude Include="..\..\common\misc\diffseq.h" />
-    <ClInclude Include="..\..\common\misc\dirname.h" />
-    <ClInclude Include="..\..\common\misc\dosname.h" />
-    <ClInclude Include="..\..\common\misc\error.h" />
-    <ClInclude Include="..\..\common\misc\exitfail.h" />
-    <ClInclude Include="..\..\common\misc\filename.h" />
-    <ClInclude Include="..\..\common\misc\fstrcmp.h" />
-    <ClInclude Include="..\..\common\misc\get-errno.h" />
-    <ClInclude Include="..\..\common\misc\gethrxtime.h" />
-    <ClInclude Include="..\..\common\misc\getopt.h" />
-    <ClInclude Include="..\..\common\misc\getopt_int.h" />
-    <ClInclude Include="..\..\common\misc\getprogname.h" />
-    <ClInclude Include="..\..\common\misc\gettext.h" />
-    <ClInclude Include="..\..\common\misc\gl_hash_map.h" />
-    <ClInclude Include="..\..\common\misc\gl_map.h" />
-    <ClInclude Include="..\..\common\misc\gl_xmap.h" />
-    <ClInclude Include="..\..\common\misc\glthread\lock.h" />
-    <ClInclude Include="..\..\common\misc\glthread\tls.h" />
-    <ClInclude Include="..\..\common\misc\hash.h" />
-    <ClInclude Include="..\..\common\misc\ialloc.h" />
-    <ClInclude Include="..\..\common\misc\idx.h" />
-    <ClInclude Include="..\..\common\misc\integer_length.h" />
-    <ClInclude Include="..\..\common\misc\intprops.h" />
-    <ClInclude Include="..\..\common\misc\libiberty.h" />
-    <ClInclude Include="..\..\common\misc\localcharset.h" />
-    <ClInclude Include="..\..\common\misc\mbchar.h" />
-    <ClInclude Include="..\..\common\misc\mbfile.h" />
-    <ClInclude Include="..\..\common\misc\mbswidth.h" />
-    <ClInclude Include="..\..\common\misc\obstack.h" />
-    <ClInclude Include="..\..\common\misc\path-join.h" />
-    <ClInclude Include="..\..\common\misc\progname.h" />
-    <ClInclude Include="..\..\common\misc\quote.h" />
-    <ClInclude Include="..\..\common\misc\quotearg.h" />
-    <ClInclude Include="..\..\common\misc\relocatable.h" />
-    <ClInclude Include="..\..\common\misc\stdbool.h" />
-    <ClInclude Include="..\..\common\misc\stdio-safer.h" />
-    <ClInclude Include="..\..\common\misc\streq.h" />
-    <ClInclude Include="..\..\common\misc\system.h" />
-    <ClInclude Include="..\..\common\misc\timespec.h" />
-    <ClInclude Include="..\..\common\misc\timevar.h" />
-    <ClInclude Include="..\..\common\misc\unitypes.in.h" />
-    <ClInclude Include="..\..\common\misc\uniwidth.in.h" />
-    <ClInclude Include="..\..\common\misc\verify.h" />
-    <ClInclude Include="..\..\common\misc\xalloc.h" />
-    <ClInclude Include="..\..\common\misc\xmemdup0.h" />
-    <ClInclude Include="..\..\common\misc\xstrndup.h" />
-    <ClInclude Include="..\..\common\misc\xtime.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\common\m4\builtin.c" />
-    <ClCompile Include="..\..\common\m4\debug.c" />
-    <ClCompile Include="..\..\common\m4\eval.c" />
-    <ClCompile Include="..\..\common\m4\format.c" />
-    <ClCompile Include="..\..\common\m4\freeze.c" />
-    <ClCompile Include="..\..\common\m4\input.c" />
-    <ClCompile Include="..\..\common\m4\lib\clean-temp.c" />
-    <ClCompile Include="..\..\common\m4\lib\cloexec.c" />
-    <ClCompile Include="..\..\common\m4\lib\close-stream.c" />
-    <ClCompile Include="..\..\common\m4\lib\closein.c" />
-    <ClCompile Include="..\..\common\m4\lib\closeout.c" />
-    <ClCompile Include="..\..\common\m4\lib\execute.c" />
-    <ClCompile Include="..\..\common\m4\lib\fd-safer.c" />
-    <ClCompile Include="..\..\common\m4\lib\filenamecat-lgpl.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_array_list.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_linkedhash_list.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_linked_list.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_list.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_oset.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_rbtreehash_list.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_rbtree_oset.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_xlist.c" />
-    <ClCompile Include="..\..\common\m4\lib\gl_xoset.c" />
-    <ClCompile Include="..\..\common\m4\lib\memchr2.c" />
-    <ClCompile Include="..\..\common\m4\lib\mkdtemp.c" />
-    <ClCompile Include="..\..\common\m4\lib\mkstemp-safer.c" />
-    <ClCompile Include="..\..\common\m4\lib\mkstemp.c" />
-    <ClCompile Include="..\..\common\m4\lib\printf-args.c" />
-    <ClCompile Include="..\..\common\m4\lib\printf-parse.c" />
-    <ClCompile Include="..\..\common\m4\lib\regex.c" />
-    <ClCompile Include="..\..\common\m4\lib\regex_internal.c" />
-    <ClCompile Include="..\..\common\m4\lib\tempname.c" />
-    <ClCompile Include="..\..\common\m4\lib\tmpdir.c" />
-    <ClCompile Include="..\..\common\m4\lib\unicodeio.c" />
-    <ClCompile Include="..\..\common\m4\lib\vasnprintf.c" />
-    <ClCompile Include="..\..\common\m4\lib\vasprintf.c" />
-    <ClCompile Include="..\..\common\m4\lib\verror.c" />
-    <ClCompile Include="..\..\common\m4\lib\xasprintf.c" />
-    <ClCompile Include="..\..\common\m4\lib\xprintf.c" />
-    <ClCompile Include="..\..\common\m4\lib\xvasprintf.c" />
-    <ClCompile Include="..\..\common\m4\m4.c" />
-    <ClCompile Include="..\..\common\m4\macro.c" />
-    <ClCompile Include="..\..\common\m4\output.c" />
-    <ClCompile Include="..\..\common\m4\path.c" />
-    <ClCompile Include="..\..\common\m4\symtab.c" />
-    <ClCompile Include="..\..\common\misc\app_path.c" />
-    <ClCompile Include="..\..\common\misc\argmatch.c" />
-    <ClCompile Include="..\..\common\misc\basename-lgpl.c" />
-    <ClCompile Include="..\..\common\misc\bitset.c" />
-    <ClCompile Include="..\..\common\misc\bitsetv.c" />
-    <ClCompile Include="..\..\common\misc\bitset\array.c" />
-    <ClCompile Include="..\..\common\misc\bitset\list.c" />
-    <ClCompile Include="..\..\common\misc\bitset\stats.c" />
-    <ClCompile Include="..\..\common\misc\bitset\table.c" />
-    <ClCompile Include="..\..\common\misc\bitset\vector.c" />
-    <ClCompile Include="..\..\common\misc\c-ctype.c" />
-    <ClCompile Include="..\..\common\misc\c-strcasecmp.c" />
-    <ClCompile Include="..\..\common\misc\c-strncasecmp.c" />
-    <ClCompile Include="..\..\common\misc\concat-filename.c" />
-    <ClCompile Include="..\..\common\misc\dirname-lgpl.c" />
-    <ClCompile Include="..\..\common\misc\dirname.c" />
-    <ClCompile Include="..\..\common\misc\error.c" />
-    <ClCompile Include="..\..\common\misc\exitfail.c" />
-    <ClCompile Include="..\..\common\misc\fopen_unixlike.c" />
-    <ClCompile Include="..\..\common\misc\fstrcmp.c" />
-    <ClCompile Include="..\..\common\misc\get-errno.c" />
-    <ClCompile Include="..\..\common\misc\getdelim.c" />
-    <ClCompile Include="..\..\common\misc\gethrxtime.c" />
-    <ClCompile Include="..\..\common\misc\getline.c" />
-    <ClCompile Include="..\..\common\misc\getopt.c" />
-    <ClCompile Include="..\..\common\misc\getopt1.c" />
-    <ClCompile Include="..\..\common\misc\getprogname.c" />
-    <ClCompile Include="..\..\common\misc\gl_hash_map.c" />
-    <ClCompile Include="..\..\common\misc\glthread\lock.c" />
-    <ClCompile Include="..\..\common\misc\glthread\threadlib.c" />
-    <ClCompile Include="..\..\common\misc\glthread\tls.c" />
-    <ClCompile Include="..\..\common\misc\hash.c" />
-    <ClCompile Include="..\..\common\misc\integer_length_l.c" />
-    <ClCompile Include="..\..\common\misc\localcharset.c" />
-    <ClCompile Include="..\..\common\misc\mbchar.c" />
-    <ClCompile Include="..\..\common\misc\mbfile.c" />
-    <ClCompile Include="..\..\common\misc\mbswidth.c" />
-    <ClCompile Include="..\..\common\misc\obstack.c" />
-    <ClCompile Include="..\..\common\misc\obstack_printf.c" />
-    <ClCompile Include="..\..\common\misc\path-join.c" />
-    <ClCompile Include="..\..\common\misc\progname.c" />
-    <ClCompile Include="..\..\common\misc\quotearg.c" />
-    <ClCompile Include="..\..\common\misc\reallocarray.c" />
-    <ClCompile Include="..\..\common\misc\relocatable.c" />
-    <ClCompile Include="..\..\common\misc\strverscmp.c" />
-    <ClCompile Include="..\..\common\misc\timespec.c" />
-    <ClCompile Include="..\..\common\misc\timevar.c" />
-    <ClCompile Include="..\..\common\misc\wcwidth.c" />
-    <ClCompile Include="..\..\common\misc\width.c" />
-    <ClCompile Include="..\..\common\misc\xalloc-die.c" />
-    <ClCompile Include="..\..\common\misc\xconcat-filename.c" />
-    <ClCompile Include="..\..\common\misc\xhash.c" />
-    <ClCompile Include="..\..\common\misc\xmalloc.c" />
-    <ClCompile Include="..\..\common\misc\xmemdup0.c" />
-    <ClCompile Include="..\..\common\misc\xstrndup.c" />
-    <ClCompile Include="..\..\common\misc\xtime.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2019/common_lib/common_lib.vcxproj.filters b/VS2019/common_lib/common_lib.vcxproj.filters
deleted file mode 100644
index ed7da81..0000000
--- a/VS2019/common_lib/common_lib.vcxproj.filters
+++ /dev/null
@@ -1,690 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="m4">
-      <UniqueIdentifier>{b1d835d0-3f7c-4fb5-8616-88bdc0be8264}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc">
-      <UniqueIdentifier>{8813a4b0-8702-4f1b-b5ab-9404f668ab83}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc\glthread">
-      <UniqueIdentifier>{ba687f4a-b909-48b6-aff8-38299da51c3c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="misc\bitset">
-      <UniqueIdentifier>{06be121f-0873-46e8-afe6-d8264f435821}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="m4\lib">
-      <UniqueIdentifier>{027839e3-b6aa-40d3-99a7-0bec96f85f06}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\common\misc\glthread\lock.h">
-      <Filter>misc\glthread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\glthread\tls.h">
-      <Filter>misc\glthread</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\m4.h">
-      <Filter>m4</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\array.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\base.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\list.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\stats.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\table.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset\vector.h">
-      <Filter>misc\bitset</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\argmatch.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\arg-nonnull.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bbitset.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitrotate.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitset.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\bitsetv.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\c-ctype.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\cjk.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\concat-filename.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\config.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\c-strcase.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\c-strcaseeq.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\diffseq.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\dirname.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\dosname.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\error.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\exitfail.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\filename.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\fstrcmp.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\get-errno.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gethrxtime.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\getopt.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\getopt_int.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gettext.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gl_hash_map.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gl_map.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\gl_xmap.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\hash.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\ialloc.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\idx.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\integer_length.h" />
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\intprops.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\libiberty.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\localcharset.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\mbchar.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\mbfile.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\mbswidth.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\obstack.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\path-join.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\progname.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\quote.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\quotearg.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\relocatable.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\stdbool.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\stdio-safer.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\streq.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\system.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\timespec.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\timevar.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\unitypes.in.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\uniwidth.in.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\verify.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\xalloc.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\xmemdup0.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\xstrndup.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\xtime.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\binary-io.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\clean-temp.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\cloexec.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\closein.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\closeout.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\close-stream.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\c-stack.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\execute.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\filenamecat.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\fpending.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\freadahead.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash_list1.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash_list2.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anylinked_list1.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anylinked_list2.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anytree_oset.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_array_list.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_linkedhash_list.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_list.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_oset.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_xlist.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_xoset.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\ignore-value.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\malloca.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\memchr2.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\pathmax.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\printf-args.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\printf-parse.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\progname.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\regex.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\regex_internal.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\stdio--.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\stdlib--.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\stdlib-safer.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\tempname.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\tmpdir.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\unistd--.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\unistd-safer.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\vasnprintf.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\verror.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\version-etc.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\w32spawn.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\xmalloca.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\xprintf.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\xsize.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\xvasprintf.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\attribute.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_linked_list.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_rbtreehash_list.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_rbtree_oset.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_rbtree_ordered.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\gl_anyhash1.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\m4\lib\unicodeio.h">
-      <Filter>m4\lib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\basename-lgpl.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\getprogname.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\common\misc\alignof.h">
-      <Filter>misc</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\common\misc\glthread\lock.c">
-      <Filter>misc\glthread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\glthread\threadlib.c">
-      <Filter>misc\glthread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\glthread\tls.c">
-      <Filter>misc\glthread</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\builtin.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\debug.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\eval.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\format.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\freeze.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\input.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\m4.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\macro.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\output.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\path.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\symtab.c">
-      <Filter>m4</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\array.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\list.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\stats.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\table.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset\vector.c">
-      <Filter>misc\bitset</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\app_path.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\argmatch.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\basename-lgpl.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitset.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\bitsetv.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\c-ctype.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\concat-filename.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\c-strcasecmp.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\c-strncasecmp.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\dirname.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\dirname-lgpl.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\error.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\exitfail.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\fstrcmp.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getdelim.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\get-errno.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\gethrxtime.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getline.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getopt.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getopt1.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\gl_hash_map.c" />
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\hash.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\integer_length_l.c" />
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\localcharset.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\mbchar.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\mbfile.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\mbswidth.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\obstack.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\obstack_printf.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\path-join.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\progname.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\quotearg.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\reallocarray.c" />
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\relocatable.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\strverscmp.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\timespec.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\timevar.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\wcwidth.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\width.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xalloc-die.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xconcat-filename.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xmalloc.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xmemdup0.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xstrndup.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xtime.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\clean-temp.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\cloexec.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\closein.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\closeout.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\close-stream.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\execute.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\fd-safer.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\filenamecat-lgpl.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_array_list.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_linkedhash_list.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_list.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_oset.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_xlist.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_xoset.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\memchr2.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\mkdtemp.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\mkstemp.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\mkstemp-safer.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\printf-args.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\printf-parse.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\regex.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\regex_internal.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\tempname.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\tmpdir.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\vasnprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\vasprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\verror.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\xasprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\xprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\xvasprintf.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\xhash.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_linked_list.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_rbtreehash_list.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\gl_rbtree_oset.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\m4\lib\unicodeio.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\fopen_unixlike.c">
-      <Filter>m4\lib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\common\misc\getprogname.c">
-      <Filter>misc</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2019/win_bison/win_bison.vcxproj b/VS2019/win_bison/win_bison.vcxproj
deleted file mode 100644
index 928bb19..0000000
--- a/VS2019/win_bison/win_bison.vcxproj
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F49DC041-3A12-4D54-A15E-F38504D1D8B2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>win_bison</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </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 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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)..\bin\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)..\bin\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\bison;$(ProjectDir)..\..\bison\src;$(ProjectDir)..\..\common\m4;$(ProjectDir)..\..\common\m4\lib;$(ProjectDir)..\..\common\misc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;common_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)..\bin\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\UNISTD_ERROR.readme" "$(TargetDir)"
-copy "$(ProjectDir)..\..\changelog.md" "$(TargetDir)"
-xcopy "$(ProjectDir)..\..\custom_build_rules\*" "$(TargetDir)\custom_build_rules" /s /i /y
-xcopy "$(ProjectDir)..\..\bison\data\*" "$(TargetDir)\data" /s /i /y</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\bison;$(ProjectDir)..\..\bison\src;$(ProjectDir)..\..\common\m4;$(ProjectDir)..\..\common\m4\lib;$(ProjectDir)..\..\common\misc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;common_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)..\bin\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\UNISTD_ERROR.readme" "$(TargetDir)"
-copy "$(ProjectDir)..\..\changelog.md" "$(TargetDir)"
-xcopy "$(ProjectDir)..\..\custom_build_rules\*" "$(TargetDir)\custom_build_rules" /s /i /y
-xcopy "$(ProjectDir)..\..\bison\data\*" "$(TargetDir)\data" /s /i /y</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\bison\src\AnnotationList.c" />
-    <ClCompile Include="..\..\bison\src\assoc.c" />
-    <ClCompile Include="..\..\bison\src\closure.c" />
-    <ClCompile Include="..\..\bison\src\complain.c" />
-    <ClCompile Include="..\..\bison\src\conflicts.c" />
-    <ClCompile Include="..\..\bison\src\counterexample.c" />
-    <ClCompile Include="..\..\bison\src\derivation.c" />
-    <ClCompile Include="..\..\bison\src\derives.c" />
-    <ClCompile Include="..\..\bison\src\files.c" />
-    <ClCompile Include="..\..\bison\src\fixits.c" />
-    <ClCompile Include="..\..\bison\src\getargs.c" />
-    <ClCompile Include="..\..\bison\src\glyphs.c" />
-    <ClCompile Include="..\..\bison\src\gram.c" />
-    <ClCompile Include="..\..\bison\src\graphviz.c" />
-    <ClCompile Include="..\..\bison\src\ielr.c" />
-    <ClCompile Include="..\..\bison\src\InadequacyList.c" />
-    <ClCompile Include="..\..\bison\src\lalr.c" />
-    <ClCompile Include="..\..\bison\src\location.c" />
-    <ClCompile Include="..\..\bison\src\LR0.c" />
-    <ClCompile Include="..\..\bison\src\lssi.c" />
-    <ClCompile Include="..\..\bison\src\main.c" />
-    <ClCompile Include="..\..\bison\src\muscle-tab.c" />
-    <ClCompile Include="..\..\bison\src\named-ref.c" />
-    <ClCompile Include="..\..\bison\src\nullable.c" />
-    <ClCompile Include="..\..\bison\src\output.c" />
-    <ClCompile Include="..\..\bison\src\parse-gram.c" />
-    <ClCompile Include="..\..\bison\src\parse-simulation.c" />
-    <ClCompile Include="..\..\bison\src\print-graph.c" />
-    <ClCompile Include="..\..\bison\src\print-xml.c" />
-    <ClCompile Include="..\..\bison\src\print.c" />
-    <ClCompile Include="..\..\bison\src\reader.c" />
-    <ClCompile Include="..\..\bison\src\reduce.c" />
-    <ClCompile Include="..\..\bison\src\relation.c" />
-    <ClCompile Include="..\..\bison\src\Sbitset.c" />
-    <ClCompile Include="..\..\bison\src\scan-code-c.c" />
-    <ClCompile Include="..\..\bison\src\scan-gram-c.c" />
-    <ClCompile Include="..\..\bison\src\scan-skel-c.c" />
-    <ClCompile Include="..\..\bison\src\state-item.c" />
-    <ClCompile Include="..\..\bison\src\state.c" />
-    <ClCompile Include="..\..\bison\src\strversion.c" />
-    <ClCompile Include="..\..\bison\src\symlist.c" />
-    <ClCompile Include="..\..\bison\src\symtab.c" />
-    <ClCompile Include="..\..\bison\src\tables.c" />
-    <ClCompile Include="..\..\bison\src\uniqstr.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\bison\src\AnnotationList.h" />
-    <ClInclude Include="..\..\bison\src\assoc.h" />
-    <ClInclude Include="..\..\bison\src\closure.h" />
-    <ClInclude Include="..\..\bison\src\complain.h" />
-    <ClInclude Include="..\..\bison\src\config.h" />
-    <ClInclude Include="..\..\bison\src\conflicts.h" />
-    <ClInclude Include="..\..\bison\src\counterexample.h" />
-    <ClInclude Include="..\..\bison\src\derivation.h" />
-    <ClInclude Include="..\..\bison\src\derives.h" />
-    <ClInclude Include="..\..\bison\src\files.h" />
-    <ClInclude Include="..\..\bison\src\fixits.h" />
-    <ClInclude Include="..\..\bison\src\flex-scanner.h" />
-    <ClInclude Include="..\..\bison\src\getargs.h" />
-    <ClInclude Include="..\..\bison\src\glyphs.h" />
-    <ClInclude Include="..\..\bison\src\gram.h" />
-    <ClInclude Include="..\..\bison\src\graphviz.h" />
-    <ClInclude Include="..\..\bison\src\ielr.h" />
-    <ClInclude Include="..\..\bison\src\InadequacyList.h" />
-    <ClInclude Include="..\..\bison\src\lalr.h" />
-    <ClInclude Include="..\..\bison\src\location.h" />
-    <ClInclude Include="..\..\bison\src\LR0.h" />
-    <ClInclude Include="..\..\bison\src\lssi.h" />
-    <ClInclude Include="..\..\bison\src\muscle-tab.h" />
-    <ClInclude Include="..\..\bison\src\named-ref.h" />
-    <ClInclude Include="..\..\bison\src\nullable.h" />
-    <ClInclude Include="..\..\bison\src\output.h" />
-    <ClInclude Include="..\..\bison\src\parse-gram.h" />
-    <ClInclude Include="..\..\bison\src\parse-simulation.h" />
-    <ClInclude Include="..\..\bison\src\print-graph.h" />
-    <ClInclude Include="..\..\bison\src\print-xml.h" />
-    <ClInclude Include="..\..\bison\src\print.h" />
-    <ClInclude Include="..\..\bison\src\reader.h" />
-    <ClInclude Include="..\..\bison\src\reduce.h" />
-    <ClInclude Include="..\..\bison\src\relation.h" />
-    <ClInclude Include="..\..\bison\src\Sbitset.h" />
-    <ClInclude Include="..\..\bison\src\scan-code.h" />
-    <ClInclude Include="..\..\bison\src\scan-gram.h" />
-    <ClInclude Include="..\..\bison\src\scan-skel.h" />
-    <ClInclude Include="..\..\bison\src\state-item.h" />
-    <ClInclude Include="..\..\bison\src\state.h" />
-    <ClInclude Include="..\..\bison\src\strversion.h" />
-    <ClInclude Include="..\..\bison\src\symlist.h" />
-    <ClInclude Include="..\..\bison\src\symtab.h" />
-    <ClInclude Include="..\..\bison\src\system.h" />
-    <ClInclude Include="..\..\bison\src\tables.h" />
-    <ClInclude Include="..\..\bison\src\textstyle.h" />
-    <ClInclude Include="..\..\bison\src\uniqstr.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2019/win_bison/win_bison.vcxproj.filters b/VS2019/win_bison/win_bison.vcxproj.filters
deleted file mode 100644
index a1e14d2..0000000
--- a/VS2019/win_bison/win_bison.vcxproj.filters
+++ /dev/null
@@ -1,286 +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>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\bison\src\AnnotationList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\assoc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\closure.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\complain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\conflicts.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\derives.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\files.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\getargs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\gram.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\graphviz.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\ielr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\InadequacyList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\lalr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\location.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\LR0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\muscle-tab.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\named-ref.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\nullable.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\output.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\parse-gram.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\print.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\print-xml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\reader.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\reduce.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\relation.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\Sbitset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\state.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\symlist.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\symtab.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\tables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\uniqstr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\fixits.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\print-graph.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\scan-code-c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\scan-gram-c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\scan-skel-c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\counterexample.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\lssi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\state-item.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\parse-simulation.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\derivation.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\glyphs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\bison\src\strversion.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\bison\src\AnnotationList.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\assoc.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\closure.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\complain.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\config.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\conflicts.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\counterexample.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\derives.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\files.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\fixits.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\flex-scanner.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\getargs.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\gram.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\graphviz.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\ielr.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\InadequacyList.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\lalr.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\location.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\LR0.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\lssi.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\muscle-tab.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\named-ref.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\nullable.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\output.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\parse-gram.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\parse-simulation.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\print.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\print-graph.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\print-xml.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\reader.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\reduce.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\relation.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\Sbitset.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\scan-code.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\scan-gram.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\scan-skel.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\state.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\state-item.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\symlist.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\symtab.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\system.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\tables.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\uniqstr.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\derivation.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\glyphs.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\textstyle.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\bison\src\strversion.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2019/win_flex/win_flex.vcxproj b/VS2019/win_flex/win_flex.vcxproj
deleted file mode 100644
index 84945cd..0000000
--- a/VS2019/win_flex/win_flex.vcxproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>win_flex</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </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 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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)..\bin\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)..\bin\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\flex\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(SolutionDir)..\bin\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;Ws2_32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;common_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\flex\src\FlexLexer.h" "$(TargetDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\flex\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(SolutionDir)..\bin\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;Ws2_32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;common_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy "$(ProjectDir)..\..\flex\src\FlexLexer.h" "$(TargetDir)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\flex\src\flexdef.h" />
-    <ClInclude Include="..\..\flex\src\flexint.h" />
-    <ClInclude Include="..\..\flex\src\gettext.h" />
-    <ClInclude Include="..\..\flex\src\options.h" />
-    <ClInclude Include="..\..\flex\src\parse.h" />
-    <ClInclude Include="..\..\flex\src\regex.h" />
-    <ClInclude Include="..\..\flex\src\scanopt.h" />
-    <ClInclude Include="..\..\flex\src\tables.h" />
-    <ClInclude Include="..\..\flex\src\tables_shared.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\flex\src\buf.c" />
-    <ClCompile Include="..\..\flex\src\ccl.c" />
-    <ClCompile Include="..\..\flex\src\dfa.c" />
-    <ClCompile Include="..\..\flex\src\ecs.c" />
-    <ClCompile Include="..\..\flex\src\filter.c" />
-    <ClCompile Include="..\..\flex\src\gen.c" />
-    <ClCompile Include="..\..\flex\src\main.c" />
-    <ClCompile Include="..\..\flex\src\misc.c" />
-    <ClCompile Include="..\..\flex\src\nfa.c" />
-    <ClCompile Include="..\..\flex\src\options.c" />
-    <ClCompile Include="..\..\flex\src\parse.c" />
-    <ClCompile Include="..\..\flex\src\regex.c" />
-    <ClCompile Include="..\..\flex\src\scan.c" />
-    <ClCompile Include="..\..\flex\src\scanflags.c" />
-    <ClCompile Include="..\..\flex\src\scanopt.c" />
-    <ClCompile Include="..\..\flex\src\skel.c" />
-    <ClCompile Include="..\..\flex\src\sym.c" />
-    <ClCompile Include="..\..\flex\src\tables.c" />
-    <ClCompile Include="..\..\flex\src\tables_shared.c" />
-    <ClCompile Include="..\..\flex\src\tblcmp.c" />
-    <ClCompile Include="..\..\flex\src\yylex.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2019/win_flex/win_flex.vcxproj.filters b/VS2019/win_flex/win_flex.vcxproj.filters
deleted file mode 100644
index 1eb993a..0000000
--- a/VS2019/win_flex/win_flex.vcxproj.filters
+++ /dev/null
@@ -1,111 +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;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>
-    <ClInclude Include="..\..\flex\src\flexdef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\flexint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\gettext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\options.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\parse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\scanopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\tables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flex\src\tables_shared.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\flex\src\buf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\ccl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\dfa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\ecs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\filter.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\gen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\misc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\nfa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\options.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\parse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\regex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\scan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\scanflags.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\scanopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\skel.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\sym.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\tables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\tables_shared.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\tblcmp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flex\src\yylex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VS2019/winflexbison.sln b/VS2019/winflexbison.sln
deleted file mode 100644
index c2388df..0000000
--- a/VS2019/winflexbison.sln
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2047
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_lib", "common_lib\common_lib.vcxproj", "{11561197-1120-428C-A43D-7BCDFBCF79B8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_bison", "win_bison\win_bison.vcxproj", "{F49DC041-3A12-4D54-A15E-F38504D1D8B2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{11561197-1120-428C-A43D-7BCDFBCF79B8} = {11561197-1120-428C-A43D-7BCDFBCF79B8}
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0} = {47C40EF9-255C-475F-B5A6-B9CB85D40AD0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_flex", "win_flex\win_flex.vcxproj", "{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{11561197-1120-428C-A43D-7BCDFBCF79B8} = {11561197-1120-428C-A43D-7BCDFBCF79B8}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{11561197-1120-428C-A43D-7BCDFBCF79B8}.Debug|x86.ActiveCfg = Debug|Win32
-		{11561197-1120-428C-A43D-7BCDFBCF79B8}.Debug|x86.Build.0 = Debug|Win32
-		{11561197-1120-428C-A43D-7BCDFBCF79B8}.Release|x86.ActiveCfg = Release|Win32
-		{11561197-1120-428C-A43D-7BCDFBCF79B8}.Release|x86.Build.0 = Release|Win32
-		{F49DC041-3A12-4D54-A15E-F38504D1D8B2}.Debug|x86.ActiveCfg = Debug|Win32
-		{F49DC041-3A12-4D54-A15E-F38504D1D8B2}.Debug|x86.Build.0 = Debug|Win32
-		{F49DC041-3A12-4D54-A15E-F38504D1D8B2}.Release|x86.ActiveCfg = Release|Win32
-		{F49DC041-3A12-4D54-A15E-F38504D1D8B2}.Release|x86.Build.0 = Release|Win32
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}.Debug|x86.ActiveCfg = Debug|Win32
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}.Debug|x86.Build.0 = Debug|Win32
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}.Release|x86.ActiveCfg = Release|Win32
-		{47C40EF9-255C-475F-B5A6-B9CB85D40AD0}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C798034B-A54B-44A3-B979-AD30AB6ABA16}
-	EndGlobalSection
-EndGlobal