diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 948af0a23d..3157e638cb 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -216,7 +216,8 @@ void NoteField::DrawPrimitives()
 		/////////////////////////////////
 		// Draw all HoldNotes in this column (so that they appear under the tap notes)
 		/////////////////////////////////
-		for( int i=0; i < GetNumHoldNotes(); i++ )
+		int i;
+		for( i=0; i < GetNumHoldNotes(); i++ )
 		{
 			const HoldNote &hn = GetHoldNote(i);
 			HoldNoteScore &hns = m_HoldNoteScores[i];
@@ -281,4 +282,4 @@ void NoteField::FadeToFail()
 {
 	m_fPercentFadeToFail = max( 0.0f, m_fPercentFadeToFail );	// this will slowly increase every Update()
 		// don't fade all over again if this is called twice
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/NotesLoader.h b/stepmania/src/NotesLoader.h
index 00c3658d2b..629dad17a6 100644
--- a/stepmania/src/NotesLoader.h
+++ b/stepmania/src/NotesLoader.h
@@ -30,4 +30,4 @@ public:
 	bool Loadable( CString sPath );
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index 20f58b21db..9143ddd2d7 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -259,7 +259,8 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
 		throw RageException( "Couldn't find any BMS files in '%s'", sDir.GetString() );
 
 	// load the Notes from the rest of the BMS files
-	for( unsigned i=0; i<arrayBMSFileNames.size(); i++ ) 
+	unsigned i;
+	for( i=0; i<arrayBMSFileNames.size(); i++ ) 
 	{
 		Notes* pNewNotes = new Notes;
 
diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp
index a9d4b04ef1..620b6deb21 100644
--- a/stepmania/src/NotesLoaderKSF.cpp
+++ b/stepmania/src/NotesLoaderKSF.cpp
@@ -162,7 +162,8 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out )
 		throw RageException( "Couldn't find any KSF files in '%s'", sDir.GetString() );
 
 	// load the Notes from the rest of the KSF files
-	for( unsigned i=0; i<arrayKSFFileNames.size(); i++ ) 
+	unsigned i;
+	for( i=0; i<arrayKSFFileNames.size(); i++ ) 
 	{
 		Notes* pNewNotes = new Notes;
 		LoadFromKSFFile( out.m_sSongDir + arrayKSFFileNames[i], *pNewNotes );
diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp
index 0c5cdba10b..5fbae1c06b 100644
--- a/stepmania/src/NotesWriterDWI.cpp
+++ b/stepmania/src/NotesWriterDWI.cpp
@@ -11,28 +11,28 @@ char NotesWriterDWI::NotesToDWIChar( bool bCol1, bool bCol2, bool bCol3, bool bC
 		char c;
 		bool bCol[6];	
 	} const lookup[] = {
-		{ '0', 0, 0, 0, 0, 0, 0 },
-		{ '1', 1, 0, 1, 0, 0, 0 },
-		{ '2', 0, 0, 1, 0, 0, 0 },
-		{ '3', 0, 0, 1, 0, 0, 1 },
-		{ '4', 1, 0, 0, 0, 0, 0 },
-		{ '6', 0, 0, 0, 0, 0, 1 },
-		{ '7', 1, 0, 0, 1, 0, 0 },
-		{ '8', 0, 0, 0, 1, 0, 0 },
-		{ '9', 0, 0, 0, 1, 0, 1 },
-		{ 'A', 0, 0, 1, 1, 0, 0 },
-		{ 'B', 1, 0, 0, 0, 0, 1 },
-		{ 'C', 0, 1, 0, 0, 0, 0 },
-		{ 'D', 0, 0, 0, 0, 1, 0 },
-		{ 'E', 1, 1, 0, 0, 0, 0 },
-		{ 'F', 0, 1, 1, 0, 0, 0 },
-		{ 'G', 0, 1, 0, 1, 0, 0 },
-		{ 'H', 0, 1, 0, 0, 0, 1 },
-		{ 'I', 1, 0, 0, 0, 1, 0 },
-		{ 'J', 0, 0, 1, 0, 1, 0 },
-		{ 'K', 0, 0, 0, 1, 1, 0 },
-		{ 'L', 0, 0, 0, 0, 1, 1 },
-		{ 'M', 0, 1, 0, 0, 1, 0 },
+		{ '0', { 0, 0, 0, 0, 0, 0 } },
+		{ '1', { 1, 0, 1, 0, 0, 0 } },
+		{ '2', { 0, 0, 1, 0, 0, 0 } },
+		{ '3', { 0, 0, 1, 0, 0, 1 } },
+		{ '4', { 1, 0, 0, 0, 0, 0 } },
+		{ '6', { 0, 0, 0, 0, 0, 1 } },
+		{ '7', { 1, 0, 0, 1, 0, 0 } },
+		{ '8', { 0, 0, 0, 1, 0, 0 } },
+		{ '9', { 0, 0, 0, 1, 0, 1 } },
+		{ 'A', { 0, 0, 1, 1, 0, 0 } },
+		{ 'B', { 1, 0, 0, 0, 0, 1 } },
+		{ 'C', { 0, 1, 0, 0, 0, 0 } },
+		{ 'D', { 0, 0, 0, 0, 1, 0 } },
+		{ 'E', { 1, 1, 0, 0, 0, 0 } },
+		{ 'F', { 0, 1, 1, 0, 0, 0 } },
+		{ 'G', { 0, 1, 0, 1, 0, 0 } },
+		{ 'H', { 0, 1, 0, 0, 0, 1 } },
+		{ 'I', { 1, 0, 0, 0, 1, 0 } },
+		{ 'J', { 0, 0, 1, 0, 1, 0 } },
+		{ 'K', { 0, 0, 0, 1, 1, 0 } },
+		{ 'L', { 0, 0, 0, 0, 1, 1 } },
+		{ 'M', { 0, 1, 0, 0, 1, 0 } },
 	};
 	const int iNumLookups = sizeof(lookup) / sizeof(*lookup);
 
diff --git a/stepmania/src/OptionIcon.h b/stepmania/src/OptionIcon.h
index 162146bb11..681bae81fb 100644
--- a/stepmania/src/OptionIcon.h
+++ b/stepmania/src/OptionIcon.h
@@ -30,4 +30,4 @@ protected:
 	Sprite		m_spr;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/OptionIconRow.cpp b/stepmania/src/OptionIconRow.cpp
index 409e654935..6f3f697519 100644
--- a/stepmania/src/OptionIconRow.cpp
+++ b/stepmania/src/OptionIconRow.cpp
@@ -23,7 +23,7 @@
 
 OptionIconRow::OptionIconRow()
 {
-	for( int i=0; i<NUM_OPTION_COLS; i++ )
+	for( unsigned i=0; i<NUM_OPTION_COLS; i++ )
 	{
 		m_OptionIcon[i].SetXY( i*SPACING_X, i*SPACING_Y );
 		this->AddChild( &m_OptionIcon[i] );
@@ -107,7 +107,7 @@ void OptionIconRow::Refresh( PlayerNumber pn )
 			continue;	// skip
 
 		// search for a vacant spot
-		for( int i=iPerferredCol; i<NUM_OPTION_COLS-1; i++ )
+		for( unsigned i=iPerferredCol; i<NUM_OPTION_COLS-1; i++ )
 		{
 			if( asTabs[i] != "" )
 				continue;
@@ -126,4 +126,4 @@ void OptionIconRow::Refresh( PlayerNumber pn )
 void OptionIconRow::DrawPrimitives()
 {
 	ActorFrame::DrawPrimitives();
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/OptionIconRow.h b/stepmania/src/OptionIconRow.h
index 7395f7bdcf..f286565403 100644
--- a/stepmania/src/OptionIconRow.h
+++ b/stepmania/src/OptionIconRow.h
@@ -33,4 +33,4 @@ protected:
 	OptionIcon		m_OptionIcon[NUM_OPTION_COLS];
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 32842bc456..32ad2cfcd2 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -178,7 +178,8 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
 	m_Combo.SetY( GAMESTATE->m_PlayerOptions[pn].m_bReverseScroll ?  -COMBO_Y_OFFSET : COMBO_Y_OFFSET );
 	m_Judgement.SetY( GAMESTATE->m_PlayerOptions[pn].m_bReverseScroll ? -JUDGEMENT_Y_OFFSET : JUDGEMENT_Y_OFFSET );
 
-	for( int c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
+	int c;
+	for( c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
 		m_HoldJudgement[c].SetY( GAMESTATE->m_PlayerOptions[pn].m_bReverseScroll ? SCREEN_HEIGHT - HOLD_JUDGEMENT_Y : HOLD_JUDGEMENT_Y );
 	for( c=0; c<pStyleDef->m_iColsPerPlayer; c++ )
 		m_HoldJudgement[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset );
@@ -295,8 +296,6 @@ void Player::DrawPrimitives()
 {
 	m_frameCombo.Draw();	// draw this below everything else
 
-	RageMatrix matOldProj;
-
 	if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_bEffects[PlayerOptions::EFFECT_SPACE] )
 	{
 		DISPLAY->PushMatrix();
diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index 3539d95f3e..e3a4eb5320 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -173,4 +173,4 @@ void PlayerOptions::FromString( CString sOptions )
 		else if( sBit == "nofreeze" )	m_bHoldNotes = false;
 		else if( sBit == "dark" )		m_bDark = true;
 	}
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/RageException.cpp b/stepmania/src/RageException.cpp
index dd5f4e2e12..bb1c2aa440 100644
--- a/stepmania/src/RageException.cpp
+++ b/stepmania/src/RageException.cpp
@@ -40,7 +40,7 @@ RageException::RageException( HRESULT hr, const char *fmt, ...)
 #endif
 }
 
-const char* RageException::what() const
+const char* RageException::what() const throw ()
 {
 	return m_sError;
 }
diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index 5a1b085b62..e0203cc951 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -38,7 +38,10 @@ RageLog::RageLog()
 	SYSTEMTIME st;
     GetLocalTime( &st );
 
+#if defined(_MSC_VER)
 	this->Trace( "Last compiled on %s.", __TIMESTAMP__ );
+#endif
+
 	this->Trace( "Log starting %.4d-%.2d-%.2d %.2d:%.2d:%.2d", 
 					 st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond );
 	this->Trace( "\n" );
diff --git a/stepmania/src/RageTextureManager.cpp b/stepmania/src/RageTextureManager.cpp
index 8e492c25ba..79ea4e94d5 100644
--- a/stepmania/src/RageTextureManager.cpp
+++ b/stepmania/src/RageTextureManager.cpp
@@ -16,7 +16,7 @@
 //-----------------------------------------------------------------------------
 #include "RageTextureManager.h"
 #include "RageBitmapTexture.h"
-#include "RageMovieTexture.h"
+//#include "RageMovieTexture.h"
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "RageException.h"
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index 1815e8cbca..dd6e4b89f3 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -413,7 +413,7 @@ const DirCache::CacheEntry *DirCache::SearchDirCache( const CString &sPath )
 bool GetExtDirListing( const CString &sPath, CStringArray &AddTo, bool bOnlyDirs, bool bReturnPathToo, ... )
 {
 	const char *masks[32];
-	int nmasks = 0;
+	unsigned nmasks = 0;
     va_list	va;
 	
     va_start(va, bReturnPathToo);
diff --git a/stepmania/src/ScoreDisplayRolling.cpp b/stepmania/src/ScoreDisplayRolling.cpp
index c488f78c18..be86956049 100644
--- a/stepmania/src/ScoreDisplayRolling.cpp
+++ b/stepmania/src/ScoreDisplayRolling.cpp
@@ -22,7 +22,7 @@ const float SCORE_TWEEN_TIME = 0.5f;
 
 ScoreDisplayRolling::ScoreDisplayRolling()
 {
-	LOG->WriteLine( "ScoreDisplayRolling::ScoreDisplayRolling()" );
+	LOG->Trace( "ScoreDisplayRolling::ScoreDisplayRolling()" );
 
 	// init the text
 	Load( THEME->GetPathTo(FONT_SCORE_NUMBERS) );
diff --git a/stepmania/src/ScoreDisplayRolling.h b/stepmania/src/ScoreDisplayRolling.h
index 3e34d954d1..d9758c2ae5 100644
--- a/stepmania/src/ScoreDisplayRolling.h
+++ b/stepmania/src/ScoreDisplayRolling.h
@@ -15,7 +15,7 @@
 #include "Song.h"
 #include "ActorFrame.h"
 #include "BitmapText.h"
-
+#include "PlayerOptions.h"
 
 const int NUM_SCORE_DIGITS	=	9;