diff --git a/src/player/Thread.cxx b/src/player/Thread.cxx
index eeb406fce..af40654e8 100644
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -52,6 +52,18 @@ class Player {
 
 	MusicPipe *pipe;
 
+	/**
+	 * the song currently being played
+	 */
+	std::unique_ptr<DetachedSong> song;
+
+	/**
+	 * The tag of the "next" song during cross-fade.  It is
+	 * postponed, and sent to the output thread when the new song
+	 * really begins.
+	 */
+	std::unique_ptr<Tag> cross_fade_tag;
+
 	/**
 	 * are we waiting for buffered_before_play?
 	 */
@@ -87,11 +99,6 @@ class Player {
 	 */
 	bool output_open = false;
 
-	/**
-	 * the song currently being played
-	 */
-	std::unique_ptr<DetachedSong> song;
-
 	/**
 	 * Is cross-fading to the next song enabled?
 	 */
@@ -126,13 +133,6 @@ class Player {
 	 */
 	unsigned cross_fade_chunks = 0;
 
-	/**
-	 * The tag of the "next" song during cross-fade.  It is
-	 * postponed, and sent to the output thread when the new song
-	 * really begins.
-	 */
-	std::unique_ptr<Tag> cross_fade_tag;
-
 	/**
 	 * The current audio format for the audio outputs.
 	 */