-// 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 "door.h"
-#include "utils/lispreader.h"
-#include "utils/lispwriter.h"
-#include "gameloop.h"
-#include "resources.h"
-#include "special/sprite.h"
-#include "special/sprite_manager.h"
-#include "video/drawing_context.h"
-#include "app/globals.h"
-
-using namespace SuperTux;
-
-Door::Door(LispReader& reader)
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "trigger/door.hpp"
+
+#include <sstream>
+
+#include "audio/sound_manager.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "supertux/game_session.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
+
+Door::Door(const Reader& reader) :
+ state(CLOSED),
+ target_sector(),
+ target_spawnpoint(),
+ script(),
+ sprite(),
+ stay_open_timer()