diff --git a/HeaderMake/HeaderMake_vc2017.vcxproj b/HeaderMake/HeaderMake.vcxproj
similarity index 98%
rename from HeaderMake/HeaderMake_vc2017.vcxproj
rename to HeaderMake/HeaderMake.vcxproj
index 1d2b010743..3c0e825da3 100644
--- a/HeaderMake/HeaderMake_vc2017.vcxproj
+++ b/HeaderMake/HeaderMake.vcxproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0F2918B0-23E3-42E8-A1A8-8739F726A23E}</ProjectGuid>
-    <RootNamespace>HeaderMake_vc2017</RootNamespace>
+    <RootNamespace>HeaderMake</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/MakefileMake/MakefileMake_vc2017.vcxproj b/MakefileMake/MakefileMake.vcxproj
similarity index 98%
rename from MakefileMake/MakefileMake_vc2017.vcxproj
rename to MakefileMake/MakefileMake.vcxproj
index 4db1ceb1eb..39a00a8e11 100644
--- a/MakefileMake/MakefileMake_vc2017.vcxproj
+++ b/MakefileMake/MakefileMake.vcxproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{40735439-B12B-40AC-92F7-F1183D8B6862}</ProjectGuid>
-    <RootNamespace>MakefileMake_vc2017</RootNamespace>
+    <RootNamespace>MakefileMake</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/README.md b/README.md
index 8b4ad7e1f1..286e93bf14 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ https://github.com/sakura-editor/sakura/wiki
 More information: https://github.com/sakura-editor/sakura/issues/6
 
 ## How to build
-Visual Studio Community 2017 で `sakura/sakura_vc2017.sln` を開いてビルド。
+Visual Studio Community 2017 で `sakura/sakura.sln` を開いてビルド。
 
 ## CI Build (AppVeyor)
 本リポジトリの最新 master は以下の AppVeyor プロジェクト上で自動ビルドされます。  
diff --git a/appveyor.yml b/appveyor.yml
index dd5ab2461f..e35255b812 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ init:
 
 build_script:
 - cmd: >-
-    set SLN_FILE=sakura\sakura_vc2017.sln
+    set SLN_FILE=sakura\sakura.sln
 
 
     set EXTRA_CMD=/verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -16,16 +16,18 @@ build_script:
     set MSBUILD_EXE="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
 
 
-    echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Debug_Unicode      /t:"Clean","Rebuild"  %EXTRA_CMD%
-         %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Debug_Unicode      /t:"Clean","Rebuild"  %EXTRA_CMD%
+    echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Debug      /t:"Clean","Rebuild"  %EXTRA_CMD%
+         %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Debug      /t:"Clean","Rebuild"  %EXTRA_CMD%
 
-    echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Release_Unicode    /t:"Clean","Rebuild"  %EXTRA_CMD%
-         %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Release_Unicode    /t:"Clean","Rebuild"  %EXTRA_CMD%
+    echo %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Release    /t:"Clean","Rebuild"  %EXTRA_CMD%
+         %MSBUILD_EXE% %SLN_FILE% /p:Platform=x86 /p:Configuration=Release    /t:"Clean","Rebuild"  %EXTRA_CMD%
 
     echo appveyor_yml
 
 artifacts:
