Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp	(revision 805)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp	(revision 806)
@@ -731,5 +731,5 @@
 	if( program.IsClipCompileView() ){
 		//ProjectEditor埋め込み型インターフェイス
-		hMainDlg=CreateDialog(hInst,MAKEINTRESOURCE(IDD_CLIPMAIN),hOwnerEditor,(DLGPROC)DlgCompile);
+		hMainDlg=CreateDialog(hInst, MAKEINTRESOURCE(IDD_CLIPMAIN), hOwnerEditor, DlgCompile);
 		ShowWindow(hMainDlg,SW_SHOW);
 		SendMessage(hOwnerEditor,WM_SETCOMPILEVIEW,0,(LPARAM)hMainDlg);
@@ -773,10 +773,8 @@
 
 	//エラーリストをサブクラス化
-	OldErrorListProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hMainDlg,IDC_ERRORLIST),GWLP_WNDPROC);
-	SetWindowLongPtr(GetDlgItem(hMainDlg,IDC_ERRORLIST),GWLP_WNDPROC,(LONG_PTR)ErrorListProc);
+	OldErrorListProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(GetDlgItem(hMainDlg, IDC_ERRORLIST), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(ErrorListProc)));
 
 	//デバッグリストをサブクラス化
-	OldDebugListProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hMainDlg,IDC_DEBUGLIST),GWLP_WNDPROC);
-	SetWindowLongPtr(GetDlgItem(hMainDlg,IDC_DEBUGLIST),GWLP_WNDPROC,(LONG_PTR)DebugListProc);
+	OldDebugListProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(GetDlgItem(hMainDlg, IDC_DEBUGLIST), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(DebugListProc)));
 
 	if( program.IsKickedFromEditor() )
