Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Compiler.h
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Compiler.h	(revision 811)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Compiler.h	(revision 812)
@@ -1,2 +1,8 @@
+#include "Messenger.h"
+#include "CodeGenerator.h"
+#include "Linker.h"
+#include "Enum.h"
+#include "ErrorCode.h"
+
 #pragma once
 
Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h	(revision 811)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h	(revision 812)
@@ -1,3 +1,8 @@
+#include <string>
+
 #pragma once
+
+class EnumInfo;
+class EnumInfoCollection;
 
 namespace ActiveBasic{ namespace Compiler{
Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Messenger.h
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Messenger.h	(revision 811)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/include/Messenger.h	(revision 812)
@@ -1,2 +1,3 @@
+#pragma once
 
 class Messenger
Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_TypeDef.cpp
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_TypeDef.cpp	(revision 811)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_TypeDef.cpp	(revision 812)
@@ -1,3 +1,7 @@
 #include "stdafx.h"
+#include <abdev/ab_common/include/ab_common.h>
+#include "LexicalAnalyzer.h"
+#include "Compiler.h"
+#include "StrOperation.h"
 
 using namespace ActiveBasic::Compiler;
Index: /branches/egtra/ab5.0/abdev/compiler-impl/compiler-impl.vcxproj
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler-impl/compiler-impl.vcxproj	(revision 811)
+++ /branches/egtra/ab5.0/abdev/compiler-impl/compiler-impl.vcxproj	(revision 812)
@@ -74,4 +74,6 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)BasicCompiler_Common;$(SolutionDir)BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -82,4 +84,6 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)BasicCompiler_Common;$(SolutionDir)BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -92,4 +96,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(SolutionDir)BasicCompiler_Common;$(SolutionDir)BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -104,4 +110,6 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(SolutionDir)BasicCompiler_Common;$(SolutionDir)BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -115,4 +123,5 @@
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\BasicCompiler_Common\src\LexicalAnalyzer_TypeDef.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
Index: /branches/egtra/ab5.0/abdev/compiler-impl/compiler-impl.vcxproj.filters
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler-impl/compiler-impl.vcxproj.filters	(revision 811)
+++ /branches/egtra/ab5.0/abdev/compiler-impl/compiler-impl.vcxproj.filters	(revision 812)
@@ -2,25 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="ソース ファイル">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="ヘッダー ファイル">
+    <Filter Include="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="リソース ファイル">
+    <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>
+    <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>
     <ClInclude Include="stdafx.h">
-      <Filter>ヘッダー ファイル</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
-      <Filter>ソース ファイル</Filter>
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\BasicCompiler_Common\src\LexicalAnalyzer_TypeDef.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
Index: /branches/egtra/ab5.0/abdev/compiler-impl/stdafx.h
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler-impl/stdafx.h	(revision 811)
+++ /branches/egtra/ab5.0/abdev/compiler-impl/stdafx.h	(revision 812)
@@ -2,3 +2,18 @@
 
 #include <windows.h>
+#include <shlobj.h>
+
 #include <tchar.h>
+
+#include <string>
+#include <vector>
+
+#include <boost/range.hpp>
+#include <boost/range/algorithm.hpp>
+#include <boost/serialization/serialization.hpp>
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/export.hpp>
+
+#include <jenga/include/jenga.h>
+
+#include "libs.h"
Index: /branches/egtra/ab5.0/abdev/compiler.vcxproj
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler.vcxproj	(revision 811)
+++ /branches/egtra/ab5.0/abdev/compiler.vcxproj	(revision 812)
@@ -27,4 +27,5 @@
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -36,5 +37,5 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>Windows7.1SDK</PlatformToolset>
   </PropertyGroup>
@@ -141,5 +142,4 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
@@ -175,5 +175,5 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\;BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>BasicCompiler_Common\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;JPN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -564,5 +564,4 @@
     <ClCompile Include="BasicCompiler_Common\src\LexicalAnalyzer_Enum.cpp" />
     <ClCompile Include="BasicCompiler_Common\src\LexicalAnalyzer_Procedure.cpp" />
-    <ClCompile Include="BasicCompiler_Common\src\LexicalAnalyzer_TypeDef.cpp" />
     <ClCompile Include="BasicCompiler_Common\src\Linker.cpp" />
     <ClCompile Include="BasicCompiler_Common\src\Messenger.cpp" />
Index: /branches/egtra/ab5.0/abdev/compiler.vcxproj.filters
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler.vcxproj.filters	(revision 811)
+++ /branches/egtra/ab5.0/abdev/compiler.vcxproj.filters	(revision 812)
@@ -287,7 +287,4 @@
     </ClCompile>
     <ClCompile Include="BasicCompiler_Common\src\LexicalAnalyzer_Procedure.cpp">
-      <Filter>Source Files\Compiler Classes</Filter>
-    </ClCompile>
-    <ClCompile Include="BasicCompiler_Common\src\LexicalAnalyzer_TypeDef.cpp">
       <Filter>Source Files\Compiler Classes</Filter>
     </ClCompile>
Index: /branches/egtra/ab5.0/jenga/include/common/SourceTemplate.h
===================================================================
--- /branches/egtra/ab5.0/jenga/include/common/SourceTemplate.h	(revision 811)
+++ /branches/egtra/ab5.0/jenga/include/common/SourceTemplate.h	(revision 812)
@@ -1,2 +1,5 @@
+#include <map>
+#include <string>
+
 #pragma once