diff --git a/src/NoteField.cpp b/src/NoteField.cpp
index 84dc4aae63..3795881eb7 100644
--- a/src/NoteField.cpp
+++ b/src/NoteField.cpp
@@ -20,6 +20,9 @@
 #include "Course.h"
 #include "NoteData.h"
 
+float FindFirstDisplayedBeat( const PlayerState* pPlayerState, int iDrawDistanceAfterTargetsPixels );
+float FindLastDisplayedBeat( const PlayerState* pPlayerState, int iDrawDistanceBeforeTargetsPixels );
+
 static ThemeMetric<bool> SHOW_BOARD( "NoteField", "ShowBoard" );
 static ThemeMetric<bool> SHOW_BEAT_BARS( "NoteField", "ShowBeatBars" );
 static ThemeMetric<float> FADE_BEFORE_TARGETS_PERCENT( "NoteField", "FadeBeforeTargetsPercent" );
diff --git a/src/Player.cpp b/src/Player.cpp
index e7b55b6a36..db17f00e07 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -1328,7 +1328,7 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
 		{
 			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)));
+			m_vKeysounds[tn.iKeysoundIndex].SetProperty ("Volume", max(0.0f, min(1.0f, factor)));
 		}
 	}
 
diff --git a/src/PlayerOptions.cpp b/src/PlayerOptions.cpp
index 965acfd223..51d89090d3 100644
--- a/src/PlayerOptions.cpp
+++ b/src/PlayerOptions.cpp
@@ -12,6 +12,9 @@
 #include "CommonMetrics.h"
 #include <float.h>
 
+void NextFloat( float fValues[], int size );
+void NextBool( bool bValues[], int size );
+
 ThemeMetric<float> RANDOM_SPEED_CHANCE		( "PlayerOptions", "RandomSpeedChance" );
 ThemeMetric<float> RANDOM_REVERSE_CHANCE	( "PlayerOptions", "RandomReverseChance" );
 ThemeMetric<float> RANDOM_DARK_CHANCE		( "PlayerOptions", "RandomDarkChance" );
diff --git a/src/ScreenMiniMenu.cpp b/src/ScreenMiniMenu.cpp
index 0d68986a97..83be2dd4f0 100644
--- a/src/ScreenMiniMenu.cpp
+++ b/src/ScreenMiniMenu.cpp
@@ -10,6 +10,9 @@
 #include "OptionRowHandler.h"
 #include "PrefsManager.h"
 
+void PrepareToLoadScreen( const RString &sScreenName );
+void FinishedLoadingScreen();
+
 AutoScreenMessage( SM_GoToOK );
 AutoScreenMessage( SM_GoToCancel );
 
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index e72f6f621d..a3d4af5c6f 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -72,6 +72,10 @@
 #include <windows.h>
 #endif
 
+void ShutdownGame();
+bool HandleGlobalInputs( const InputEventPlus &input );
+void HandleInputEvents(float fDeltaTime);
+
 static Preference<bool> g_bAllowMultipleInstances( "AllowMultipleInstances", false );
 
 void StepMania::GetPreferredVideoModeParams( VideoModeParams &paramsOut )