Index: anches/egtra/ab5.0/abdev/BasicCompiler_Common/Psapi.h
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/Psapi.h	(revision 805)
+++ 	(revision )
@@ -1,364 +1,0 @@
-/*++ BUILD Version: 0001    // Increment this if a change has global effects
-
-Copyright (c) 1994-1999  Microsoft Corporation
-
-Module Name:
-
-    psapi.h
-
-Abstract:
-
-    Include file for APIs provided by PSAPI.DLL
-
-Author:
-
-    Richard Shupak   [richards]  06-Jan-1994
-
-Revision History:
-
---*/
-
-#ifndef _PSAPI_H_
-#define _PSAPI_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-BOOL
-WINAPI
-EnumProcesses(
-    DWORD * lpidProcess,
-    DWORD   cb,
-    DWORD * cbNeeded
-    );
-
-BOOL
-WINAPI
-EnumProcessModules(
-    HANDLE hProcess,
-    HMODULE *lphModule,
-    DWORD cb,
-    LPDWORD lpcbNeeded
-    );
-
-DWORD
-WINAPI
-GetModuleBaseNameA(
-    HANDLE hProcess,
-    HMODULE hModule,
-    LPSTR lpBaseName,
-    DWORD nSize
-    );
-
-DWORD
-WINAPI
-GetModuleBaseNameW(
-    HANDLE hProcess,
-    HMODULE hModule,
-    LPWSTR lpBaseName,
-    DWORD nSize
-    );
-
-#ifdef UNICODE
-#define GetModuleBaseName  GetModuleBaseNameW
-#else
-#define GetModuleBaseName  GetModuleBaseNameA
-#endif // !UNICODE
-
-
-DWORD
-WINAPI
-GetModuleFileNameExA(
-    HANDLE hProcess,
-    HMODULE hModule,
-    LPSTR lpFilename,
-    DWORD nSize
-    );
-
-DWORD
-WINAPI
-GetModuleFileNameExW(
-    HANDLE hProcess,
-    HMODULE hModule,
-    LPWSTR lpFilename,
-    DWORD nSize
-    );
-
-#ifdef UNICODE
-#define GetModuleFileNameEx  GetModuleFileNameExW
-#else
-#define GetModuleFileNameEx  GetModuleFileNameExA
-#endif // !UNICODE
-
-
-typedef struct _MODULEINFO {
-    LPVOID lpBaseOfDll;
-    DWORD SizeOfImage;
-    LPVOID EntryPoint;
-} MODULEINFO, *LPMODULEINFO;
-
-
-BOOL
-WINAPI
-GetModuleInformation(
-    HANDLE hProcess,
-    HMODULE hModule,
-    LPMODULEINFO lpmodinfo,
-    DWORD cb
-    );
-
-
-BOOL
-WINAPI
-EmptyWorkingSet(
-    HANDLE hProcess
-    );
-
-
-BOOL
-WINAPI
-QueryWorkingSet(
-    HANDLE hProcess,
-    PVOID pv,
-    DWORD cb
-    );
-
-BOOL
-WINAPI
-QueryWorkingSetEx(
-    HANDLE hProcess,
-    PVOID pv,
-    DWORD cb
-    );
-
-BOOL
-WINAPI
-InitializeProcessForWsWatch(
-    HANDLE hProcess
-    );
-
-
-typedef struct _PSAPI_WS_WATCH_INFORMATION {
-    LPVOID FaultingPc;
-    LPVOID FaultingVa;
-} PSAPI_WS_WATCH_INFORMATION, *PPSAPI_WS_WATCH_INFORMATION;
-
-BOOL
-WINAPI
-GetWsChanges(
-    HANDLE hProcess,
-    PPSAPI_WS_WATCH_INFORMATION lpWatchInfo,
-    DWORD cb
-    );
-
-DWORD
-WINAPI
-GetMappedFileNameW(
-    HANDLE hProcess,
-    LPVOID lpv,
-    LPWSTR lpFilename,
-    DWORD nSize
-    );
-
-DWORD
-WINAPI
-GetMappedFileNameA(
-    HANDLE hProcess,
-    LPVOID lpv,
-    LPSTR lpFilename,
-    DWORD nSize
-    );
-
-#ifdef UNICODE
-#define GetMappedFileName  GetMappedFileNameW
-#else
-#define GetMappedFileName  GetMappedFileNameA
-#endif // !UNICODE
-
-BOOL
-WINAPI
-EnumDeviceDrivers(
-    LPVOID *lpImageBase,
-    DWORD cb,
-    LPDWORD lpcbNeeded
-    );
-
-
-DWORD
-WINAPI
-GetDeviceDriverBaseNameA(
-    LPVOID ImageBase,
-    LPSTR lpBaseName,
-    DWORD nSize
-    );
-
-DWORD
-WINAPI
-GetDeviceDriverBaseNameW(
-    LPVOID ImageBase,
-    LPWSTR lpBaseName,
-    DWORD nSize
-    );
-
-#ifdef UNICODE
-#define GetDeviceDriverBaseName  GetDeviceDriverBaseNameW
-#else
-#define GetDeviceDriverBaseName  GetDeviceDriverBaseNameA
-#endif // !UNICODE
-
-
-DWORD
-WINAPI
-GetDeviceDriverFileNameA(
-    LPVOID ImageBase,
-    LPSTR lpFilename,
-    DWORD nSize
-    );
-
-DWORD
-WINAPI
-GetDeviceDriverFileNameW(
-    LPVOID ImageBase,
-    LPWSTR lpFilename,
-    DWORD nSize
-    );
-
-#ifdef UNICODE
-#define GetDeviceDriverFileName  GetDeviceDriverFileNameW
-#else
-#define GetDeviceDriverFileName  GetDeviceDriverFileNameA
-#endif // !UNICODE
-
-// Structure for GetProcessMemoryInfo()
-
-typedef struct _PROCESS_MEMORY_COUNTERS {
-    DWORD cb;
-    DWORD PageFaultCount;
-    SIZE_T PeakWorkingSetSize;
-    SIZE_T WorkingSetSize;
-    SIZE_T QuotaPeakPagedPoolUsage;
-    SIZE_T QuotaPagedPoolUsage;
-    SIZE_T QuotaPeakNonPagedPoolUsage;
-    SIZE_T QuotaNonPagedPoolUsage;
-    SIZE_T PagefileUsage;
-    SIZE_T PeakPagefileUsage;
-} PROCESS_MEMORY_COUNTERS;
-typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS;
-
-#if (_WIN32_WINNT >= 0x0501)
-
-typedef struct _PROCESS_MEMORY_COUNTERS_EX {
-    DWORD cb;
-    DWORD PageFaultCount;
-    SIZE_T PeakWorkingSetSize;
-    SIZE_T WorkingSetSize;
-    SIZE_T QuotaPeakPagedPoolUsage;
-    SIZE_T QuotaPagedPoolUsage;
-    SIZE_T QuotaPeakNonPagedPoolUsage;
-    SIZE_T QuotaNonPagedPoolUsage;
-    SIZE_T PagefileUsage;
-    SIZE_T PeakPagefileUsage;
-    SIZE_T PrivateUsage;
-} PROCESS_MEMORY_COUNTERS_EX;
-typedef PROCESS_MEMORY_COUNTERS_EX *PPROCESS_MEMORY_COUNTERS_EX;
-
-#endif
-
-BOOL
-WINAPI
-GetProcessMemoryInfo(
-    HANDLE Process,
-    PPROCESS_MEMORY_COUNTERS ppsmemCounters,
-    DWORD cb
-    );
-
-typedef struct _PERFORMANCE_INFORMATION {
-    DWORD cb;
-    SIZE_T CommitTotal;
-    SIZE_T CommitLimit;
-    SIZE_T CommitPeak;
-    SIZE_T PhysicalTotal;
-    SIZE_T PhysicalAvailable;
-    SIZE_T SystemCache;
-    SIZE_T KernelTotal;
-    SIZE_T KernelPaged;
-    SIZE_T KernelNonpaged;
-    SIZE_T PageSize;
-    DWORD HandleCount;
-    DWORD ProcessCount;
-    DWORD ThreadCount;
-} PERFORMANCE_INFORMATION, *PPERFORMANCE_INFORMATION, PERFORMACE_INFORMATION, *PPERFORMACE_INFORMATION;
-
-BOOL
-WINAPI
-GetPerformanceInfo (
-    PPERFORMACE_INFORMATION pPerformanceInformation,
-    DWORD cb
-    );
-
-typedef struct _ENUM_PAGE_FILE_INFORMATION {
-    DWORD cb;
-    DWORD Reserved;
-    SIZE_T TotalSize;
-    SIZE_T TotalInUse;
-    SIZE_T PeakUsage;
-} ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION;
-
-typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW) (LPVOID pContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCWSTR lpFilename);
-
-typedef BOOL (*PENUM_PAGE_FILE_CALLBACKA) (LPVOID pContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCSTR lpFilename);
-
-BOOL
-WINAPI
-EnumPageFilesW (
-    PENUM_PAGE_FILE_CALLBACKW pCallBackRoutine,
-    LPVOID pContext
-    );
-
-BOOL
-WINAPI
-EnumPageFilesA (
-    PENUM_PAGE_FILE_CALLBACKA pCallBackRoutine,
-    LPVOID pContext
-    );
-
-#ifdef UNICODE
-#define PENUM_PAGE_FILE_CALLBACK PENUM_PAGE_FILE_CALLBACKW
-#define EnumPageFiles EnumPageFilesW
-#else
-#define PENUM_PAGE_FILE_CALLBACK PENUM_PAGE_FILE_CALLBACKA
-#define EnumPageFiles EnumPageFilesA
-#endif // !UNICODE
-
-DWORD
-WINAPI
-GetProcessImageFileNameA(
-    HANDLE hProcess,
-    LPSTR lpImageFileName,
-    DWORD nSize
-    );
-
-DWORD
-WINAPI
-GetProcessImageFileNameW(
-    HANDLE hProcess,
-    LPWSTR lpImageFileName,
-    DWORD nSize
-    );
-
-#ifdef UNICODE
-#define GetProcessImageFileName  GetProcessImageFileNameW
-#else
-#define GetProcessImageFileName  GetProcessImageFileNameA
-#endif // !UNICODE
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/common.h
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/common.h	(revision 805)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/common.h	(revision 806)
@@ -1,6 +1,6 @@
 #pragma once
 
