#include "angband.h"
#include "util.h"
-#include "term.h"
+#include "gameterm.h"
#include "core.h"
#include "artifact.h"
#include "sort.h"
-#include "store.h"
+#include "market/store.h"
#include "market/store-util.h"
#include "monster.h"
#include "object-flavor.h"
#include "object-hook.h"
#include "object-ego.h"
-#include "objectkind.h"
+#include "object/object-kind.h"
#include "floor-town.h"
#include "files.h"