*/
#include "angband.h"
-#include "core.h"
+#include "core/system-variables.h"
#include "core/stuff-handler.h"
#include "util.h"
#include "main/sound-definitions-table.h"
#include "spells-diceroll.h"
#include "realm/realm-hex.h"
#include "autopick/autopick.h"
-#include "object-flavor.h"
-#include "object-hook.h"
+#include "object/object-flavor.h"
+#include "object/object-hook.h"
#include "monster-status.h"
#include "player-move.h"
#include "player-status.h"
#include "player-inventory.h"
#include "dungeon/dungeon.h"
-#include "floor-events.h"
+#include "floor/floor-events.h"
#include "feature.h"
#include "view/display-main-window.h"
#include "object/object-kind.h"