#include "special/moving_object.h"
#include "special/sprite.h"
#include "math/physic.h"
-#include "player.h"
+#include "object/player.h"
#include "serializable.h"
#include "resources.h"
#include "sector.h"
-#include "utils/lispwriter.h"
-#include "utils/lispreader.h"
+#include "lisp/parser.h"
+#include "lisp/lisp.h"
+#include "lisp/writer.h"
#include "video/drawing_context.h"
#include "special/sprite_manager.h"