-- path: sakura\Debug_Unicode\sakura.exe
-- path: sakura\Debug_Unicode\sakura.pdb
-- path: sakura\Release_Unicode\sakura.exe
-- path: sakura\Release_Unicode\sakura.pdb
+- path: sakura\Debug\sakura.exe
+- path: sakura\Debug\sakura.pdb
+- path: sakura\Release\sakura.exe
+- path: sakura\Release\sakura.pdb
+- path: sakura_lang_en_US\Debug\sakura_lang_en_US.dll
+- path: sakura_lang_en_US\Release\sakura_lang_en_US.dll
diff --git a/sakura/.gitignore b/sakura/.gitignore
index 3c2b9469fe..4f0c90bb3b 100644
--- a/sakura/.gitignore
+++ b/sakura/.gitignore
@@ -20,15 +20,8 @@
 /*.tds
 /*.user
 # /*.vcxproj
-/Debug
-/Debug_Ansi
-/Debug_Unicode
-/Debug_bcc
-/Debug_one
-/Release_Ansi
-/Release_Unicode
-/Release_bcc
-/Release_one
+/Debug*
+/Release*
 /Toolkit2003Env.bat
 /_UpgradeReport_Files
 /ipch
diff --git a/sakura/sakura.sln b/sakura/sakura.sln
new file mode 100644
index 0000000000..c4493256ae
--- /dev/null
+++ b/sakura/sakura.sln
@@ -0,0 +1,45 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2026
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura", "sakura.vcxproj", "{AF03508C-515E-4A0E-87BE-67ED1E254BD0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HeaderMake", "..\HeaderMake\HeaderMake.vcxproj", "{0F2918B0-23E3-42E8-A1A8-8739F726A23E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MakefileMake", "..\MakefileMake\MakefileMake.vcxproj", "{40735439-B12B-40AC-92F7-F1183D8B6862}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura_lang_en_US", "..\sakura_lang_en_US\sakura_lang.vcxproj", "{7A6D0F29-E560-4985-835B-5F92A08EB242}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AF03508C-515E-4A0E-87BE-67ED1E254BD0} = {AF03508C-515E-4A0E-87BE-67ED1E254BD0}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x86.ActiveCfg = Debug|Win32
+		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x86.Build.0 = Debug|Win32
+		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x86.ActiveCfg = Release|Win32
+		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x86.Build.0 = Release|Win32
+		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x86.ActiveCfg = Debug|Win32
+		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x86.Build.0 = Debug|Win32
+		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x86.ActiveCfg = Release|Win32
+		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x86.Build.0 = Release|Win32
+		{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x86.ActiveCfg = Debug|Win32
+		{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x86.Build.0 = Debug|Win32
+		{40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x86.ActiveCfg = Release|Win32
+		{40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x86.Build.0 = Release|Win32
+		{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x86.ActiveCfg = Debug|Win32
+		{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x86.Build.0 = Debug|Win32
+		{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x86.ActiveCfg = Release|Win32
+		{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {06C18222-C02C-4F04-A17C-2453F9C27866}
+	EndGlobalSection
+EndGlobal
diff --git a/sakura/sakura_vc2017.vcxproj b/sakura/sakura.vcxproj
similarity index 88%
rename from sakura/sakura_vc2017.vcxproj
rename to sakura/sakura.vcxproj
index c50564d235..18ed88b768 100644
--- a/sakura/sakura_vc2017.vcxproj
+++ b/sakura/sakura.vcxproj
@@ -1,20 +1,12 @@
 <?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_Ansi|Win32">
-      <Configuration>Debug_Ansi</Configuration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_Unicode|Win32">
-      <Configuration>Debug_Unicode</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Ansi|Win32">
-      <Configuration>Release_Ansi</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Unicode|Win32">
-      <Configuration>Release_Unicode</Configuration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -23,26 +15,13 @@
     <ProjectGuid>{AF03508C-515E-4A0E-87BE-67ED1E254BD0}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
@@ -52,43 +31,27 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\obj\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\obj\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\obj\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\obj\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -125,76 +88,7 @@
       <Culture>0x0411</Culture>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\sakura_core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NOMINMAX;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>call postBuild.bat "$(TargetPath).manifest"</Command>
-    </PostBuildEvent>
-    <PreBuildEvent>
-      <Command>call preBuild.bat</Command>
-    </PreBuildEvent>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0411</Culture>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'">
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\sakura_core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NOMINMAX;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>call postBuild.bat "$(TargetPath).manifest"</Command>
-    </PostBuildEvent>
-    <PreBuildEvent>
-      <Command>call preBuild.bat</Command>
-    </PreBuildEvent>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0411</Culture>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\sakura_core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -825,10 +719,8 @@
     <ClCompile Include="..\sakura_core\recent\CRecentSearch.cpp" />
     <ClCompile Include="..\sakura_core\recent\CRecentTagjumpKeyword.cpp" />
     <ClCompile Include="..\sakura_core\StdAfx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Ansi|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug_Unicode|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Ansi|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release_Unicode|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\sakura_core\typeprop\CDlgKeywordSelect.cpp" />
     <ClCompile Include="..\sakura_core\typeprop\CDlgSameColor.cpp" />
@@ -964,11 +856,11 @@
     <Text Include="..\sakura_core\util\ReadMe_util.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HeaderMake\HeaderMake_vc2017.vcxproj">
+    <ProjectReference Include="..\HeaderMake\HeaderMake.vcxproj">
       <Project>{0f2918b0-23e3-42e8-a1a8-8739f726a23e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\MakefileMake\MakefileMake_vc2017.vcxproj">
+    <ProjectReference Include="..\MakefileMake\MakefileMake.vcxproj">
       <Project>{40735439-b12b-40ac-92f7-f1183d8b6862}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/sakura/sakura_vc2017.vcxproj.filters b/sakura/sakura.vcxproj.filters
similarity index 99%
rename from sakura/sakura_vc2017.vcxproj.filters
rename to sakura/sakura.vcxproj.filters
index 936abe5862..702668f583 100644
--- a/sakura/sakura_vc2017.vcxproj.filters
+++ b/sakura/sakura.vcxproj.filters
@@ -1084,6 +1084,7 @@
     <ClInclude Include="..\sakura_core\uiparts\HandCursor.h">
       <Filter>Cpp Source Files\uiparts</Filter>
     </ClInclude>
+    <ClInclude Include="..\sakura_core\gitrev.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\sakura_core\Funccode_x.hsrc">
diff --git a/sakura/sakura_vc2017.sln b/sakura/sakura_vc2017.sln
deleted file mode 100644
index e7123bfd30..0000000000
--- a/sakura/sakura_vc2017.sln
+++ /dev/null
@@ -1,64 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura", "sakura_vc2017.vcxproj", "{AF03508C-515E-4A0E-87BE-67ED1E254BD0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HeaderMake_vc2017", "..\HeaderMake\HeaderMake_vc2017.vcxproj", "{0F2918B0-23E3-42E8-A1A8-8739F726A23E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MakefileMake_vc2017", "..\MakefileMake\MakefileMake_vc2017.vcxproj", "{40735439-B12B-40AC-92F7-F1183D8B6862}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_Ansi|x86 = Debug_Ansi|x86
-		Debug_Unicode|x86 = Debug_Unicode|x86
-		Debug|x86 = Debug|x86
-		Release_Ansi|x86 = Release_Ansi|x86
-		Release_Unicode|x86 = Release_Unicode|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug_Ansi|x86.ActiveCfg = Debug_Ansi|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug_Ansi|x86.Build.0 = Debug_Ansi|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug_Unicode|x86.ActiveCfg = Debug_Unicode|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug_Unicode|x86.Build.0 = Debug_Unicode|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x86.ActiveCfg = Debug_Unicode|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x86.Build.0 = Debug_Unicode|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release_Ansi|x86.ActiveCfg = Release_Ansi|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release_Ansi|x86.Build.0 = Release_Ansi|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release_Unicode|x86.ActiveCfg = Release_Unicode|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release_Unicode|x86.Build.0 = Release_Unicode|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x86.ActiveCfg = Release_Ansi|Win32
-		{AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x86.Build.0 = Release_Ansi|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug_Ansi|x86.ActiveCfg = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug_Ansi|x86.Build.0 = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug_Unicode|x86.ActiveCfg = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug_Unicode|x86.Build.0 = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x86.ActiveCfg = Debug|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x86.Build.0 = Debug|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release_Ansi|x86.ActiveCfg = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release_Ansi|x86.Build.0 = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release_Unicode|x86.ActiveCfg = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release_Unicode|x86.Build.0 = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x86.ActiveCfg = Release|Win32
-		{0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x86.Build.0 = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug_Ansi|x86.ActiveCfg = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug_Ansi|x86.Build.0 = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug_Unicode|x86.ActiveCfg = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug_Unicode|x86.Build.0 = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x86.ActiveCfg = Debug|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x86.Build.0 = Debug|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Release_Ansi|x86.ActiveCfg = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Release_Ansi|x86.Build.0 = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Release_Unicode|x86.ActiveCfg = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Release_Unicode|x86.Build.0 = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x86.ActiveCfg = Release|Win32
-		{40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {06C18222-C02C-4F04-A17C-2453F9C27866}
-	EndGlobalSection
-EndGlobal
diff --git a/sakura_core/.gitignore b/sakura_core/.gitignore
index 7f61940cee..a5dbeba9fb 100644
--- a/sakura_core/.gitignore
+++ b/sakura_core/.gitignore
@@ -1 +1,3 @@
 /gitrev.h
+/Funccode_define.h
+/Funccode_enum.h
diff --git a/sakura_core/Funccode_define.h b/sakura_core/Funccode_define.h
deleted file mode 100644
index e0268ec9c7..0000000000
--- a/sakura_core/Funccode_define.h
+++ /dev/null
@@ -1,468 +0,0 @@
-#ifndef SAKURA_HEADERMAKE_98B26AB2_D5C9_4884_8D15_D1F3A2936253_H_
-#define SAKURA_HEADERMAKE_98B26AB2_D5C9_4884_8D15_D1F3A2936253_H_
-
-//���̃t�@�C���� HeaderMake �ɂ�� Funccode_x.hsrc ���琶�����ꂽ�t�@�C���ł��B
-//���ڕҏW���Ȃ��ł��������B
-
-#define F_INVALID -1
-#define F_DEFAULT 0
-#define F_0 0
-#define F_DISABLE 0
-#define F_NODE 0
-#define F_SEPARATOR 1
-#define F_TOOLBARWRAP 2
-#define F_MACRO_EXTRA 2
-#define F_PLUGCOMMAND 3
-#define F_DUMMY_MAX_CODE 10
-#define FA_FROMKEYBOARD 0x00010000
-#define FA_FROMMACRO 0x00020000
-#define FA_NONRECORD 0x00040000
-#define F_PLUGCOMMAND_FIRST 20000
-#define F_PLUGCOMMAND_LAST 21999
-#define F_WINDOW_LIST 29001
-#define F_FILE_USED_RECENTLY 29002
-#define F_FOLDER_USED_RECENTLY 29003
-#define F_CUSTMENU_LIST 29004
-#define F_USERMACRO_LIST 29005
-#define F_PLUGIN_LIST 29006
-#define F_SPECIAL_FIRST F_WINDOW_LIST
-#define F_SPECIAL_LAST F_PLUGIN_LIST
-#define F_MENU_FIRST 30000
-#define F_FILENEW 30101
-#define F_FILEOPEN 30102
-#define F_FILESAVE 30103
-#define F_FILESAVEAS_DIALOG 30104
-#define F_FILESAVEAS 30106
-#define F_FILECLOSE 30105
-#define F_FILECLOSE_OPEN 30107
-#define F_FILEOPEN_DROPDOWN 30108
-#define F_FILESAVECLOSE 30109
-#define F_FILENEW_NEWWINDOW 30110
-#define F_FILE_REOPEN_SJIS 30111
-#define F_FILE_REOPEN_JIS 30112
-#define F_FILE_REOPEN_EUC 30113
-#define F_FILE_REOPEN_UNICODE 30114
-#define F_FILE_REOPEN_UTF8 30115
-#define F_FILE_REOPEN_UTF7 30116
-#define F_FILE_REOPEN_UNICODEBE 30117
-#define F_FILE_REOPEN_CESU8 30118
-#define F_FILE_REOPEN 30119
-#define F_FILESAVEALL 30120
-#define F_FILESAVE_QUIET 30121
-#define F_FILE_REOPEN_LATIN1 30122
-#define F_PRINT 30150
-#define F_PRINT_PREVIEW 30151
-#define F_PRINT_PAGESETUP 30152
-#define F_OPEN_HfromtoC 30162
-#define F_ACTIVATE_SQLPLUS 30170
-#define F_PLSQL_COMPILE_ON_SQLPLUS 30171
-#define F_BROWSE 30180
-#define F_VIEWMODE 30185
-#define F_PROPERTY_FILE 30190
-#define F_PROFILEMGR 30191
-#define F_EXITALLEDITORS 30194
-#define F_EXITALL 30195
-#define F_WCHAR 30200
-#define F_IME_CHAR 30201
-#define F_UNDO 30210
-#define F_REDO 30211
-#define F_DELETE 30221
-#define F_DELETE_BACK 30222
-#define F_WordDeleteToStart 30230
-#define F_WordDeleteToEnd 30231
-#define F_WordCut 30232
-#define F_WordDelete 30233
-#define F_LineCutToStart 30240
-#define F_LineCutToEnd 30241
-#define F_LineDeleteToStart 30242
-#define F_LineDeleteToEnd 30243
-#define F_CUT_LINE 30244
-#define F_DELETE_LINE 30245
-#define F_DUPLICATELINE 30250
-#define F_INDENT_TAB 30260
-#define F_UNINDENT_TAB 30261
-#define F_INDENT_SPACE 30262
-#define F_UNINDENT_SPACE 30263
-#define F_LTRIM 30280
-#define F_RTRIM 30281
-#define F_SORT_ASC 30282
-#define F_SORT_DESC 30283
-#define F_MERGE 30284
-#define F_RECONVERT 30285
-#define F_UP 30311
-#define F_DOWN 30312
-#define F_LEFT 30313
-#define F_RIGHT 30314
-#define F_UP2 30315
-#define F_DOWN2 30316
-#define F_WORDLEFT 30320
-#define F_WORDRIGHT 30321
-#define F_GOLINETOP 30332
-#define F_GOLINEEND 30333
-#define F_HalfPageUp 30340
-#define F_HalfPageDown 30341
-#define F_1PageUp 30342
-#define F_1PageDown 30343
-#define F_GOFILETOP 30350
-#define F_GOFILEEND 30351
-#define F_CURLINECENTER 30360
-#define F_JUMPHIST_PREV 30370
-#define F_JUMPHIST_NEXT 30371
-#define F_JUMPHIST_SET 30372
-#define F_WndScrollDown 30380
-#define F_WndScrollUp 30381
-#define F_GONEXTPARAGRAPH 30382
-#define F_GOPREVPARAGRAPH 30383
-#define F_AUTOSCROLL 30384
-#define F_WHEEL_FIRST 30385
-#define F_WHEELUP 30385
-#define F_WHEELDOWN 30386
-#define F_WHEELLEFT 30387
-#define F_WHEELRIGHT 30388
-#define F_WHEELPAGEUP 30389
-#define F_WHEELPAGEDOWN 30390
-#define F_WHEELPAGELEFT 30391
-#define F_WHEELPAGERIGHT 30392
-#define F_WHEEL_LAST 30392
-#define F_MODIFYLINE_NEXT 30393
-#define F_MODIFYLINE_PREV 30394
-#define F_SELECTWORD 30400
-#define F_SELECTALL 30401
-#define F_SELECTLINE 30403
-#define F_BEGIN_SEL 30410
-#define F_UP_SEL 30411
-#define F_DOWN_SEL 30412
-#define F_LEFT_SEL 30413
-#define F_RIGHT_SEL 30414
-#define F_UP2_SEL 30415
-#define F_DOWN2_SEL 30416
-#define F_WORDLEFT_SEL 30420
-#define F_WORDRIGHT_SEL 30421
-#define F_GOLINETOP_SEL 30432
-#define F_GOLINEEND_SEL 30433
-#define F_HalfPageUp_Sel 30440
-#define F_HalfPageDown_Sel 30441
-#define F_1PageUp_Sel 30442
-#define F_1PageDown_Sel 30443
-#define F_GOFILETOP_SEL 30450
-#define F_GOFILEEND_SEL 30451
-#define F_GONEXTPARAGRAPH_SEL 30482
-#define F_GOPREVPARAGRAPH_SEL 30483
-#define F_MODIFYLINE_NEXT_SEL 30484
-#define F_MODIFYLINE_PREV_SEL 30485
-#define F_BEGIN_BOX 30510
-#define F_UP_BOX 30511
-#define F_DOWN_BOX 30512
-#define F_LEFT_BOX 30513
-#define F_RIGHT_BOX 30514
-#define F_UP2_BOX 30515
-#define F_DOWN2_BOX 30516
-#define F_WORDLEFT_BOX 30520
-#define F_WORDRIGHT_BOX 30521
-#define F_GOLOGICALLINETOP_BOX 30530
-#define F_GOLINETOP_BOX 30532
-#define F_GOLINEEND_BOX 30533
-#define F_HalfPageUp_BOX 30540
-#define F_HalfPageDown_BOX 30541
-#define F_1PageUp_BOX 30542
-#define F_1PageDown_BOX 30543
-#define F_GOFILETOP_BOX 30550
-#define F_GOFILEEND_BOX 30551
-#define F_CUT 30601
-#define F_COPY 30602
-#define F_COPY_ADDCRLF 30608
-#define F_COPY_CRLF 30603
-#define F_PASTE 30604
-#define F_PASTEBOX 30605
-#define F_INSTEXT_W 30606
-#define F_ADDTAIL_W 30607
-#define F_COPYLINES 30610
-#define F_COPYLINESASPASSAGE 30611
-#define F_COPYLINESWITHLINENUMBER 30612
-#define F_COPY_COLOR_HTML 30613
-#define F_COPY_COLOR_HTML_LINENUMBER 30614
-#define F_COPYPATH 30620
-#define F_COPYTAG 30621
-#define F_COPYFNAME 30622
-#define F_CREATEKEYBINDLIST 30630
-#define F_INS_DATE 30790
-#define F_INS_TIME 30791
-#define F_CTRL_CODE_DIALOG 30792
-#define F_CTRL_CODE 30793
-#define F_TOLOWER 30800
-#define F_TOUPPER 30801
-#define F_TOHANKAKU 30810
-#define F_TOHANKATA 30817
-#define F_TOZENKAKUKATA 30811
-#define F_TOZENKAKUHIRA 30812
-#define F_HANKATATOZENKATA 30813
-#define F_HANKATATOZENHIRA 30814
-#define F_TOZENEI 30815
-#define F_TOHANEI 30816
-#define F_TABTOSPACE 30830
-#define F_SPACETOTAB 30831
-#define F_CODECNV_AUTO2SJIS 30850
-#define F_CODECNV_EMAIL 30851
-#define F_CODECNV_EUC2SJIS 30852
-#define F_CODECNV_UNICODE2SJIS 30853
-#define F_CODECNV_UNICODEBE2SJIS 30856
-#define F_CODECNV_UTF82SJIS 30854
-#define F_CODECNV_UTF72SJIS 30855
-#define F_CODECNV_SJIS2JIS 30860
-#define F_CODECNV_SJIS2EUC 30861
-#define F_CODECNV_SJIS2UTF8 30862
-#define F_CODECNV_SJIS2UTF7 30863
-#define F_BASE64DECODE 30870
-#define F_UUDECODE 30880
-#define F_SEARCH_DIALOG 30901
-#define F_SEARCH_NEXT 30902
-#define F_SEARCH_PREV 30903
-#define F_REPLACE_DIALOG 30904
-#define F_REPLACE 30906
-#define F_REPLACE_ALL 30907
-#define F_SEARCH_CLEARMARK 30905
-#define F_JUMP_SRCHSTARTPOS 30909
-#define F_SEARCH_BOX 30908
-#define F_GREP_DIALOG 30910
-#define F_GREP 30911
-#define F_GREP_REPLACE_DLG 30912
-#define F_GREP_REPLACE 30913
-#define F_JUMP_DIALOG 30920
-#define F_JUMP 30921
-#define F_OUTLINE 30930
-#define F_OUTLINE_TOGGLE 30931
-#define F_TAGJUMP 30940
-#define F_TAGJUMPBACK 30941
-#define F_TAGJUMP_LIST 30942
-#define F_TAGS_MAKE 30943
-#define F_DIRECT_TAGJUMP 30944
-#define F_TAGJUMP_CLOSE 30945
-#define F_TAGJUMP_KEYWORD 30946
-#define F_COMPARE 30950
-#define F_BRACKETPAIR 30960
-#define F_BOOKMARK_SET 30970
-#define F_BOOKMARK_NEXT 30971
-#define F_BOOKMARK_PREV 30972
-#define F_BOOKMARK_RESET 30973
-#define F_BOOKMARK_VIEW 30974
-#define F_BOOKMARK_PATTERN 30975
-#define F_DIFF_DIALOG 30976
-#define F_DIFF 30977
-#define F_DIFF_NEXT 30978
-#define F_DIFF_PREV 30979
-#define F_DIFF_RESET 30980
-#define F_ISEARCH_NEXT 30981
-#define F_ISEARCH_PREV 30982
-#define F_ISEARCH_REGEXP_NEXT 30983
-#define F_ISEARCH_REGEXP_PREV 30984
-#define F_ISEARCH_MIGEMO_NEXT 30985
-#define F_ISEARCH_MIGEMO_PREV 30986
-#define F_FUNCLIST_NEXT 30988
-#define F_FUNCLIST_PREV 30989
-#define F_FILETREE 30990
-#define F_CHGMOD_INS 31001
-#define F_CHG_CHARSET 31010
-#define F_CHGMOD_EOL_CRLF 31081
-#define F_CHGMOD_EOL_LF 31082
-#define F_CHGMOD_EOL_CR 31083
-#define F_CANCEL_MODE 31099
-#define F_SHOWTOOLBAR 31100
-#define F_SHOWFUNCKEY 31101
-#define F_SHOWSTATUSBAR 31102
-#define F_SHOWTAB 31103
-#define F_SHOWMINIMAP 31104
-#define F_TYPE_LIST 31110
-#define F_OPTION_TYPE 31111
-#define F_OPTION 31112
-#define F_FAVORITE 31113
-#define F_FONT 31120
-#define F_SETFONTSIZE 31121
-#define F_SETFONTSIZEUP 31122
-#define F_SETFONTSIZEDOWN 31123
-#define F_WRAPWINDOWWIDTH 31140
-#define F_TMPWRAPNOWRAP 31141
-#define F_TMPWRAPSETTING 31142
-#define F_TMPWRAPWINDOW 31143
-#define F_SELECT_COUNT_MODE 31144
-#define F_TYPE_SCREEN 31115
-#define F_TYPE_COLOR 31116
-#define F_TYPE_WINDOW 31114
-#define F_TYPE_HELPER 31117
-#define F_TYPE_REGEX_KEYWORD 31118
-#define F_TYPE_KEYHELP 31119
-#define F_OPTION_GENERAL 32000
-#define F_OPTION_WINDOW 32001
-#define F_OPTION_EDIT 32002
-#define F_OPTION_FILE 32003
-#define F_OPTION_BACKUP 32004
-#define F_OPTION_FORMAT 32005
-#define F_OPTION_GREP 32007
-#define F_OPTION_KEYBIND 32008
-#define F_OPTION_CUSTMENU 32009
-#define F_OPTION_TOOLBAR 32010
-#define F_OPTION_KEYWORD 32011
-#define F_OPTION_HELPER 32012
-#define F_OPTION_MACRO 32013
-#define F_OPTION_FNAME 32014
-#define F_OPTION_TAB 32015
-#define F_OPTION_STATUSBAR 32016
-#define F_OPTION_PLUGIN 32017
-#define F_OPTION_MAINMENU 32018
-#define F_RECKEYMACRO 31250
-#define F_SAVEKEYMACRO 31251
-#define F_LOADKEYMACRO 31252
-#define F_EXECKEYMACRO 31253
-#define F_EXECEXTMACRO 31254
-#define F_EXECMD_DIALOG 31270
-#define F_EXECMD 31271
-#define F_SPLIT_V 31310
-#define F_SPLIT_H 31311
-#define F_SPLIT_VH 31312
-#define F_WINCLOSE 31320
-#define F_WIN_CLOSEALL 31321
-#define F_CASCADE 31330
-#define F_TILE_V 31331
-#define F_TILE_H 31332
-#define F_BIND_WINDOW 31333
-#define F_TOPMOST 31334
-#define F_NEXTWINDOW 31340
-#define F_PREVWINDOW 31341
-#define F_WINLIST 31336
-#define F_DLGWINLIST 31337
-#define F_MAXIMIZE_V 31350
-#define F_MINIMIZE_ALL 31351
-#define F_MAXIMIZE_H 31352
-#define F_REDRAW 31360
-#define F_WIN_OUTPUT 31370
-#define F_GROUPCLOSE 31380
-#define F_NEXTGROUP 31381
-#define F_PREVGROUP 31382
-#define F_TAB_MOVERIGHT 31383
-#define F_TAB_MOVELEFT 31384
-#define F_TAB_SEPARATE 31385
-#define F_TAB_JOINTNEXT 31386
-#define F_TAB_JOINTPREV 31387
-#define F_TAB_CLOSEOTHER 31388
-#define F_TAB_CLOSELEFT 31389
-#define F_TAB_CLOSERIGHT 31390
-#define F_HOKAN 31430
-#define F_TOGGLE_KEY_SEARCH 31431
-#define F_HELP_CONTENTS 31440
-#define F_HELP_SEARCH 31441
-#define F_MENU_ALLFUNC 31445
-#define F_EXTHELP1 31450
-#define F_EXTHTMLHELP 31451
-#define F_ABOUT 31455
-#define F_USERMACRO_0 31600
-#define F_MENU_RBUTTON 31580
-#define F_CUSTMENU_1 31501
-#define F_CUSTMENU_2 31502
-#define F_CUSTMENU_3 31503
-#define F_CUSTMENU_4 31504
-#define F_CUSTMENU_5 31505
-#define F_CUSTMENU_6 31506
-#define F_CUSTMENU_7 31507
-#define F_CUSTMENU_8 31508
-#define F_CUSTMENU_9 31509
-#define F_CUSTMENU_10 31510
-#define F_CUSTMENU_11 31511
-#define F_CUSTMENU_12 31512
-#define F_CUSTMENU_13 31513
-#define F_CUSTMENU_14 31514
-#define F_CUSTMENU_15 31515
-#define F_CUSTMENU_16 31516
-#define F_CUSTMENU_17 31517
-#define F_CUSTMENU_18 31518
-#define F_CUSTMENU_19 31519
-#define F_CUSTMENU_20 31520
-#define F_CUSTMENU_21 31521
-#define F_CUSTMENU_22 31522
-#define F_CUSTMENU_23 31523
-#define F_CUSTMENU_24 31524
-#define F_CUSTMENU_LAST F_CUSTMENU_24
-#define F_CUSTMENU_BASE 31500
-#define F_MENU_NOT_USED_FIRST 32768
-#define F_CHGMOD_EOL 32800
-#define F_SET_QUOTESTRING 32801
-#define F_TRACEOUT 32802
-#define F_PUTFILE 32803
-#define F_INSFILE 32804
-#define F_TEXTWRAPMETHOD 32805
-#define F_INSBOXTEXT 32806
-#define F_MOVECURSOR 32807
-#define F_MOVECURSORLAYOUT 32808
-#define F_STATUSMSG 32809
-#define F_MSGBEEP 32810
-#define F_CHANGETYPE 32811
-#define F_FILEOPEN2 32812
-#define F_COMMITUNDOBUFFER 32813
-#define F_ADDREFUNDOBUFFER 32814
-#define F_SETUNDOBUFFER 32815
-#define F_APPENDUNDOBUFFERCURSOR 32816
-#define F_CLIPBOARDEMPTY 32817
-#define F_SETVIEWTOP 32818
-#define F_SETVIEWLEFT 32819
-#define F_FUNCTION_FIRST 40000
-#define F_GETFILENAME 40001
-#define F_GETSAVEFILENAME 40018
-#define F_GETSELECTED 40002
-#define F_EXPANDPARAMETER 40003
-#define F_GETLINESTR 40004
-#define F_GETLINECOUNT 40005
-#define F_CHGTABWIDTH 40006
-#define F_ISTEXTSELECTED 40007
-#define F_GETSELLINEFROM 40008
-#define F_GETSELCOLUMNFROM 40009
-#define F_GETSELLINETO 40010
-#define F_GETSELCOLUMNTO 40011
-#define F_ISINSMODE 40012
-#define F_GETCHARCODE 40013
-#define F_GETLINECODE 40014
-#define F_ISPOSSIBLEUNDO 40015
-#define F_ISPOSSIBLEREDO 40016
-#define F_CHGWRAPCOLUMN 40017
-#define F_ISCURTYPEEXT 40019
-#define F_ISSAMETYPEEXT 40020
-#define F_INPUTBOX 40021
-#define F_MESSAGEBOX 40023
-#define F_ERRORMSG 40024
-#define F_WARNMSG 40025
-#define F_INFOMSG 40026
-#define F_OKCANCELBOX 40027
-#define F_YESNOBOX 40028
-#define F_COMPAREVERSION 40029
-#define F_MACROSLEEP 40030
-#define F_FILEOPENDIALOG 40031
-#define F_FILESAVEDIALOG 40032
-#define F_FOLDERDIALOG 40033
-#define F_GETCLIPBOARD 40034
-#define F_SETCLIPBOARD 40035
-#define F_LAYOUTTOLOGICLINENUM 40036
-#define F_LOGICTOLAYOUTLINENUM 40037
-#define F_LINECOLUMNTOINDEX 40038
-#define F_LINEINDEXTOCOLUMN 40039
-#define F_GETCOOKIE 40040
-#define F_GETCOOKIEDEFAULT 40041
-#define F_SETCOOKIE 40042
-#define F_DELETECOOKIE 40043
-#define F_GETCOOKIENAMES 40044
-#define F_SETDRAWSWITCH 40045
-#define F_GETDRAWSWITCH 40046
-#define F_ISSHOWNSTATUS 40047
-#define F_GETSTRWIDTH 40048
-#define F_GETSTRLAYOUTLENGTH 40049
-#define F_GETDEFAULTCHARLENGTH 40050
-#define F_ISINCLUDECLIPBOARDFORMAT 40051
-#define F_GETCLIPBOARDBYFORMAT 40052
-#define F_SETCLIPBOARDBYFORMAT 40053
-#define F_GETLINEATTRIBUTE 40054
-#define F_ISTEXTSELECTINGLOCK 40055
-#define F_GETVIEWLINES 40056
-#define F_GETVIEWCOLUMNS 40057
-#define F_CREATEMENU 40058
-#define F_ISEARCH_ADD_CHAR 0xC001
-#define F_ISEARCH_ADD_STR 0xC002
-#define F_ISEARCH_DEL_BACK 0xC003
-
-#endif /* SAKURA_HEADERMAKE_98B26AB2_D5C9_4884_8D15_D1F3A2936253_H_ */
-/*[EOF]*/
diff --git a/sakura_core/Funccode_enum.h b/sakura_core/Funccode_enum.h
deleted file mode 100644
index b33bef4ed7..0000000000
--- a/sakura_core/Funccode_enum.h
+++ /dev/null
@@ -1,470 +0,0 @@
-#ifndef SAKURA_HEADERMAKE_2034D8F5_AE65_408D_9F53_D3DEA240C67BI_H_
-#define SAKURA_HEADERMAKE_2034D8F5_AE65_408D_9F53_D3DEA240C67BI_H_
-
-//���̃t�@�C���� HeaderMake �ɂ�� Funccode_x.hsrc ���琶�����ꂽ�t�@�C���ł��B
-//���ڕҏW���Ȃ��ł��������B
-
-enum EFunctionCode{
-	F_INVALID = -1,
-	F_DEFAULT = 0,
-	F_0 = 0,
-	F_DISABLE = 0,
-	F_NODE = 0,
-	F_SEPARATOR = 1,
-	F_TOOLBARWRAP = 2,
-	F_MACRO_EXTRA = 2,
-	F_PLUGCOMMAND = 3,
-	F_DUMMY_MAX_CODE = 10,
-	FA_FROMKEYBOARD = 0x00010000,
-	FA_FROMMACRO = 0x00020000,
-	FA_NONRECORD = 0x00040000,
-	F_PLUGCOMMAND_FIRST = 20000,
-	F_PLUGCOMMAND_LAST = 21999,
-	F_WINDOW_LIST = 29001,
-	F_FILE_USED_RECENTLY = 29002,
-	F_FOLDER_USED_RECENTLY = 29003,
-	F_CUSTMENU_LIST = 29004,
-	F_USERMACRO_LIST = 29005,
-	F_PLUGIN_LIST = 29006,
-	F_SPECIAL_FIRST = F_WINDOW_LIST,
-	F_SPECIAL_LAST = F_PLUGIN_LIST,
-	F_MENU_FIRST = 30000,
-	F_FILENEW = 30101,
-	F_FILEOPEN = 30102,
-	F_FILESAVE = 30103,
-	F_FILESAVEAS_DIALOG = 30104,
-	F_FILESAVEAS = 30106,
-	F_FILECLOSE = 30105,
-	F_FILECLOSE_OPEN = 30107,
-	F_FILEOPEN_DROPDOWN = 30108,
-	F_FILESAVECLOSE = 30109,
-	F_FILENEW_NEWWINDOW = 30110,
-	F_FILE_REOPEN_SJIS = 30111,
-	F_FILE_REOPEN_JIS = 30112,
-	F_FILE_REOPEN_EUC = 30113,
-	F_FILE_REOPEN_UNICODE = 30114,
-	F_FILE_REOPEN_UTF8 = 30115,
-	F_FILE_REOPEN_UTF7 = 30116,
-	F_FILE_REOPEN_UNICODEBE = 30117,
-	F_FILE_REOPEN_CESU8 = 30118,
-	F_FILE_REOPEN = 30119,
-	F_FILESAVEALL = 30120,
-	F_FILESAVE_QUIET = 30121,
-	F_FILE_REOPEN_LATIN1 = 30122,
-	F_PRINT = 30150,
-	F_PRINT_PREVIEW = 30151,
-	F_PRINT_PAGESETUP = 30152,
-	F_OPEN_HfromtoC = 30162,
-	F_ACTIVATE_SQLPLUS = 30170,
-	F_PLSQL_COMPILE_ON_SQLPLUS = 30171,
-	F_BROWSE = 30180,
-	F_VIEWMODE = 30185,
-	F_PROPERTY_FILE = 30190,
-	F_PROFILEMGR = 30191,
-	F_EXITALLEDITORS = 30194,
-	F_EXITALL = 30195,
-	F_WCHAR = 30200,
-	F_IME_CHAR = 30201,
-	F_UNDO = 30210,
-	F_REDO = 30211,
-	F_DELETE = 30221,
-	F_DELETE_BACK = 30222,
-	F_WordDeleteToStart = 30230,
-	F_WordDeleteToEnd = 30231,
-	F_WordCut = 30232,
-	F_WordDelete = 30233,
-	F_LineCutToStart = 30240,
-	F_LineCutToEnd = 30241,
-	F_LineDeleteToStart = 30242,
-	F_LineDeleteToEnd = 30243,
-	F_CUT_LINE = 30244,
-	F_DELETE_LINE = 30245,
-	F_DUPLICATELINE = 30250,
-	F_INDENT_TAB = 30260,
-	F_UNINDENT_TAB = 30261,
-	F_INDENT_SPACE = 30262,
-	F_UNINDENT_SPACE = 30263,
-	F_LTRIM = 30280,
-	F_RTRIM = 30281,
-	F_SORT_ASC = 30282,
-	F_SORT_DESC = 30283,
-	F_MERGE = 30284,
-	F_RECONVERT = 30285,
-	F_UP = 30311,
-	F_DOWN = 30312,
-	F_LEFT = 30313,
-	F_RIGHT = 30314,
-	F_UP2 = 30315,
-	F_DOWN2 = 30316,
-	F_WORDLEFT = 30320,
-	F_WORDRIGHT = 30321,
-	F_GOLINETOP = 30332,
-	F_GOLINEEND = 30333,
-	F_HalfPageUp = 30340,
-	F_HalfPageDown = 30341,
-	F_1PageUp = 30342,
-	F_1PageDown = 30343,
-	F_GOFILETOP = 30350,
-	F_GOFILEEND = 30351,
-	F_CURLINECENTER = 30360,
-	F_JUMPHIST_PREV = 30370,
-	F_JUMPHIST_NEXT = 30371,
-	F_JUMPHIST_SET = 30372,
-	F_WndScrollDown = 30380,
-	F_WndScrollUp = 30381,
-	F_GONEXTPARAGRAPH = 30382,
-	F_GOPREVPARAGRAPH = 30383,
-	F_AUTOSCROLL = 30384,
-	F_WHEEL_FIRST = 30385,
-	F_WHEELUP = 30385,
-	F_WHEELDOWN = 30386,
-	F_WHEELLEFT = 30387,
-	F_WHEELRIGHT = 30388,
-	F_WHEELPAGEUP = 30389,
-	F_WHEELPAGEDOWN = 30390,
-	F_WHEELPAGELEFT = 30391,
-	F_WHEELPAGERIGHT = 30392,
-	F_WHEEL_LAST = 30392,
-	F_MODIFYLINE_NEXT = 30393,
-	F_MODIFYLINE_PREV = 30394,
-	F_SELECTWORD = 30400,
-	F_SELECTALL = 30401,
-	F_SELECTLINE = 30403,
-	F_BEGIN_SEL = 30410,
-	F_UP_SEL = 30411,
-	F_DOWN_SEL = 30412,
-	F_LEFT_SEL = 30413,
-	F_RIGHT_SEL = 30414,
-	F_UP2_SEL = 30415,
-	F_DOWN2_SEL = 30416,
-	F_WORDLEFT_SEL = 30420,
-	F_WORDRIGHT_SEL = 30421,
-	F_GOLINETOP_SEL = 30432,
-	F_GOLINEEND_SEL = 30433,
-	F_HalfPageUp_Sel = 30440,
-	F_HalfPageDown_Sel = 30441,
-	F_1PageUp_Sel = 30442,
-	F_1PageDown_Sel = 30443,
-	F_GOFILETOP_SEL = 30450,
-	F_GOFILEEND_SEL = 30451,
-	F_GONEXTPARAGRAPH_SEL = 30482,
-	F_GOPREVPARAGRAPH_SEL = 30483,
-	F_MODIFYLINE_NEXT_SEL = 30484,
-	F_MODIFYLINE_PREV_SEL = 30485,
-	F_BEGIN_BOX = 30510,
-	F_UP_BOX = 30511,
-	F_DOWN_BOX = 30512,
-	F_LEFT_BOX = 30513,
-	F_RIGHT_BOX = 30514,
-	F_UP2_BOX = 30515,
-	F_DOWN2_BOX = 30516,
-	F_WORDLEFT_BOX = 30520,
-	F_WORDRIGHT_BOX = 30521,
-	F_GOLOGICALLINETOP_BOX = 30530,
-	F_GOLINETOP_BOX = 30532,
-	F_GOLINEEND_BOX = 30533,
-	F_HalfPageUp_BOX = 30540,
-	F_HalfPageDown_BOX = 30541,
-	F_1PageUp_BOX = 30542,
-	F_1PageDown_BOX = 30543,
-	F_GOFILETOP_BOX = 30550,
-	F_GOFILEEND_BOX = 30551,
-	F_CUT = 30601,
-	F_COPY = 30602,
-	F_COPY_ADDCRLF = 30608,
-	F_COPY_CRLF = 30603,
-	F_PASTE = 30604,
-	F_PASTEBOX = 30605,
-	F_INSTEXT_W = 30606,
-	F_ADDTAIL_W = 30607,
-	F_COPYLINES = 30610,
-	F_COPYLINESASPASSAGE = 30611,
-	F_COPYLINESWITHLINENUMBER = 30612,
-	F_COPY_COLOR_HTML = 30613,
-	F_COPY_COLOR_HTML_LINENUMBER = 30614,
-	F_COPYPATH = 30620,
-	F_COPYTAG = 30621,
-	F_COPYFNAME = 30622,
-	F_CREATEKEYBINDLIST = 30630,
-	F_INS_DATE = 30790,
-	F_INS_TIME = 30791,
-	F_CTRL_CODE_DIALOG = 30792,
-	F_CTRL_CODE = 30793,
-	F_TOLOWER = 30800,
-	F_TOUPPER = 30801,
-	F_TOHANKAKU = 30810,
-	F_TOHANKATA = 30817,
-	F_TOZENKAKUKATA = 30811,
-	F_TOZENKAKUHIRA = 30812,
-	F_HANKATATOZENKATA = 30813,
-	F_HANKATATOZENHIRA = 30814,
-	F_TOZENEI = 30815,
-	F_TOHANEI = 30816,
-	F_TABTOSPACE = 30830,
-	F_SPACETOTAB = 30831,
-	F_CODECNV_AUTO2SJIS = 30850,
-	F_CODECNV_EMAIL = 30851,
-	F_CODECNV_EUC2SJIS = 30852,
-	F_CODECNV_UNICODE2SJIS = 30853,
-	F_CODECNV_UNICODEBE2SJIS = 30856,
-	F_CODECNV_UTF82SJIS = 30854,
-	F_CODECNV_UTF72SJIS = 30855,
-	F_CODECNV_SJIS2JIS = 30860,
-	F_CODECNV_SJIS2EUC = 30861,
-	F_CODECNV_SJIS2UTF8 = 30862,
-	F_CODECNV_SJIS2UTF7 = 30863,
-	F_BASE64DECODE = 30870,
-	F_UUDECODE = 30880,
-	F_SEARCH_DIALOG = 30901,
-	F_SEARCH_NEXT = 30902,
-	F_SEARCH_PREV = 30903,
-	F_REPLACE_DIALOG = 30904,
-	F_REPLACE = 30906,
-	F_REPLACE_ALL = 30907,
-	F_SEARCH_CLEARMARK = 30905,
-	F_JUMP_SRCHSTARTPOS = 30909,
-	F_SEARCH_BOX = 30908,
-	F_GREP_DIALOG = 30910,
-	F_GREP = 30911,
-	F_GREP_REPLACE_DLG = 30912,
-	F_GREP_REPLACE = 30913,
-	F_JUMP_DIALOG = 30920,
-	F_JUMP = 30921,
-	F_OUTLINE = 30930,
-	F_OUTLINE_TOGGLE = 30931,
-	F_TAGJUMP = 30940,
-	F_TAGJUMPBACK = 30941,
-	F_TAGJUMP_LIST = 30942,
-	F_TAGS_MAKE = 30943,
-	F_DIRECT_TAGJUMP = 30944,
-	F_TAGJUMP_CLOSE = 30945,
-	F_TAGJUMP_KEYWORD = 30946,
-	F_COMPARE = 30950,
-	F_BRACKETPAIR = 30960,
-	F_BOOKMARK_SET = 30970,
-	F_BOOKMARK_NEXT = 30971,
-	F_BOOKMARK_PREV = 30972,
-	F_BOOKMARK_RESET = 30973,
-	F_BOOKMARK_VIEW = 30974,
-	F_BOOKMARK_PATTERN = 30975,
-	F_DIFF_DIALOG = 30976,
-	F_DIFF = 30977,
-	F_DIFF_NEXT = 30978,
-	F_DIFF_PREV = 30979,
-	F_DIFF_RESET = 30980,
-	F_ISEARCH_NEXT = 30981,
-	F_ISEARCH_PREV = 30982,
-	F_ISEARCH_REGEXP_NEXT = 30983,
-	F_ISEARCH_REGEXP_PREV = 30984,
-	F_ISEARCH_MIGEMO_NEXT = 30985,
-	F_ISEARCH_MIGEMO_PREV = 30986,
-	F_FUNCLIST_NEXT = 30988,
-	F_FUNCLIST_PREV = 30989,
-	F_FILETREE = 30990,
-	F_CHGMOD_INS = 31001,
-	F_CHG_CHARSET = 31010,
-	F_CHGMOD_EOL_CRLF = 31081,
-	F_CHGMOD_EOL_LF = 31082,
-	F_CHGMOD_EOL_CR = 31083,
-	F_CANCEL_MODE = 31099,
-	F_SHOWTOOLBAR = 31100,
-	F_SHOWFUNCKEY = 31101,
-	F_SHOWSTATUSBAR = 31102,
-	F_SHOWTAB = 31103,
-	F_SHOWMINIMAP = 31104,
-	F_TYPE_LIST = 31110,
-	F_OPTION_TYPE = 31111,
-	F_OPTION = 31112,
-	F_FAVORITE = 31113,
-	F_FONT = 31120,
-	F_SETFONTSIZE = 31121,
-	F_SETFONTSIZEUP = 31122,
-	F_SETFONTSIZEDOWN = 31123,
-	F_WRAPWINDOWWIDTH = 31140,
-	F_TMPWRAPNOWRAP = 31141,
-	F_TMPWRAPSETTING = 31142,
-	F_TMPWRAPWINDOW = 31143,
-	F_SELECT_COUNT_MODE = 31144,
-	F_TYPE_SCREEN = 31115,
-	F_TYPE_COLOR = 31116,
-	F_TYPE_WINDOW = 31114,
-	F_TYPE_HELPER = 31117,
-	F_TYPE_REGEX_KEYWORD = 31118,
-	F_TYPE_KEYHELP = 31119,
-	F_OPTION_GENERAL = 32000,
-	F_OPTION_WINDOW = 32001,
-	F_OPTION_EDIT = 32002,
-	F_OPTION_FILE = 32003,
-	F_OPTION_BACKUP = 32004,
-	F_OPTION_FORMAT = 32005,
-	F_OPTION_GREP = 32007,
-	F_OPTION_KEYBIND = 32008,
-	F_OPTION_CUSTMENU = 32009,
-	F_OPTION_TOOLBAR = 32010,
-	F_OPTION_KEYWORD = 32011,
-	F_OPTION_HELPER = 32012,
-	F_OPTION_MACRO = 32013,
-	F_OPTION_FNAME = 32014,
-	F_OPTION_TAB = 32015,
-	F_OPTION_STATUSBAR = 32016,
-	F_OPTION_PLUGIN = 32017,
-	F_OPTION_MAINMENU = 32018,
-	F_RECKEYMACRO = 31250,
-	F_SAVEKEYMACRO = 31251,
-	F_LOADKEYMACRO = 31252,
-	F_EXECKEYMACRO = 31253,
-	F_EXECEXTMACRO = 31254,
-	F_EXECMD_DIALOG = 31270,
-	F_EXECMD = 31271,
-	F_SPLIT_V = 31310,
-	F_SPLIT_H = 31311,
-	F_SPLIT_VH = 31312,
-	F_WINCLOSE = 31320,
-	F_WIN_CLOSEALL = 31321,
-	F_CASCADE = 31330,
-	F_TILE_V = 31331,
-	F_TILE_H = 31332,
-	F_BIND_WINDOW = 31333,
-	F_TOPMOST = 31334,
-	F_NEXTWINDOW = 31340,
-	F_PREVWINDOW = 31341,
-	F_WINLIST = 31336,
-	F_DLGWINLIST = 31337,
-	F_MAXIMIZE_V = 31350,
-	F_MINIMIZE_ALL = 31351,
-	F_MAXIMIZE_H = 31352,
-	F_REDRAW = 31360,
-	F_WIN_OUTPUT = 31370,
-	F_GROUPCLOSE = 31380,
-	F_NEXTGROUP = 31381,
-	F_PREVGROUP = 31382,
-	F_TAB_MOVERIGHT = 31383,
-	F_TAB_MOVELEFT = 31384,
-	F_TAB_SEPARATE = 31385,
-	F_TAB_JOINTNEXT = 31386,
-	F_TAB_JOINTPREV = 31387,
-	F_TAB_CLOSEOTHER = 31388,
-	F_TAB_CLOSELEFT = 31389,
-	F_TAB_CLOSERIGHT = 31390,
-	F_HOKAN = 31430,
-	F_TOGGLE_KEY_SEARCH = 31431,
-	F_HELP_CONTENTS = 31440,
-	F_HELP_SEARCH = 31441,
-	F_MENU_ALLFUNC = 31445,
-	F_EXTHELP1 = 31450,
-	F_EXTHTMLHELP = 31451,
-	F_ABOUT = 31455,
-	F_USERMACRO_0 = 31600,
-	F_MENU_RBUTTON = 31580,
-	F_CUSTMENU_1 = 31501,
-	F_CUSTMENU_2 = 31502,
-	F_CUSTMENU_3 = 31503,
-	F_CUSTMENU_4 = 31504,
-	F_CUSTMENU_5 = 31505,
-	F_CUSTMENU_6 = 31506,
-	F_CUSTMENU_7 = 31507,
-	F_CUSTMENU_8 = 31508,
-	F_CUSTMENU_9 = 31509,
-	F_CUSTMENU_10 = 31510,
-	F_CUSTMENU_11 = 31511,
-	F_CUSTMENU_12 = 31512,
-	F_CUSTMENU_13 = 31513,
-	F_CUSTMENU_14 = 31514,
-	F_CUSTMENU_15 = 31515,
-	F_CUSTMENU_16 = 31516,
-	F_CUSTMENU_17 = 31517,
-	F_CUSTMENU_18 = 31518,
-	F_CUSTMENU_19 = 31519,
-	F_CUSTMENU_20 = 31520,
-	F_CUSTMENU_21 = 31521,
-	F_CUSTMENU_22 = 31522,
-	F_CUSTMENU_23 = 31523,
-	F_CUSTMENU_24 = 31524,
-	F_CUSTMENU_LAST = F_CUSTMENU_24,
-	F_CUSTMENU_BASE = 31500,
-	F_MENU_NOT_USED_FIRST = 32768,
-	F_CHGMOD_EOL = 32800,
-	F_SET_QUOTESTRING = 32801,
-	F_TRACEOUT = 32802,
-	F_PUTFILE = 32803,
-	F_INSFILE = 32804,
-	F_TEXTWRAPMETHOD = 32805,
-	F_INSBOXTEXT = 32806,
-	F_MOVECURSOR = 32807,
-	F_MOVECURSORLAYOUT = 32808,
-	F_STATUSMSG = 32809,
-	F_MSGBEEP = 32810,
-	F_CHANGETYPE = 32811,
-	F_FILEOPEN2 = 32812,
-	F_COMMITUNDOBUFFER = 32813,
-	F_ADDREFUNDOBUFFER = 32814,
-	F_SETUNDOBUFFER = 32815,
-	F_APPENDUNDOBUFFERCURSOR = 32816,
-	F_CLIPBOARDEMPTY = 32817,
-	F_SETVIEWTOP = 32818,
-	F_SETVIEWLEFT = 32819,
-	F_FUNCTION_FIRST = 40000,
-	F_GETFILENAME = 40001,
-	F_GETSAVEFILENAME = 40018,
-	F_GETSELECTED = 40002,
-	F_EXPANDPARAMETER = 40003,
-	F_GETLINESTR = 40004,
-	F_GETLINECOUNT = 40005,
-	F_CHGTABWIDTH = 40006,
-	F_ISTEXTSELECTED = 40007,
-	F_GETSELLINEFROM = 40008,
-	F_GETSELCOLUMNFROM = 40009,
-	F_GETSELLINETO = 40010,
-	F_GETSELCOLUMNTO = 40011,
-	F_ISINSMODE = 40012,
-	F_GETCHARCODE = 40013,
-	F_GETLINECODE = 40014,
-	F_ISPOSSIBLEUNDO = 40015,
-	F_ISPOSSIBLEREDO = 40016,
-	F_CHGWRAPCOLUMN = 40017,
-	F_ISCURTYPEEXT = 40019,
-	F_ISSAMETYPEEXT = 40020,
-	F_INPUTBOX = 40021,
-	F_MESSAGEBOX = 40023,
-	F_ERRORMSG = 40024,
-	F_WARNMSG = 40025,
-	F_INFOMSG = 40026,
-	F_OKCANCELBOX = 40027,
-	F_YESNOBOX = 40028,
-	F_COMPAREVERSION = 40029,
-	F_MACROSLEEP = 40030,
-	F_FILEOPENDIALOG = 40031,
-	F_FILESAVEDIALOG = 40032,
-	F_FOLDERDIALOG = 40033,
-	F_GETCLIPBOARD = 40034,
-	F_SETCLIPBOARD = 40035,
-	F_LAYOUTTOLOGICLINENUM = 40036,
-	F_LOGICTOLAYOUTLINENUM = 40037,
-	F_LINECOLUMNTOINDEX = 40038,
-	F_LINEINDEXTOCOLUMN = 40039,
-	F_GETCOOKIE = 40040,
-	F_GETCOOKIEDEFAULT = 40041,
-	F_SETCOOKIE = 40042,
-	F_DELETECOOKIE = 40043,
-	F_GETCOOKIENAMES = 40044,
-	F_SETDRAWSWITCH = 40045,
-	F_GETDRAWSWITCH = 40046,
-	F_ISSHOWNSTATUS = 40047,
-	F_GETSTRWIDTH = 40048,
-	F_GETSTRLAYOUTLENGTH = 40049,
-	F_GETDEFAULTCHARLENGTH = 40050,
-	F_ISINCLUDECLIPBOARDFORMAT = 40051,
-	F_GETCLIPBOARDBYFORMAT = 40052,
-	F_SETCLIPBOARDBYFORMAT = 40053,
-	F_GETLINEATTRIBUTE = 40054,
-	F_ISTEXTSELECTINGLOCK = 40055,
-	F_GETVIEWLINES = 40056,
-	F_GETVIEWCOLUMNS = 40057,
-	F_CREATEMENU = 40058,
-	F_ISEARCH_ADD_CHAR = 0xC001,
-	F_ISEARCH_ADD_STR = 0xC002,
-	F_ISEARCH_DEL_BACK = 0xC003,
-};
-
-#endif /* SAKURA_HEADERMAKE_2034D8F5_AE65_408D_9F53_D3DEA240C67BI_H_ */
-/*[EOF]*/
diff --git a/sakura_lang_en_US/.gitignore b/sakura_lang_en_US/.gitignore
new file mode 100644
index 0000000000..0f3a6b1b96
--- /dev/null
+++ b/sakura_lang_en_US/.gitignore
@@ -0,0 +1,2 @@
+Debug
+Release
diff --git a/sakura_lang_en_US/sakura_lang.sln b/sakura_lang_en_US/sakura_lang.sln
deleted file mode 100644
index 0f6c044416..0000000000
--- a/sakura_lang_en_US/sakura_lang.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura_lang", "sakura_lang.vcproj", "{7A6D0F29-E560-4985-835B-5F92A08EB242}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|Win32.Build.0 = Debug|Win32
-		{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|Win32.ActiveCfg = Release|Win32
-		{7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/sakura_lang_en_US/sakura_lang.vcproj b/sakura_lang_en_US/sakura_lang.vcproj
deleted file mode 100644
index db6409bc16..0000000000
--- a/sakura_lang_en_US/sakura_lang.vcproj
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="sakura_lang_en_US"
-	ProjectGUID="{7A6D0F29-E560-4985-835B-5F92A08EB242}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/sakura_lang.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/sakura_lang.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1041"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile=".\Debug/sakura_lang_en_US.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/sakura_lang.pdb"
-				ResourceOnlyDLL="true"
-				ImportLibrary=".\Debug/sakura_lang.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/sakura_lang.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/sakura_lang.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/sakura_lang.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1041"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile=".\Release/sakura_lang_en_US.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release/sakura_lang.pdb"
-				ResourceOnlyDLL="true"
-				ImportLibrary=".\Release/sakura_lang.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/sakura_lang.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="sakura_lang_rc.rc"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCResourceCompilerTool"
-					PreprocessorDefinitions=""
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\sakura_rc.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/sakura_lang_en_US/sakura_lang.vcxproj b/sakura_lang_en_US/sakura_lang.vcxproj
new file mode 100644
index 0000000000..4ad0f568b3
--- /dev/null
+++ b/sakura_lang_en_US/sakura_lang.vcxproj
@@ -0,0 +1,149 @@
+<?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>{7A6D0F29-E560-4985-835B-5F92A08EB242}</ProjectGuid>
+    <ProjectName>sakura_lang_en_US</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v141</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>15.0.27130.2020</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\Debug\</OutDir>
+    <IntDir>.\Debug\</IntDir>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>.\Release\</OutDir>
+    <IntDir>.\Release\</IntDir>
+    <IgnoreImportLibrary>true</IgnoreImportLibrary>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/sakura_lang.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/sakura_lang.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\Debug/sakura_lang_en_US.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/sakura_lang.pdb</ProgramDatabaseFile>
+      <NoEntryPoint>true</NoEntryPoint>
+      <ImportLibrary>.\Debug/sakura_lang.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/sakura_lang.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/sakura_lang.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/sakura_lang.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0411</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\Release/sakura_lang_en_US.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/sakura_lang.pdb</ProgramDatabaseFile>
+      <NoEntryPoint>true</NoEntryPoint>
+      <ImportLibrary>.\Release/sakura_lang.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/sakura_lang.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="sakura_lang_rc.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="sakura_rc.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/sakura_lang_en_US/sakura_lang_vc2003.sln b/sakura_lang_en_US/sakura_lang_vc2003.sln
deleted file mode 100644
index 20ece388a7..0000000000
--- a/sakura_lang_en_US/sakura_lang_vc2003.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura_lang", "sakura_lang_vc2003.vcproj", "{965AEB2A-6CEE-44B5-8F4C-DB5CF61B2733}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{965AEB2A-6CEE-44B5-8F4C-DB5CF61B2733}.Debug.ActiveCfg = Debug|Win32
-		{965AEB2A-6CEE-44B5-8F4C-DB5CF61B2733}.Debug.Build.0 = Debug|Win32
-		{965AEB2A-6CEE-44B5-8F4C-DB5CF61B2733}.Release.ActiveCfg = Release|Win32
-		{965AEB2A-6CEE-44B5-8F4C-DB5CF61B2733}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/sakura_lang_en_US/sakura_lang_vc2003.vcproj b/sakura_lang_en_US/sakura_lang_vc2003.vcproj
deleted file mode 100644
index e06ff726bb..0000000000
--- a/sakura_lang_en_US/sakura_lang_vc2003.vcproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="sakura_lang"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/sakura_lang.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
-				OutputFile=".\Debug/sakura_lang_en_US.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/sakura_lang.pdb"
-				ResourceOnlyDLL="TRUE"
-				ImportLibrary=".\Debug/sakura_lang.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/sakura_lang.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1041"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/sakura_lang.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="TRUE"
-				OutputFile=".\Release/sakura_lang_en_US.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/sakura_lang.pdb"
-				ResourceOnlyDLL="TRUE"
-				ImportLibrary=".\Release/sakura_lang.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/sakura_lang.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1041"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="sakura_lang_rc.rc">
-		</File>
-		<File
-			RelativePath=".\sakura_rc.h">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>