-#include <SDL_opengl.h>
-
-#include "gameconfig.h"
-#include "resources.h"
-#include "gettext.h"
-#include "audio/sound_manager.h"
-#include "video/surface.h"
-#include "control/joystickkeyboardcontroller.h"
-#include "misc.h"
-#include "title.h"
-#include "game_session.h"
-#include "file_system.h"
-#include "physfs/physfs_sdl.h"
-
-SDL_Surface* screen = 0;
+
+#include "gameconfig.hpp"
+#include "resources.hpp"
+#include "gettext.hpp"
+#include "audio/sound_manager.hpp"
+#include "video/surface.hpp"
+#include "video/texture_manager.hpp"
+#include "video/drawing_context.hpp"
+#include "video/glutil.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
+#include "options_menu.hpp"
+#include "mainloop.hpp"
+#include "title.hpp"
+#include "game_session.hpp"
+#include "scripting/level.hpp"
+#include "scripting/squirrel_util.hpp"
+#include "file_system.hpp"
+#include "physfs/physfs_sdl.hpp"
+#include "random_generator.hpp"
+#include "worldmap/worldmap.hpp"
+#include "binreloc/binreloc.h"
+
+namespace { DrawingContext *context_pointer; }
+SDL_Surface *screen;