diff --git a/src/tests/kits/game/file_game_sound_test/FileSoundWindow.cpp b/src/tests/kits/game/file_game_sound_test/FileSoundWindow.cpp
index 6fe392df33..80bace12f4 100644
--- a/src/tests/kits/game/file_game_sound_test/FileSoundWindow.cpp
+++ b/src/tests/kits/game/file_game_sound_test/FileSoundWindow.cpp
@@ -4,17 +4,22 @@
 	@version 1.0
  */
 
+
 #include "FileSoundWindow.h"
+
+#include <Alert.h>
 #include <Application.h>
 #include <Box.h>
-#include <TextControl.h>
 #include <Button.h>
 #include <CheckBox.h>
-#include <Alert.h>
+#include <Entry.h>
 #include <Path.h>
+#include <TextControl.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 
+
 FileSoundWindow::FileSoundWindow(BRect windowBounds)
 					:BWindow(windowBounds,"BFileGameSound test",B_TITLED_WINDOW,B_NOT_ZOOMABLE|B_NOT_RESIZABLE)
 {
@@ -195,7 +200,7 @@ void FileSoundWindow::MessageReceived(BMessage *message)
 			if (pausedValue != BFileGameSound::B_PAUSE_IN_PROGRESS)
 			{
 				status_t error;
-				char *label;
+				const char *label;
 				if (paused)
 				{
 					paused = false;
diff --git a/src/tests/kits/game/file_game_sound_test/FileSoundWindow.h b/src/tests/kits/game/file_game_sound_test/FileSoundWindow.h
index dc658ae67b..d977585e91 100644
--- a/src/tests/kits/game/file_game_sound_test/FileSoundWindow.h
+++ b/src/tests/kits/game/file_game_sound_test/FileSoundWindow.h
@@ -4,15 +4,22 @@
 	@version 1.0
  */
 
+
 #ifndef FILE_SOUND_WINDOW
 #define FILE_SOUND_WINDOW
 
-#include <Window.h>
-#include <Rect.h>
-#include <Message.h>
-#include <FileGameSound.h>
+
+#include <Button.h>
+#include <CheckBox.h>
 #include <Entry.h>
+#include <FileGameSound.h>
 #include <FilePanel.h>
+#include <Message.h>
+#include <Rect.h>
+#include <TextControl.h>
+#include <Window.h>
+
+
 //message constants
 #define BROWSE_MSG 1
 #define PLAY_MSG 2
diff --git a/src/tests/kits/game/file_game_sound_test/Jamfile b/src/tests/kits/game/file_game_sound_test/Jamfile
index 1177df76ac..4271e33358 100644
--- a/src/tests/kits/game/file_game_sound_test/Jamfile
+++ b/src/tests/kits/game/file_game_sound_test/Jamfile
@@ -2,6 +2,6 @@ SubDir HAIKU_TOP src tests kits game file_game_sound_test ;
 
 SimpleTest file_game_sound_test
 	: FileSoundTest.cpp FileSoundWindow.cpp
-	: game tracker be root
+	: game tracker be root $(TARGET_LIBSTDC++)
 ;