-//#define _CRT_SECURE_NO_DEPRECATE
-#pragma warning(disable : 4996)
+
+#include <psapi.h>
 
 #include <option.h>
@@ -17,5 +17,4 @@
 
 #include "../BasicCompiler_Common/NonVolatile.h"
-#include "../BasicCompiler_Common/psapi.h"
 
 
@@ -42,9 +41,5 @@
 	#define PLATFORM	64
 #else
-#define PLATFORM	32
-	#ifndef LONG_PTR
-		typedef long LONG_PTR;
-		typedef DWORD ULONG_PTR;
-	#endif
+	#define PLATFORM	32
 #endif
 
@@ -221,5 +216,4 @@
 
 //hash.cpp
-int hash_default(const char *name);
 DllProc *GetDeclareHash(const char *name);
 void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs );
Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/hash.cpp
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/hash.cpp	(revision 805)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/hash.cpp	(revision 806)
@@ -12,14 +12,4 @@
 
 using namespace ActiveBasic::Compiler;
-
-int hash_default(const char *name){
-	int key;
-
-	for(key=0;*name!='\0';name++){
-		key=((key<<8)+ *name )%MAX_HASH;
-	}
-
-	return key;
-}
 
 DllProc *GetDeclareHash(const char *fullName){
Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp	(revision 805)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp	(revision 806)
@@ -1,4 +1,2 @@
-#pragma warning(disable : 4996)
-
 #include <map>
 #include <string>
Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.cpp
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.cpp	(revision 806)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.cpp	(revision 806)
@@ -0,0 +1,1 @@
+#include "stdafx.h"
Index: /branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.h
===================================================================
--- /branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.h	(revision 806)
+++ /branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.h	(revision 806)
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+#include <fstream>
+#include <iostream>
+#include <iomanip>
+#include <ios>
+#include <streambuf>
+#include <sstream>
+#include <algorithm>
+
+#include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <commctrl.h>
+#include <time.h>
+#include <limits.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+#include <tchar.h>
+#include <stdarg.h>
+#include <assert.h>
+
+//boost libraries
+#include <boost/foreach.hpp>
+#include <boost/serialization/serialization.hpp>
+#include <boost/serialization/nvp.hpp>
+#include <boost/serialization/export.hpp>
+
+#include <jenga/include/jenga.h>
+
+#include <option.h>
+
+#include <abdev/ab_common/include/ab_common.h>
+
+using namespace ActiveBasic::Common::Lexical;
+
+#include "../BasicCompiler_Common/common.h"
+
+#include <Exception.h>
+#include <Enum.h>
+#include <logger.h>
+#include <Configuration.h>
+#include <CodeGenerator.h>
+#include <Messenger.h>
+#include <ErrorCode.h>
+#include <Linker.h>
+#include <Compiler.h>
+#include <Debugger.h>
+#include <Program.h>
+#include <LexicalAnalyzer.h>
+#include <VtblGenerator.h>
+#include <ProcedureGenerator.h>
+#include <DataTableGenerator.h>
+#include <BreakPoint.h>
Index: /branches/egtra/ab5.0/abdev/ab-common-64.props
===================================================================
--- /branches/egtra/ab5.0/abdev/ab-common-64.props	(revision 805)
+++ /branches/egtra/ab5.0/abdev/ab-common-64.props	(revision 806)
@@ -6,5 +6,5 @@
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;;_WIN32_IE=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0501;_WIN32_WINNT=0x0501;_WIN32_IE=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
Index: /branches/egtra/ab5.0/abdev/ab-common.props
===================================================================
--- /branches/egtra/ab5.0/abdev/ab-common.props	(revision 805)
+++ /branches/egtra/ab5.0/abdev/ab-common.props	(revision 806)
@@ -20,5 +20,5 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ExceptionHandling>Async</ExceptionHandling>
-      <PreprocessorDefinitions>WIN32;_SECURE_ATL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
Index: /branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj
===================================================================
--- /branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj	(revision 805)
+++ /branches/egtra/ab5.0/abdev/ab_common/ab_common.vcxproj	(revision 806)
@@ -148,4 +148,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</EnablePREfast>
+      <EnablePREfast Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EnablePREfast>
     </ClCompile>
     <ClCompile Include="src\OSVersion.cpp" />
Index: /branches/egtra/ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp
===================================================================
--- /branches/egtra/ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp	(revision 805)
+++ /branches/egtra/ab5.0/abdev/ab_common/src/Lexical/ObjectModule.cpp	(revision 806)
@@ -1,3 +1,3 @@
-#pragma warning(disable : 4996)
+//#pragma warning(disable : 4996)
 
 #include <map>
Index: /branches/egtra/ab5.0/abdev/abdev/stdafx.h
===================================================================
--- /branches/egtra/ab5.0/abdev/abdev/stdafx.h	(revision 805)
+++ /branches/egtra/ab5.0/abdev/abdev/stdafx.h	(revision 806)
@@ -1,4 +1,3 @@
 #pragma once
-#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
 
 #include <map>
@@ -26,4 +25,6 @@
 #include <atlcom.h>
 #include <atlhost.h>
+#undef _SECURE_ATL
+#define _SECURE_ATL 1
 #pragma warning(push)
 #pragma warning(disable: 6011 6246 6255 6269 6387)
Index: /branches/egtra/ab5.0/abdev/compiler.vcxproj
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler.vcxproj	(revision 805)
+++ /branches/egtra/ab5.0/abdev/compiler.vcxproj	(revision 806)
@@ -321,4 +321,10 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="BasicCompiler_Common\stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="BasicCompiler_Common\StrOperation.cpp">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -417,12 +423,4 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="compiler_x86\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="compiler_x86\Compile_Calc.cpp">
@@ -627,18 +625,4 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="compiler_x64\stdafx.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
     <ClCompile Include="compiler_x64\Compile_Calc.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -851,4 +835,5 @@
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="BasicCompiler_Common\stdafx.h" />
     <ClInclude Include="BasicCompiler_Common\StrOperation.h" />
     <ClInclude Include="BasicCompiler_Common\debug.h" />
@@ -884,10 +869,8 @@
     <ClInclude Include="compiler_x86\MachineFixed.h" />
     <ClInclude Include="compiler_x86\Opcode.h" />
-    <ClInclude Include="compiler_x86\stdafx.h" />
     <ClInclude Include="compiler_x64\CommandValue.h" />
     <ClInclude Include="compiler_x64\FunctionValue.h" />
     <ClInclude Include="compiler_x64\MachineFixed.h" />
     <ClInclude Include="compiler_x64\Opcode.h" />
-    <ClInclude Include="compiler_x64\stdafx.h" />
   </ItemGroup>
   <ItemGroup>
Index: /branches/egtra/ab5.0/abdev/compiler.vcxproj.filters
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler.vcxproj.filters	(revision 805)
+++ /branches/egtra/ab5.0/abdev/compiler.vcxproj.filters	(revision 806)
@@ -205,7 +205,4 @@
       <Filter>Source Files\x86Compiler</Filter>
     </ClCompile>
-    <ClCompile Include="compiler_x86\stdafx.cpp">
-      <Filter>Source Files\x86Compiler</Filter>
-    </ClCompile>
     <ClCompile Include="compiler_x86\Compile_Calc.cpp">
       <Filter>Source Files\x86Compiler\Calculation</Filter>
@@ -331,7 +328,4 @@
       <Filter>Source Files\x64Compiler</Filter>
     </ClCompile>
-    <ClCompile Include="compiler_x64\stdafx.cpp">
-      <Filter>Source Files\x64Compiler</Filter>
-    </ClCompile>
     <ClCompile Include="compiler_x64\Compile_Calc.cpp">
       <Filter>Source Files\x64Compiler\Calculation</Filter>
@@ -392,4 +386,7 @@
     </ClCompile>
     <ClCompile Include="OldWindowsHelperImpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="BasicCompiler_Common\stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -495,7 +492,4 @@
       <Filter>Header Files\x86</Filter>
     </ClInclude>
-    <ClInclude Include="compiler_x86\stdafx.h">
-      <Filter>Header Files\x86</Filter>
-    </ClInclude>
     <ClInclude Include="compiler_x64\CommandValue.h">
       <Filter>Header Files\x64</Filter>
@@ -510,6 +504,6 @@
       <Filter>Header Files\x64</Filter>
     </ClInclude>
-    <ClInclude Include="compiler_x64\stdafx.h">
-      <Filter>Header Files\x64</Filter>
+    <ClInclude Include="BasicCompiler_Common\stdafx.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
Index: anches/egtra/ab5.0/abdev/compiler_x64/stdafx.cpp
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler_x64/stdafx.cpp	(revision 805)
+++ 	(revision )
@@ -1,1 +1,0 @@
-#include "stdafx.h"
Index: anches/egtra/ab5.0/abdev/compiler_x64/stdafx.h
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler_x64/stdafx.h	(revision 805)
+++ 	(revision )
@@ -1,59 +1,0 @@
-#pragma once
-
-#include <map>
-#include <string>
-#include <vector>
-#include <fstream>
-#include <iostream>
-#include <iomanip>
-#include <ios>
-#include <streambuf>
-#include <sstream>
-#include <algorithm>
-
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <commctrl.h>
-#include <time.h>
-#include <limits.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <tchar.h>
-#include <stdarg.h>
-#include <assert.h>
-
-//boost libraries
-#include <boost/foreach.hpp>
-#include <boost/serialization/serialization.hpp>
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/export.hpp>
-
-#include <jenga/include/jenga.h>
-
-#include <option.h>
-
-#include <abdev/ab_common/include/ab_common.h>
-
-using namespace ActiveBasic::Common::Lexical;
-
-#include "../BasicCompiler_Common/common.h"
-
-#include <Exception.h>
-#include <Enum.h>
-#include <logger.h>
-#include <Configuration.h>
-#include <CodeGenerator.h>
-#include <Messenger.h>
-#include <ErrorCode.h>
-#include <Linker.h>
-#include <Compiler.h>
-#include <Debugger.h>
-#include <Program.h>
-#include <LexicalAnalyzer.h>
-#include <VtblGenerator.h>
-#include <ProcedureGenerator.h>
-#include <DataTableGenerator.h>
-#include <BreakPoint.h>
Index: anches/egtra/ab5.0/abdev/compiler_x86/stdafx.cpp
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler_x86/stdafx.cpp	(revision 805)
+++ 	(revision )
@@ -1,1 +1,0 @@
-#include "stdafx.h"
Index: anches/egtra/ab5.0/abdev/compiler_x86/stdafx.h
===================================================================
--- /branches/egtra/ab5.0/abdev/compiler_x86/stdafx.h	(revision 805)
+++ 	(revision )
@@ -1,59 +1,0 @@
-#pragma once
-
-#include <map>
-#include <string>
-#include <vector>
-#include <fstream>
-#include <iostream>
-#include <iomanip>
-#include <ios>
-#include <streambuf>
-#include <sstream>
-#include <algorithm>
-
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <commctrl.h>
-#include <time.h>
-#include <limits.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <tchar.h>
-#include <stdarg.h>
-#include <assert.h>
-
-//boost libraries
-#include <boost/foreach.hpp>
-#include <boost/serialization/serialization.hpp>
-#include <boost/serialization/nvp.hpp>
-#include <boost/serialization/export.hpp>
-
-#include <jenga/include/jenga.h>
-
-#include <option.h>
-
-#include <abdev/ab_common/include/ab_common.h>
-
-using namespace ActiveBasic::Common::Lexical;
-
-#include "../BasicCompiler_Common/common.h"
-
-#include <Exception.h>
-#include <Enum.h>
-#include <logger.h>
-#include <Configuration.h>
-#include <CodeGenerator.h>
-#include <Messenger.h>
-#include <ErrorCode.h>
-#include <Linker.h>
-#include <Compiler.h>
-#include <Debugger.h>
-#include <Program.h>
-#include <LexicalAnalyzer.h>
-#include <VtblGenerator.h>
-#include <ProcedureGenerator.h>
-#include <DataTableGenerator.h>
-#include <BreakPoint.h>
Index: /branches/egtra/ab5.0/jenga/include/common/Environment.h
===================================================================
--- /branches/egtra/ab5.0/jenga/include/common/Environment.h	(revision 805)
+++ /branches/egtra/ab5.0/jenga/include/common/Environment.h	(revision 806)
@@ -4,5 +4,4 @@
 namespace Common{
 
-#pragma warning(disable : 4996)
 
 class Environment
Index: /branches/egtra/ab5.0/jenga/include/common/File.h
===================================================================
--- /branches/egtra/ab5.0/jenga/include/common/File.h	(revision 805)
+++ /branches/egtra/ab5.0/jenga/include/common/File.h	(revision 806)
@@ -1,4 +1,3 @@
 #pragma once
-#pragma warning(disable : 4996)
 
 
Index: /branches/egtra/ab5.0/jenga/projects/jenga/jenga.vcxproj
===================================================================
--- /branches/egtra/ab5.0/jenga/projects/jenga/jenga.vcxproj	(revision 805)
+++ /branches/egtra/ab5.0/jenga/projects/jenga/jenga.vcxproj	(revision 806)
@@ -53,13 +53,21 @@
   <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="..\..\..\abdev\ab-common.props" />
+    <Import Project="..\..\..\abdev\ab-common-32.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="..\..\..\abdev\ab-common.props" />
+    <Import Project="..\..\..\abdev\ab-common-32.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\abdev\ab-common.props" />
+    <Import Project="..\..\..\abdev\ab-common-64.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\abdev\ab-common.props" />
+    <Import Project="..\..\..\abdev\ab-common-64.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -81,11 +89,8 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Lib />
@@ -98,11 +103,8 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Lib />
@@ -111,9 +113,6 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Lib />
@@ -125,9 +124,6 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>..\..\..\;..\..\..\cpplibs\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Lib />