#include "player-class.h"
#include "player-inventory.h"
#include "object/object-kind.h"
-#include "object-hook.h"
+#include "object/object-hook.h"
#include "spell/spells-type.h"
#include "spells-status.h"
#include "spells-floor.h"
#include "cmd-basic.h"
-#include "floor.h"
+#include "floor/floor.h"
#include "targeting.h"
#include "view/display-main-window.h"
#include "spell/spells2.h"