- Cleanups

[supertux.git] / src / sector.h

diff --git a/src/sector.h b/src/sector.h
index fe2acf1..5d9822b 100644 (file)
--- a/src/sector.h
+++ b/src/sector.h
@@ -23,13 +23,19 @@
 #include <string>
 #include <vector>
 
-#include "vector.h"
+#include "math/vector.h"
 #include "badguy.h"
 #include "special.h"
-#include "musicref.h"
-#include "screen/drawing_context.h"
+#include "audio/musicref.h"
+#include "video/drawing_context.h"
 
+using namespace SuperTux;
+
+namespace SuperTux {
 class GameObject;
+class LispReader;
+}
+
 class InteractiveObject;
 class Background;
 class Player;
@@ -40,8 +46,6 @@ class TileMap;
 class Upgrade;
 class Bullet;
 class BadGuy;
-class Vector;
-class LispReader;
 class Tile;
 
 struct SpawnPoint