diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 3dd4f6073d..feee07be8e 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -11,7 +11,6 @@
 #include "Steps.h"
 #include "RageTimer.h"
 #include "ActorUtil.h"
-#include "Actor.h"
 #include "AnnouncerManager.h"
 #include "MenuTimer.h"
 #include "NetworkSyncManager.h"
@@ -24,6 +23,7 @@
 #include "InputEventPlus.h"
 #include "SongUtil.h"
 #include "RageInput.h"
+#include "SongManager.h"
 
 AutoScreenMessage( SM_NoSongs )
 AutoScreenMessage( SM_ChangeSong )
diff --git a/stepmania/src/ScreenNetSelectMusic.h b/stepmania/src/ScreenNetSelectMusic.h
index 1f238264c4..06e3dd3cab 100644
--- a/stepmania/src/ScreenNetSelectMusic.h
+++ b/stepmania/src/ScreenNetSelectMusic.h
@@ -1,16 +1,11 @@
 /* ScreenNetSelectMusic - A method for Online/Net song selection */
 
-#ifndef SCREENNETSELECTMUSIC_H
-#define SCREENNETSELECTMUSIC_H
+#ifndef SCREEN_NET_SELECT_MUSIC_H
+#define SCREEN_NET_SELECT_MUSIC_H
 
 #include "ScreenNetSelectBase.h"
 #include "ScreenWithMenuElements.h"
 #include "Sprite.h"
-#include "Quad.h"
-#include "BitmapText.h"
-//#include "MusicBannerWheel.h"
-#include "DifficultyRating.h"
-#include "ModeSwitcher.h"
 #include "DifficultyIcon.h"
 #include "Difficulty.h"
 #include "DifficultyMeter.h"