-#include <stdlib.h> /* for malloc() */
-#include <stdint.h> /* for uint16_t, uint32_t */
-#include "misc.h" /* for rrand() and center_offset() */
-#include "map_objects.h" /* for Player struct */
-#include "yx_uint16.h" /* for yx_uint16 and dir enums */
+#include <stdint.h> /* for uint8_t, uint16_t, uint32_t */
+#include "misc.h" /* for try_malloc(), center_offset(), rrand() */
+#include "map_objects.h" /* for get_player() */
+#include "yx_uint16.h" /* for yx_uint16, dir enums */
+#include "windows.h" /* for struct Win */
+#include "main.h" /* for world global */
+#include "wincontrol.h" /* for get_win_by_id() */