diff --git a/src/PlayerOptions.h b/src/PlayerOptions.h
index aeb1c49b08..8f89fc141f 100644
--- a/src/PlayerOptions.h
+++ b/src/PlayerOptions.h
@@ -179,16 +179,15 @@ public:
 	float	m_fPerspectiveTilt,		m_SpeedfPerspectiveTilt;		// -1 = near, 0 = overhead, +1 = space
 	float	m_fSkew,			m_SpeedfSkew;		// 0 = vanish point is in center of player, 1 = vanish point is in center of screen
 
-	float	m_fRandomSpeed,			m_SpeedfRandomSpeed;
-
 	/* If this is > 0, then the player must have life above this value at the end of
 	 * the song to pass.  This is independent of SongOptions::m_FailType. */
 	float		m_fPassmark,			m_SpeedfPassmark;
 
+	float	m_fRandomSpeed,			m_SpeedfRandomSpeed;
+
 	bool		m_bTurns[NUM_TURNS];
 	bool		m_bTransforms[NUM_TRANSFORMS];
 	bool		m_bMuteOnError;
-	ScoreDisplay m_ScoreDisplay;
 	/** @brief How can the Player fail a song? */
 	enum FailType { 
 		FAIL_IMMEDIATE=0,		/**< fail immediately when life touches 0 */
@@ -198,6 +197,7 @@ public:
 	};
 	/** @brief The method for which a player can fail a song. */
 	FailType m_FailType;
+	ScoreDisplay m_ScoreDisplay;
 
 	/**
 	 * @brief The Noteskin to use.
diff --git a/src/SongOptions.h b/src/SongOptions.h
index a690b56ccd..72f15cda30 100644
--- a/src/SongOptions.h
+++ b/src/SongOptions.h
@@ -22,10 +22,10 @@ public:
 	};
 	DrainType m_DrainType;	// only used with LifeBar
 	int m_iBatteryLives;
-	float m_fMusicRate,	m_SpeedfMusicRate;
-	float m_fHaste, m_SpeedfHaste;
 	bool m_bAssistClap;
 	bool m_bAssistMetronome;
+	float m_fMusicRate,	m_SpeedfMusicRate;
+	float m_fHaste, m_SpeedfHaste;
 	enum AutosyncType { 
 		AUTOSYNC_OFF,
 		AUTOSYNC_SONG,