diff --git a/stepmania/src/BPMDisplay.h b/stepmania/src/BPMDisplay.h
index b450856ead..da3d73e9c9 100644
--- a/stepmania/src/BPMDisplay.h
+++ b/stepmania/src/BPMDisplay.h
@@ -41,4 +41,4 @@ protected:
 	bool m_bExtraStage;		// cycle BPM through random values if extra stage
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/GroupList.h b/stepmania/src/GroupList.h
index 2767489fd3..c08078cd5e 100644
--- a/stepmania/src/GroupList.h
+++ b/stepmania/src/GroupList.h
@@ -35,4 +35,4 @@ public:
 	void TweenOnScreen();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/HoldJudgement.cpp b/stepmania/src/HoldJudgement.cpp
index e120f69101..8073a90e0f 100644
--- a/stepmania/src/HoldJudgement.cpp
+++ b/stepmania/src/HoldJudgement.cpp
@@ -81,4 +81,4 @@ void HoldJudgement::SetHoldJudgement( HoldNoteScore hns )
 		m_sprJudgement.BeginTweening( m_fDisplayTime/3.0f );
 		m_sprJudgement.SetTweenZoom( 1.0f );
 	}
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index ddb3290620..9afc094b65 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -90,7 +90,7 @@ void InputMapper::ReadMappingsFromDisk()
 			CStringArray sDeviceInputStrings;
 			split( value, ",", sDeviceInputStrings, false );
 
-			for( unsigned i=0; i<sDeviceInputStrings.size() && i<NUM_GAME_TO_DEVICE_SLOTS; i++ )
+			for( unsigned i=0; i<sDeviceInputStrings.size() && i<unsigned(NUM_GAME_TO_DEVICE_SLOTS); i++ )
 			{
 				DeviceInput DeviceI;
 				DeviceI.fromString( sDeviceInputStrings[i] );
diff --git a/stepmania/src/Judgement.cpp b/stepmania/src/Judgement.cpp
index 1b7fc242c7..aa5ccbf64a 100644
--- a/stepmania/src/Judgement.cpp
+++ b/stepmania/src/Judgement.cpp
@@ -111,4 +111,4 @@ void Judgement::SetJudgement( TapNoteScore score )
 	//	m_sprJudgement.BeginTweening( JUDGEMENT_DISPLAY_TIME/5.0f );
 	//	m_sprJudgement.SetTweenZoom( 1 );
 	}
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/Judgement.h b/stepmania/src/Judgement.h
index 5b040f59a0..d283d87655 100644
--- a/stepmania/src/Judgement.h
+++ b/stepmania/src/Judgement.h
@@ -35,4 +35,4 @@ protected:
 	float		m_fDisplayCountdown;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/MusicList.h b/stepmania/src/MusicList.h
index 29863c5f09..a7a69e80ef 100644
--- a/stepmania/src/MusicList.h
+++ b/stepmania/src/MusicList.h
@@ -36,4 +36,4 @@ public:
 	int GetNumSongs() const { return m_ContentsText[CurGroup].m_iNumSongsInGroup; }
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/stepmania/src/MusicStatusDisplay.cpp b/stepmania/src/MusicStatusDisplay.cpp
index b74bdaa85b..521104577c 100644
--- a/stepmania/src/MusicStatusDisplay.cpp
+++ b/stepmania/src/MusicStatusDisplay.cpp
@@ -80,4 +80,4 @@ void MusicStatusDisplay::DrawPrimitives()
 		ASSERT(0);
 	}
 	Sprite::DrawPrimitives();
-}
\ No newline at end of file
+}
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index bd6d55623c..5c0ce54a74 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -686,8 +686,9 @@ void MusicWheel::RebuildWheelItemDisplays()
 	int iIndex = m_iSelection;
 	if( m_iSelection > int(GetCurWheelItemDatas().size()-1) )
 		m_iSelection = 0;
-
-	for( int i=0; i<NUM_WHEEL_ITEMS_TO_DRAW/2; i++ )
+	
+	int i;
+	for( i=0; i<NUM_WHEEL_ITEMS_TO_DRAW/2; i++ )
 	{
 		do
 		{
@@ -774,7 +775,7 @@ void MusicWheel::Update( float fDeltaTime )
 	ActorFrame::Update( fDeltaTime );
 
 	unsigned i;
-	for( i=0; i<NUM_WHEEL_ITEMS_TO_DRAW; i++ )
+	for( i=0; i<int(NUM_WHEEL_ITEMS_TO_DRAW); i++ )
 	{
 		WheelItemDisplay& display = m_WheelItemDisplays[i];
 
diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index c0dfd23afa..f67cbc59c9 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -405,7 +405,8 @@ void NoteData::CropToLeftSide()
 	int iLastRightSideColumn = 7;
 
 	// clear out the right half
-	for( int c=iFirstRightSideColumn; c<=iLastRightSideColumn; c++ )
+	int c;
+	for( c=iFirstRightSideColumn; c<=iLastRightSideColumn; c++ )
 	{
 		for( int i=0; i<MAX_TAP_NOTE_ROWS; i++ ) // foreach TapNote
 			SetTapNote(c, i, TAP_EMPTY);
diff --git a/stepmania/src/RageTypes.h b/stepmania/src/RageTypes.h
index 30428537ce..08ead4a51c 100644
--- a/stepmania/src/RageTypes.h
+++ b/stepmania/src/RageTypes.h
@@ -192,8 +192,10 @@ struct RageVertex
 
 /* nonstandard extension used : nameless struct/union
  * It is, in fact, nonstandard.  G++ 3.x can handle it. 2.95.x can not. XXX */
+#if defined(_MSC_VER)
 #pragma warning (push)
 #pragma warning (disable : 4201)
+#endif
 
 struct RageMatrix
 {
@@ -259,6 +261,8 @@ public:
     };
 };
 
+#if defined(_MSC_VER)
 #pragma warning (pop)
+#endif
 
 #endif
diff --git a/stepmania/src/RandomSample.h b/stepmania/src/RandomSample.h
index bf08c2ef61..61de576780 100644
--- a/stepmania/src/RandomSample.h
+++ b/stepmania/src/RandomSample.h
@@ -19,7 +19,7 @@ class RandomSample
 {
 public:
 	RandomSample();
-	~RandomSample();
+	virtual ~RandomSample();
 
 	virtual bool Load( CString sFilePath )
 	{