-#include <fstream>
-#include <cassert>
-#include <iostream>
-
-#include "app/setup.h"
-#include "app/tinygettext.h"
-#include "parser.h"
-#include "lisp.h"
-
-namespace lisp
-{
-
-Parser::Parser(bool translate)
- : lexer(0), dictionary_manager(0), dictionary(0)
+#include <tinygettext/tinygettext.hpp>
+#include <physfs.h>
+
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "util/gettext.hpp"
+#include "util/obstackpp.hpp"
+#include "physfs/ifile_stream.hpp"
+#include "physfs/ifile_streambuf.hpp"
+#include "supertux/globals.hpp"
+
+#include "supertux/gameconfig.hpp"
+
+namespace lisp {
+
+Parser::Parser(bool translate) :
+ lexer(0),
+ filename(),
+ dictionary_manager(0),
+ dictionary(0),
+ token(),
+ searchpath(),
+ obst()