2 files changed, 3 insertions, 8 deletions
diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp
index 909f78b7..16468dee 100644
--- a/src/sound/sound.cpp
+++ b/src/sound/sound.cpp
@@ -23,10 +23,6 @@
 	#pragma warning(disable:4312)
 #endif
 
-#include <allegro.h>
-
-
-#include <jgmod.h>
 #include "sound.h"
 
 /**
diff --git a/src/sound/sound.h b/src/sound/sound.h
index 58054c59..502889c1 100644
--- a/src/sound/sound.h
+++ b/src/sound/sound.h
@@ -34,7 +34,6 @@
 #include <allegro.h>
 #include <jgmod.h>
 #include <string>
-using namespace std;
 
 /** mod file */
 #define TMWSOUND_MOD 1
@@ -100,14 +99,14 @@ class TmwSound {
 			/** type of item */
 			char type;
 			/** (file-)name of sfx only kept for human reasons ^_^ */
-			string fname;
+			std::string fname;
 			/** generic data */
 			void * data;
 		};
 
 		/** list of preloaded sound data / items */
-		list<POOL_ITEM> soundpool;
-		list<POOL_ITEM>::iterator sounditem;
+		std::list<POOL_ITEM> soundpool;
+		std::list<POOL_ITEM>::iterator sounditem;
 		TMWSOUND_SID items;
 
 		bool isMaxVol(int);