X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fcamera.cpp;h=476ca412362b1cd7fdc24e2a575931fa15e83f93;hb=ddc3b7ef2077567d368e244a292b41187311e8e3;hp=1286db967e182bc3c8fec48cefba445a7f4e3973;hpb=1d613f782e21f55f915b6e5fa808e7435896461a;p=supertux.git

diff --git a/src/object/camera.cpp b/src/object/camera.cpp
index 1286db967..476ca4123 100644
--- a/src/object/camera.cpp
+++ b/src/object/camera.cpp
@@ -16,7 +16,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #include <config.h>
 
 #include <stdexcept>
@@ -29,13 +28,11 @@
 #include "camera.h"
 #include "player.h"
 #include "tilemap.h"
-#include "gameloop.h"
-#include "app/globals.h"
+#include "game_session.h"
 #include "sector.h"
+#include "main.h"
 #include "object_factory.h"
 
-using namespace SuperTux;
-
 Camera::Camera(Sector* newsector)
   : sector(newsector), do_backscrolling(true), scrollchange(NONE),
     auto_idx(0), auto_t(0)