--- src/GameState.h.orig	2006-04-23 18:31:04.000000000 +0200
+++ src/GameState.h	2006-04-23 18:31:23.000000000 +0200
@@ -85,8 +85,8 @@
 	bool AnyPlayersAreCpu() const;
 
 	void GetCharacters( vector<Character*> &apCharactersOut );
-	Character* GameState::GetRandomCharacter();
-	Character* GameState::GetDefaultCharacter();
+	Character* GetRandomCharacter();
+	Character* GetDefaultCharacter();
 
 	PlayerController	m_PlayerController[NUM_PLAYERS];
 	
--- src/StdString.h.orig	2006-04-23 18:40:14.000000000 +0200
+++ src/StdString.h	2006-04-23 19:22:10.000000000 +0200
@@ -1087,7 +1087,7 @@
 
 		while ( (nIdx=this->find(szOld, nIdx)) != MYBASE::npos )
 		{
-			replace(this->begin()+nIdx, this->begin()+nIdx+nOldLen, szRealNew);
+			MYBASE::replace(this->begin()+nIdx, this->begin()+nIdx+nOldLen, szRealNew);
 			nReplaced++;
 			nIdx += nNewLen;
 		}
--- src/NetworkSyncServer.h.orig	2006-04-23 19:28:07.000000000 +0200
+++ src/NetworkSyncServer.h	2006-04-23 19:28:20.000000000 +0200
@@ -117,7 +117,7 @@
 	void GameOver(PacketFunctions& Packet, const unsigned int clientNum);
 	void ScreenNetMusicSelectStatus(PacketFunctions& Packet, const unsigned int clientNum);
 	void AnalizeChat(PacketFunctions &Packet, const unsigned int clientNum);
-	CString StepManiaLanServer::ListPlayers();
+	CString ListPlayers();
 	void Kick(CString &name);
 	void Ban(CString &name);
 	bool IsBanned(CString &ip);
--- src/RageUtil_FileDB.h.orig	2006-04-23 19:35:11.000000000 +0200
+++ src/RageUtil_FileDB.h	2006-04-23 19:35:34.000000000 +0200
@@ -86,9 +86,9 @@
 	virtual void PopulateFileSet( FileSet &fs, const CString &sPath ) { }
 
 public:
-	FilenameDB::FilenameDB():
+	FilenameDB():
 		ExpireSeconds( -1 ) { }
-	virtual FilenameDB::~FilenameDB() { FlushDirCache(); }
+	virtual ~FilenameDB() { FlushDirCache(); }
 
 	void AddFile( const CString &sPath, int size, int hash, void *priv=NULL );
 	void DelFile( const CString &sPath );