diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 1cf57192d2..dafa761431 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -12,7 +12,6 @@
 #include "HighScore.h"
 #include "NoteSkinManager.h"
 #include "GameCommand.h"
-#include "NoteFieldPositioning.h"
 #include "Character.h"
 #include "UnlockManager.h"
 #include "AnnouncerManager.h"
@@ -1696,11 +1695,6 @@ Premium	GameState::GetPremium()
 		return PREFSMAN->m_Premium; 
 }
 
-bool GameState::IsPlayerHot( const PlayerState *pPlayerState ) const
-{
-	return pPlayerState->m_HealthState == PlayerState::HOT;
-}
-
 bool GameState::IsPlayerInDanger( const PlayerState *pPlayerState ) const
 {
 	if( GAMESTATE->GetPlayerFailType(pPlayerState) == SongOptions::FAIL_OFF )
diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h
index 4c7bf8c6a7..57fe2168a7 100644
--- a/stepmania/src/GameState.h
+++ b/stepmania/src/GameState.h
@@ -172,7 +172,6 @@ public:
 	void UpdateSongPosition( float fPositionSeconds, const TimingData &timing, const RageTimer &timestamp = RageZeroTimer );
 	float GetSongPercent( float beat ) const;
 
-	bool IsPlayerHot( const PlayerState *pPlayerState ) const;
 	bool IsPlayerInDanger( const PlayerState *pPlayerState ) const;
 	bool IsPlayerDead( const PlayerState *pPlayerState ) const;
 	bool AllAreInDangerOrWorse() const;
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 6229824ca3..5b991e3380 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -14,7 +14,6 @@
 #include "ThemeManager.h"
 #include "NoteSkinManager.h"
 #include "Steps.h"
-#include "NoteFieldPositioning.h"
 #include "NoteDataUtil.h"
 #include "SongUtil.h"
 #include "StepsUtil.h"
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index 988049dc55..08e55e4953 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -8,7 +8,6 @@
 #include "RageDisplay.h"
 #include "SongManager.h"
 #include "Steps.h"
-#include "NoteFieldPositioning.h"
 #include "GameManager.h"
 #include "NotesLoaderSM.h"
 #include "GameSoundManager.h"
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 08ea469e43..fec3948757 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -13,7 +13,6 @@
 #include "AnnouncerManager.h"
 #include "ProfileManager.h"
 #include "Profile.h"
-#include "NoteFieldPositioning.h"
 #include "StageStats.h"
 #include "Game.h"
 #include "ScreenDimensions.h"