Index: /trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp
===================================================================
--- /trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp	(revision 634)
+++ /trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp	(revision 635)
@@ -23,25 +23,9 @@
 //////////////////////////////////////
 class CRequireFiles{
-	char **ppFilePath;
-	int count;
+	Jenga::Common::Strings filepaths;
 public:
-	CRequireFiles(){
-		ppFilePath = (char **)malloc( 1 );
-		count = 0;
-	}
-	~CRequireFiles(){
-		for( int i = 0; i < count; i++ ){
-			free( ppFilePath[i] );
-		}
-		free( ppFilePath );
-	}
+
 	void clear(){
-		for( int i = 0; i < count; i++ ){
-			free( ppFilePath[i] );
-		}
-		free( ppFilePath );
-
-		ppFilePath = (char **)malloc( 1 );
-		count = 0;
+		filepaths.clear();
 	}
 	bool IsIncluded( const char *includeFilePath ){
@@ -55,6 +39,8 @@
 		}
 
-		for( int i=0; i<count; i++ ){
-			if( lstrcmpi( ppFilePath[i], tempPath ) == 0 ){
+		BOOST_FOREACH( const std::string &filepath, filepaths )
+		{
+			if( lstrcmpi( filepath.c_str(), tempPath ) == 0 )
+			{
 				return true;
 			}
@@ -76,8 +62,5 @@
 
 		//追加
-		ppFilePath = (char **)realloc(ppFilePath, ( count + 1 ) * sizeof(char *) );
-		ppFilePath[count] = (char *)malloc( lstrlen(tempPath) + 1 );
-		lstrcpy( ppFilePath[count], tempPath );
-		count++;
+		filepaths.push_back( tempPath );
 	}
 };
@@ -116,7 +99,6 @@
 	add(temporary);
 }
-BOOL CDefine::add(char *name){
-	extern HANDLE hHeap;
-
+BOOL CDefine::add(char *name)
+{
 	//重複チェック
 	if(check(name)) return 0;
@@ -535,6 +517,6 @@
 }
 
-void BasicSource::DirectiveIncludeOrRequire( const std::string &mainSourceFilePath, const std::string &includeDirPath ){
-	extern HANDLE hHeap;
+void BasicSource::DirectiveIncludeOrRequire( const std::string &mainSourceFilePath, const std::string &includeDirPath )
+{
 	int i,i2,i3,sw1,LineNum,FileLayer[255],layer,LastFileByte[255];
 	char temporary[MAX_PATH],temp2[MAX_PATH+255],*LayerDir[255];
Index: /trunk/ab5.0/abdev/ab_common/src/ResourceManager/ResourceManager.cpp
===================================================================
--- /trunk/ab5.0/abdev/ab_common/src/ResourceManager/ResourceManager.cpp	(revision 634)
+++ /trunk/ab5.0/abdev/ab_common/src/ResourceManager/ResourceManager.cpp	(revision 635)
@@ -28,5 +28,4 @@
 	}
 	i2=GetFileSize(hFile,NULL);
-	extern HANDLE hHeap;
 	char *_buf = (char *)malloc(i2+i2);
 	ReadFile(hFile,_buf,i2,(DWORD *)&i3,NULL);