diff --git a/src/ModIconRow.cpp b/src/ModIconRow.cpp
index b2e3c68fd1..d77bed655b 100644
--- a/src/ModIconRow.cpp
+++ b/src/ModIconRow.cpp
@@ -10,6 +10,8 @@
 #include "LuaManager.h"
 #include "Foreach.h"
 
+int OptionToPreferredColumn( RString sOptionText );
+
 REGISTER_ACTOR_CLASS( ModIconRow );
 
 ModIconRow::ModIconRow()
diff --git a/src/Player.cpp b/src/Player.cpp
index 7195d3ab48..e7b55b6a36 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -42,6 +42,9 @@
 #include "LocalizedString.h"
 #include "AdjustSync.h"
 
+RString ATTACK_DISPLAY_X_NAME( size_t p, size_t both_sides );
+void TimingWindowSecondsInit( size_t /*TimingWindow*/ i, RString &sNameOut, float &defaultValueOut );
+
 /**
  * @brief Helper class to ensure that each row is only judged once without taking too much memory.
  */
@@ -1323,14 +1326,9 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
 		// Possibly fixed.
 		if( tn.iKeysoundIndex >= 0 && tn.iKeysoundIndex < (int) m_vKeysounds.size() )
 		{
-			if( tn.subType == TapNote::hold_head_roll )
-			{
-				m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0, min(1.0, fLifeFraction * 2.0)));
-			}
-			else
-			{
-				m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0, min(1.0, fLifeFraction * 10.0 - 8.5)));				
-			}
+			float factor = (tn.subType == TapNote::hold_head_roll ? 2 : 10.0f - 8.5f);
+			factor *= fLifeFraction;
+			m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0, min(1.0, factor)));
 		}
 	}
 
diff --git a/src/RageDisplay_Legacy.cpp b/src/RageDisplay_Legacy.cpp
index 51d59720bd..4247510dc7 100644
--- a/src/RageDisplay_Legacy.cpp
+++ b/src/RageDisplay_Legacy.cpp
@@ -31,6 +31,13 @@ using namespace RageDisplay_Legacy_Helpers;
 #define glFlush()
 #endif
 
+RString GetInfoLog( GLhandleARB h );
+GLhandleARB CompileShader( GLenum ShaderType, RString sFile, vector<RString> asDefines );
+GLhandleARB LoadShader( GLenum ShaderType, RString sFile, vector<RString> asDefines );
+void InitShaders();
+void SetupExtensions();
+void SetPixelMapForSurface( int glImageFormat, int glTexFormat, const RageSurfacePalette *palette );
+
 //
 // Globals
 //
diff --git a/src/ScreenHighScores.cpp b/src/ScreenHighScores.cpp
index 1f5034b134..97ea53f980 100644
--- a/src/ScreenHighScores.cpp
+++ b/src/ScreenHighScores.cpp
@@ -6,6 +6,9 @@
 #include "RageLog.h"
 #include "UnlockManager.h"
 
+RString COLUMN_DIFFICULTY_NAME( size_t i );
+RString COLUMN_STEPS_TYPE_NAME( size_t i );
+
 static const char *HighScoresTypeNames[] = {
 	"AllSteps",
 	"NonstopCourses",
diff --git a/src/ScreenInstallOverlay.cpp b/src/ScreenInstallOverlay.cpp
index 25561e7d8d..6882c1be0c 100644
--- a/src/ScreenInstallOverlay.cpp
+++ b/src/ScreenInstallOverlay.cpp
@@ -41,6 +41,9 @@ struct PlayAfterLaunchInfo
 	}
 };
 
+void InstallSmzipOsArg( const RString &sOsZipFile, PlayAfterLaunchInfo &out );
+PlayAfterLaunchInfo DoInstalls( CommandLineActions::CommandLineArgs args );
+
 static void Parse( const RString &sDir, PlayAfterLaunchInfo &out )
 {
 	vector<RString> vsDirParts;