[Refactor] #38844 Continued removing inclusion of monster-race.h in angband.h

diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index 29c7581..f1f88a9 100644 (file)
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -9,17 +9,18 @@
 #include "autopick/autopick-util.h"
 #include "game-option/auto-destruction-options.h"
 #include "game-option/input-options.h"
-#include "perception/object-perception.h"
+#include "monster-race/monster-race.h"
 #include "object-enchant/object-ego.h"
+#include "object-enchant/special-object-flags.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
-#include "object-enchant/special-object-flags.h"
-#include "sv-definition/sv-other-types.h"
-#include "sv-definition/sv-wand-types.h"
+#include "perception/object-perception.h"
 #include "player/player-move.h"
 #include "player/player-race-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-wand-types.h"
 #include "util/string-processor.h"
 #include "view/display-messages.h"
 

diff --git a/src/birth/game-play-initializer.c b/src/birth/game-play-initializer.c
index 13d3371..3d55cf4 100644 (file)
--- a/src/birth/game-play-initializer.c
+++ b/src/birth/game-play-initializer.c
@@ -6,6 +6,7 @@
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
 #include "market/arena.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "object-enchant/artifact.h"

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 2bf9908..5991437 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -14,6 +14,7 @@
 #include "game-option/cheat-types.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index edfc80f..007bfe2 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -20,6 +20,7 @@
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster/monster-describer.h"

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index fad5ab5..db9f460 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -17,6 +17,7 @@
 #include "io/targeting.h"
 #include "io/write-diary.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"

diff --git a/src/cmd-io/cmd-lore.c b/src/cmd-io/cmd-lore.c
index 1d1cbe4..8090544 100644 (file)
--- a/src/cmd-io/cmd-lore.c
+++ b/src/cmd-io/cmd-lore.c
@@ -5,6 +5,7 @@
 #include "game-option/game-play-options.h"
 #include "game-option/cheat-options.h"
 #include "io/input-key-acceptor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "term/gameterm.h"

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index 2595754..b59715c 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -26,6 +26,7 @@
 #include "main/sound-of-music.h"
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/monster-summon.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"

diff --git a/src/cmd-item/cmd-activate.h b/src/cmd-item/cmd-activate.h
index 34e5357..a53ab19 100644 (file)
--- a/src/cmd-item/cmd-activate.h
+++ b/src/cmd-item/cmd-activate.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/object-type-definition.h"
 
 void do_cmd_activate(player_type *user_ptr);
 void exe_activate(player_type *user_ptr, INVENTORY_IDX item);

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index d43c25b..b1a2c15 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -11,6 +11,7 @@
 #include "inventory/player-inventory.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/item-use-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/combat/attack-accuracy.c b/src/combat/attack-accuracy.c
index 2e3d99c..9476a82 100644 (file)
--- a/src/combat/attack-accuracy.c
+++ b/src/combat/attack-accuracy.c
@@ -1,6 +1,7 @@
 #include "combat/attack-accuracy.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "specific-object/death-scythe.h"
 #include "sv-definition/sv-weapon-types.h"

diff --git a/src/combat/attack-criticality.c b/src/combat/attack-criticality.c
index ebdba49..3ad5b40 100644 (file)
--- a/src/combat/attack-criticality.c
+++ b/src/combat/attack-criticality.c
@@ -1,5 +1,6 @@
 #include "combat/combat-options-type.h"
 #include "combat/attack-criticality.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "sv-definition/sv-weapon-types.h"

diff --git a/src/combat/aura-counterattack.c b/src/combat/aura-counterattack.c
index 9a7b90a..e23d96e 100644 (file)
--- a/src/combat/aura-counterattack.c
+++ b/src/combat/aura-counterattack.c
@@ -7,6 +7,7 @@
 #include "combat/aura-counterattack.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-status.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 8c020cd..8a22d97 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -13,6 +13,7 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "mind/snipe-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/combat/slaying.c b/src/combat/slaying.c
index e8cdeb4..261bb1b 100644 (file)
--- a/src/combat/slaying.c
+++ b/src/combat/slaying.c
@@ -1,6 +1,7 @@
 #include "combat/slaying.h"
 #include "art-definition/art-sword-types.h"
 #include "mind/mind-samurai.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/combat/slaying.h b/src/combat/slaying.h
index 228376f..e0f8199 100644 (file)
--- a/src/combat/slaying.h
+++ b/src/combat/slaying.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 #include "combat/combat-options-type.h"
+#include "system/object-type-definition.h"
 #include "system/monster-type-definition.h"
 
 MULTIPLY mult_slaying(player_type *player_ptr, MULTIPLY mult, const BIT_FLAGS *flgs, monster_type *m_ptr);

diff --git a/src/core/game-play.c b/src/core/game-play.c
index 27de61a..2760867 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -50,6 +50,7 @@
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/monster-remover.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-util.h"
 #include "object/object-flavor.h"

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index 4c0d3fd..8425c35 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "floor/pattern-walk.h"
 #include "grid/feature.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "object-enchant/object-ego.h"

diff --git a/src/core/hp-mp-regenerator.c b/src/core/hp-mp-regenerator.c
index f1b29a5..1b7a74e 100644 (file)
--- a/src/core/hp-mp-regenerator.c
+++ b/src/core/hp-mp-regenerator.c
@@ -1,7 +1,7 @@
-#include "system/angband.h"
-#include "core/hp-mp-regenerator.h"
+#include "core/hp-mp-regenerator.h"
 #include "cmd-item/cmd-magiceat.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-status.h"
 

diff --git a/src/core/hp-mp-regenerator.h b/src/core/hp-mp-regenerator.h
index 20d4d89..b9fb03a 100644 (file)
--- a/src/core/hp-mp-regenerator.h
+++ b/src/core/hp-mp-regenerator.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "system/angband.h"
+
 extern int wild_regen;
 
 void regenhp(player_type* creature_ptr, int percent);

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index 0098bc4..6a371fd 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -12,6 +12,7 @@
 #include "io/input-key-requester.h"
 #include "mind/mind-force-trainer.h"
 #include "core/speed-table.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-describer.h"

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index e86035e..8515b55 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -13,6 +13,7 @@
 #include "io/targeting.h"
 #include "io/write-diary.h"
 #include "market/arena.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-compaction.h"
 #include "monster/monster-processor.h"

diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index 94bf7f5..82382c7 100644 (file)
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -15,6 +15,7 @@
 #include "main/music-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-flags8.h"

diff --git a/src/dungeon/quest.h b/src/dungeon/quest.h
index 0c0b4c6..2817c4b 100644 (file)
--- a/src/dungeon/quest.h
+++ b/src/dungeon/quest.h
@@ -2,6 +2,7 @@
 
 #include "system/angband.h"
 #include "system/monster-type-definition.h"
+#include "system/object-type-definition.h"
 
 /*
  * Quest constants

diff --git a/src/effect/effect-monster-charm.c b/src/effect/effect-monster-charm.c
index fc68cab..886ca63 100644 (file)
--- a/src/effect/effect-monster-charm.c
+++ b/src/effect/effect-monster-charm.c
@@ -3,6 +3,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/floor.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/effect/effect-monster-curse.c b/src/effect/effect-monster-curse.c
index 5b92c79..eefc1a5 100644 (file)
--- a/src/effect/effect-monster-curse.c
+++ b/src/effect/effect-monster-curse.c
@@ -1,4 +1,5 @@
 #include "effect/effect-monster-curse.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"
 #include "view/display-messages.h"
 

diff --git a/src/effect/effect-monster-evil.c b/src/effect/effect-monster-evil.c
index a4f78ac..3781ab6 100644 (file)
--- a/src/effect/effect-monster-evil.c
+++ b/src/effect/effect-monster-evil.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-evil.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/effect/effect-monster-lite-dark.c b/src/effect/effect-monster-lite-dark.c
index 7a0982f..fe89f54 100644 (file)
--- a/src/effect/effect-monster-lite-dark.c
+++ b/src/effect/effect-monster-lite-dark.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-lite-dark.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-info.h"

diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index ae65de1..b6d9655 100644 (file)
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -1,5 +1,6 @@
 #include "effect/effect-monster-oldies.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/effect/effect-monster-psi.c b/src/effect/effect-monster-psi.c
index 3c0b83a..be6fd54 100644 (file)
--- a/src/effect/effect-monster-psi.c
+++ b/src/effect/effect-monster-psi.c
@@ -1,6 +1,7 @@
 #include "effect/effect-monster-psi.h"
 #include "floor/floor.h"
 #include "mind/mind-mirror-master.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/effect/effect-monster-resist-hurt.c b/src/effect/effect-monster-resist-hurt.c
index a7b8a4b..66eec19 100644 (file)
--- a/src/effect/effect-monster-resist-hurt.c
+++ b/src/effect/effect-monster-resist-hurt.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-resist-hurt.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c
index ef731fd..cf692e8 100644 (file)
--- a/src/effect/effect-monster-spirit.c
+++ b/src/effect/effect-monster-spirit.c
@@ -1,4 +1,5 @@
 #include "effect/effect-monster-spirit.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/effect/effect-monster-switcher.c b/src/effect/effect-monster-switcher.c
index 12da383..c6cb3dd 100644 (file)
--- a/src/effect/effect-monster-switcher.c
+++ b/src/effect/effect-monster-switcher.c
@@ -16,6 +16,7 @@
 #include "effect/effect-monster-psi.h"
 #include "effect/effect-monster-resist-hurt.h"
 #include "effect/effect-monster-spirit.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/effect/effect-monster-util.c b/src/effect/effect-monster-util.c
index 6b1ba0a..437be86 100644 (file)
--- a/src/effect/effect-monster-util.c
+++ b/src/effect/effect-monster-util.c
@@ -7,6 +7,7 @@
 #include "effect/effect-monster-util.h"
 #include "floor/floor.h"
 #include "monster-floor/monster-death.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 0c0783e..3512db6 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -13,6 +13,7 @@
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/effect/effect-player.c b/src/effect/effect-player.c
index b2a8d00..10fe004 100644 (file)
--- a/src/effect/effect-player.c
+++ b/src/effect/effect-player.c
@@ -12,6 +12,7 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "mind/mind-ninja.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "player/player-effects.h"

diff --git a/src/floor/fixed-map-generator.c b/src/floor/fixed-map-generator.c
index f4289e6..f9dcc61 100644 (file)
--- a/src/floor/fixed-map-generator.c
+++ b/src/floor/fixed-map-generator.c
@@ -8,6 +8,7 @@
 #include "info-reader/general-parser.h"
 #include "info-reader/random-grid-effect-types.h"
 #include "io/tokenizer.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster-floor/monster-generator.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index 1aef921..65353b5 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -9,6 +9,7 @@
 #include "game-option/map-screen-options.h"
 #include "grid/grid.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster/monster-info.h"

diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index 40eefee..5eada21 100644 (file)
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -32,6 +32,7 @@
 #include "info-reader/fixed-map-parser.h"
 #include "io/write-diary.h"
 #include "market/arena-info-table.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-flag-types.h"
 #include "monster-floor/monster-generator.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index d1fd62d..9861371 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -36,6 +36,7 @@
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/monster-remover.h"
 #include "monster-floor/monster-summon.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/floor/floor-streams.c b/src/floor/floor-streams.c
index 648f59e..e2979f3 100644 (file)
--- a/src/floor/floor-streams.c
+++ b/src/floor/floor-streams.c
@@ -17,12 +17,12 @@
 #include "dungeon/dungeon.h"
 #include "floor/floor-generate.h"
 #include "floor/floor-object.h"
-#include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"
 #include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "object-enchant/artifact.h"
 #include "object/object-flavor.h"

diff --git a/src/floor/floor-streams.h b/src/floor/floor-streams.h
index 3f4959f..0547c4b 100644 (file)
--- a/src/floor/floor-streams.h
+++ b/src/floor/floor-streams.h
@@ -1,4 +1,7 @@
-#include "system/angband.h"
+#pragma once
+
+#include "system/angband.h"
+#include "floor/floor.h"
 
 void add_river(floor_type *floor_ptr);
 void build_streamer(player_type *player_ptr, FEAT_IDX feat, int chance);

diff --git a/src/grid/grid.c b/src/grid/grid.c
index d29d678..4dc3e7c 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -25,8 +25,9 @@
 #include "game-option/special-options.h"
 #include "grid/feature.h"
 #include "grid/trap.h"
-#include "monster/monster-info.h"
 #include "monster-floor/monster-remover.h"
+#include "monster-race/monster-race.h"
+#include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "object/object-flavor.h"

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index 54797cc..f152007 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -14,6 +14,7 @@
 #include "knowledge/knowledge-quests.h"
 #include "main/init.h"
 #include "market/arena-info-table.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"

diff --git a/src/io/load.c b/src/io/load.c
index a3df865..371256a 100644 (file)
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -38,6 +38,7 @@
 #include "locale/japanese.h"
 #include "market/arena.h"
 #include "market/bounty.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index cfa9c09..f1e151e 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -37,6 +37,7 @@
 #include "io/input-key-requester.h"
 #include "locale/vowel-checker.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-describer.h"

diff --git a/src/io/write-diary.c b/src/io/write-diary.c
index 25035f2..107f7b1 100644 (file)
--- a/src/io/write-diary.c
+++ b/src/io/write-diary.c
@@ -11,6 +11,7 @@
 #include "info-reader/fixed-map-parser.h"
 #include "io/files-util.h"
 #include "market/arena-info-table.h"
+#include "monster-race/monster-race.h"
 #include "system/system-variables.h"
 #include "util/angband-files.h"
 #include "view/display-messages.h"

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 5ee51c1..aa401f0 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -16,6 +16,7 @@
 #include "io/input-key-acceptor.h"
 #include "knowledge/monster-group-table.h"
 #include "locale/english.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/knowledge/knowledge-quests.c b/src/knowledge/knowledge-quests.c
index 174b032..3c2937d 100644 (file)
--- a/src/knowledge/knowledge-quests.c
+++ b/src/knowledge/knowledge-quests.c
@@ -13,6 +13,7 @@
 #include "info-reader/fixed-map-parser.h"
 #include "io-dump/dump-util.h"
 #include "locale/english.h"
+#include "monster-race/monster-race.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/special-object-flags.h"
 #include "object/object-flavor.h"

diff --git a/src/lore/lore-calculator.c b/src/lore/lore-calculator.c
index 4c80ba5..ad6659a 100644 (file)
--- a/src/lore/lore-calculator.c
+++ b/src/lore/lore-calculator.c
@@ -1,5 +1,6 @@
 #include "lore/lore-calculator.h"
 #include "game-option/cheat-options.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"

diff --git a/src/lore/lore-store.c b/src/lore/lore-store.c
index 768c244..64a6782 100644 (file)
--- a/src/lore/lore-store.c
+++ b/src/lore/lore-store.c
@@ -7,6 +7,7 @@
 #include "lore/lore-store.h"
 #include "floor/floor.h"
 #include "monster-race/race-flags1.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-info.h"
 #include "system/monster-type-definition.h"
 

diff --git a/src/lore/lore-util.c b/src/lore/lore-util.c
index a3bd6c3..8f872b8 100644 (file)
--- a/src/lore/lore-util.c
+++ b/src/lore/lore-util.c
@@ -1,5 +1,6 @@
 #include "lore/lore-util.h"
 #include "game-option/birth-options.h"
+#include "monster-race/monster-race.h"
 #include "term/screen-processor.h"
 #include "term/term-color-types.h"
 

diff --git a/src/lore/lore-util.h b/src/lore/lore-util.h
index 4157b77..0204322 100644 (file)
--- a/src/lore/lore-util.h
+++ b/src/lore/lore-util.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
-#include "monster-race/monster-race.h"
+#include "system/monster-race-definition.h"
 
 typedef enum monster_sex {
     MSEX_NONE = 0,

diff --git a/src/lore/monster-lore.c b/src/lore/monster-lore.c
index de1833f..72cd6af 100644 (file)
--- a/src/lore/monster-lore.c
+++ b/src/lore/monster-lore.c
@@ -9,6 +9,7 @@
 #include "lore/lore-calculator.h"
 #include "lore/lore-util.h"
 #include "lore/magic-types-setter.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/main/init.c b/src/main/init.c
index 210e325..f15f015 100644 (file)
--- a/src/main/init.c
+++ b/src/main/init.c
@@ -57,6 +57,7 @@
 #include "io/read-pref-file.h"
 #include "io/uid-checker.h"
 #include "market/articles-on-sale.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags7.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/object-ego.h"

diff --git a/src/market/arena.c b/src/market/arena.c
index 64a54a0..8c1b42c 100644 (file)
--- a/src/market/arena.c
+++ b/src/market/arena.c
@@ -9,6 +9,7 @@
 #include "market/arena-info-table.h"
 #include "market/building-actions-table.h"
 #include "market/building-util.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags-resistance.h"

diff --git a/src/market/bounty.c b/src/market/bounty.c
index 47798d0..ac861eb 100644 (file)
--- a/src/market/bounty.c
+++ b/src/market/bounty.c
@@ -8,6 +8,7 @@
 #include "io/input-key-acceptor.h"
 #include "market/bounty-prize-table.h"
 #include "market/building-util.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/market/building-monster.c b/src/market/building-monster.c
index 88bd3c2..cec0517 100644 (file)
--- a/src/market/building-monster.c
+++ b/src/market/building-monster.c
@@ -4,6 +4,7 @@
 #include "core/stuff-handler.h"
 #include "game-option/game-play-options.h"
 #include "io/input-key-acceptor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "lore/lore-store.h"
 #include "term/gameterm.h"

diff --git a/src/market/building-quest.c b/src/market/building-quest.c
index d92f259..b0cc02e 100644 (file)
--- a/src/market/building-quest.c
+++ b/src/market/building-quest.c
@@ -3,6 +3,7 @@
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "market/building-util.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-list.h"
 #include "system/system-variables.h"

diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c
index 82bd377..f066d9f 100644 (file)
--- a/src/melee/melee-postprocess.c
+++ b/src/melee/melee-postprocess.c
@@ -16,6 +16,7 @@
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/melee/melee-util.c b/src/melee/melee-util.c
index fa441d0..b2054c4 100644 (file)
--- a/src/melee/melee-util.c
+++ b/src/melee/melee-util.c
@@ -1,5 +1,6 @@
 #include "melee/melee-util.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 
 mam_type *initialize_mam_type(player_type *subject_ptr, mam_type *mam_ptr, MONRACE_IDX m_idx, MONRACE_IDX t_idx)
 {

diff --git a/src/melee/melee-util.h b/src/melee/melee-util.h
index 43a49d1..a344b4a 100644 (file)
--- a/src/melee/melee-util.h
+++ b/src/melee/melee-util.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "monster-attack/monster-attack-effect.h"
+#include "monster-attack/monster-attack-types.h"
 #include "system/angband.h"
 #include "spell/spell-types.h"
 #include "system/monster-type-definition.h"

diff --git a/src/melee/monster-attack-monster.c b/src/melee/monster-attack-monster.c
index cf3a502..fe5368a 100644 (file)
--- a/src/melee/monster-attack-monster.c
+++ b/src/melee/monster-attack-monster.c
@@ -15,6 +15,7 @@
 #include "melee/melee-switcher.h"
 #include "melee/melee-util.h"
 #include "monster-attack/monster-attack-effect.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/mind/mind-cavalry.c b/src/mind/mind-cavalry.c
index 98a2626..67825ca 100644 (file)
--- a/src/mind/mind-cavalry.c
+++ b/src/mind/mind-cavalry.c
@@ -7,6 +7,7 @@
 #include "mind/mind-cavalry.h"
 #include "cmd-action/cmd-pet.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/mind/mind-ninja.c b/src/mind/mind-ninja.c
index f6c2994..69caef2 100644 (file)
--- a/src/mind/mind-ninja.c
+++ b/src/mind/mind-ninja.c
@@ -5,6 +5,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/floor-object.h"
 #include "io/targeting.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"

diff --git a/src/mind/mind-samurai.c b/src/mind/mind-samurai.c
index 8afbcbd..93bd8f8 100644 (file)
--- a/src/mind/mind-samurai.c
+++ b/src/mind/mind-samurai.c
@@ -9,6 +9,7 @@
 #include "cmd-action/cmd-pet.h"
 #include "cmd/cmd-basic.h"
 #include "io/input-key-acceptor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/monster-race-hook.h"

diff --git a/src/mind/monk-attack.c b/src/mind/monk-attack.c
index a7c77e1..9f0f513 100644 (file)
--- a/src/mind/monk-attack.c
+++ b/src/mind/monk-attack.c
@@ -16,6 +16,7 @@
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
 #include "mind/mind-force-trainer.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-status.h"

diff --git a/src/monster-attack/monster-attack-player.c b/src/monster-attack/monster-attack-player.c
index b691ba3..b0d43cd 100644 (file)
--- a/src/monster-attack/monster-attack-player.c
+++ b/src/monster-attack/monster-attack-player.c
@@ -22,6 +22,7 @@
 #include "monster-attack/monster-attack-effect.h"
 #include "monster-attack/monster-attack-switcher.h"
 #include "monster-attack/monster-attack-util.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-description-types.h"

diff --git a/src/monster-attack/monster-attack-processor.c b/src/monster-attack/monster-attack-processor.c
index a6eef24..2b57d7a 100644 (file)
--- a/src/monster-attack/monster-attack-processor.c
+++ b/src/monster-attack/monster-attack-processor.c
@@ -9,6 +9,7 @@
 #include "monster/monster-status.h"
 #include "dungeon/dungeon.h"
 #include "monster-attack/monster-attack-player.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-info.h"

diff --git a/src/monster-attack/monster-attack-status.c b/src/monster-attack/monster-attack-status.c
index d11beb0..243e6ae 100644 (file)
--- a/src/monster-attack/monster-attack-status.c
+++ b/src/monster-attack/monster-attack-status.c
@@ -6,6 +6,7 @@
 
 #include "monster-attack/monster-attack-status.h"
 #include "mind/mind-mirror-master.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"
 #include "player/player-effects.h"
 #include "view/display-messages.h"

diff --git a/src/monster-attack/monster-attack-util.h b/src/monster-attack/monster-attack-util.h
index 132cfb8..bcdfd20 100644 (file)
--- a/src/monster-attack/monster-attack-util.h
+++ b/src/monster-attack/monster-attack-util.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "monster-attack/monster-attack-effect.h"
+#include "monster-attack/monster-attack-types.h"
 #include "system/angband.h"
 #include "system/monster-type-definition.h"
 

diff --git a/src/monster-floor/monster-death.c b/src/monster-floor/monster-death.c
index 3c6cffc..2a3288e 100644 (file)
--- a/src/monster-floor/monster-death.c
+++ b/src/monster-floor/monster-death.c
@@ -20,6 +20,7 @@
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/monster-floor/monster-direction.c b/src/monster-floor/monster-direction.c
index cc7967f..ac73c52 100644 (file)
--- a/src/monster-floor/monster-direction.c
+++ b/src/monster-floor/monster-direction.c
@@ -6,6 +6,7 @@
 
 #include "monster-floor/monster-direction.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-floor/monster-sweep-grid.h"

diff --git a/src/monster-floor/monster-generator.c b/src/monster-floor/monster-generator.c
index 27c2f13..13405ae 100644 (file)
--- a/src/monster-floor/monster-generator.c
+++ b/src/monster-floor/monster-generator.c
@@ -12,6 +12,7 @@
 #include "monster-floor/one-monster-placer.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"

diff --git a/src/monster-floor/monster-move.c b/src/monster-floor/monster-move.c
index 0f483fd..ca4cfae 100644 (file)
--- a/src/monster-floor/monster-move.c
+++ b/src/monster-floor/monster-move.c
@@ -10,6 +10,7 @@
 #include "io/files-util.h"
 #include "monster-race/race-indice-types.h"
 #include "core/speed-table.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/monster-floor/monster-object.c b/src/monster-floor/monster-object.c
index 2301035..7e353e9 100644 (file)
--- a/src/monster-floor/monster-object.c
+++ b/src/monster-floor/monster-object.c
@@ -6,6 +6,7 @@
 
 #include "monster-floor/monster-object.h"
 #include "floor/floor-object.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/monster-floor/monster-remover.c b/src/monster-floor/monster-remover.c
index 52aad07..37dd57f 100644 (file)
--- a/src/monster-floor/monster-remover.c
+++ b/src/monster-floor/monster-remover.c
@@ -2,6 +2,7 @@
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "io/targeting.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"

diff --git a/src/monster-floor/monster-runaway.c b/src/monster-floor/monster-runaway.c
index 0fa3db1..efa5e6e 100644 (file)
--- a/src/monster-floor/monster-runaway.c
+++ b/src/monster-floor/monster-runaway.c
@@ -6,6 +6,7 @@
 
 #include "monster-floor/monster-runaway.h"
 #include "dungeon/quest.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/monster-floor/monster-safety-hiding.c b/src/monster-floor/monster-safety-hiding.c
index 367718c..60c7a2c 100644 (file)
--- a/src/monster-floor/monster-safety-hiding.c
+++ b/src/monster-floor/monster-safety-hiding.c
@@ -7,6 +7,7 @@
 #include "monster-floor/monster-safety-hiding.h"
 #include "floor/floor.h"
 #include "monster-floor/monster-dist-offsets.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
 #include "mspell/monster-spell.h"

diff --git a/src/monster-floor/monster-summon.c b/src/monster-floor/monster-summon.c
index 6e4d876..04750c1 100644 (file)
--- a/src/monster-floor/monster-summon.c
+++ b/src/monster-floor/monster-summon.c
@@ -6,6 +6,7 @@
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster/monster-info.h"

diff --git a/src/monster-floor/monster-sweep-grid.c b/src/monster-floor/monster-sweep-grid.c
index 1db02d7..615704a 100644 (file)
--- a/src/monster-floor/monster-sweep-grid.c
+++ b/src/monster-floor/monster-sweep-grid.c
@@ -6,6 +6,7 @@
 
 #include "monster-floor/monster-sweep-grid.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/monster-floor/one-monster-placer.c b/src/monster-floor/one-monster-placer.c
index d8f2fbe..36879f9 100644 (file)
--- a/src/monster-floor/one-monster-placer.c
+++ b/src/monster-floor/one-monster-placer.c
@@ -16,6 +16,7 @@
 #include "monster-floor/monster-move.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/monster-floor/quantum-effect.c b/src/monster-floor/quantum-effect.c
index 87b5a51..2b4c134 100644 (file)
--- a/src/monster-floor/quantum-effect.c
+++ b/src/monster-floor/quantum-effect.c
@@ -1,5 +1,6 @@
 #include "monster-floor/quantum-effect.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-floor/monster-death.h"

diff --git a/src/monster/monster-compaction.c b/src/monster/monster-compaction.c
index ffc3dce..845ecf8 100644 (file)
--- a/src/monster/monster-compaction.c
+++ b/src/monster/monster-compaction.c
@@ -3,6 +3,7 @@
 #include "game-option/play-record-options.h"
 #include "io/targeting.h"
 #include "io/write-diary.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"

diff --git a/src/monster/monster-describer.c b/src/monster/monster-describer.c
index ce08f9c..9682844 100644 (file)
--- a/src/monster/monster-describer.c
+++ b/src/monster/monster-describer.c
@@ -2,6 +2,7 @@
 #include "floor/floor.h"
 #include "io/files-util.h"
 #include "locale/vowel-checker.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-flag-types.h"

diff --git a/src/monster/monster-info.c b/src/monster/monster-info.c
index 4ede17b..2bad56f 100644 (file)
--- a/src/monster/monster-info.c
+++ b/src/monster/monster-info.c
@@ -12,6 +12,7 @@
 #include "monster/monster-info.h"
 #include "dungeon/quest.h"
 #include "floor/wild.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/monster/monster-list.c b/src/monster/monster-list.c
index 6213fff..88fccf2 100644 (file)
--- a/src/monster/monster-list.c
+++ b/src/monster/monster-list.c
@@ -16,6 +16,7 @@
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
 #include "monster-floor/monster-summon.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/monster/monster-list.h b/src/monster/monster-list.h
index 24b2ff9..53fdebc 100644 (file)
--- a/src/monster/monster-list.h
+++ b/src/monster/monster-list.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "system/angband.h"
 #include "floor/floor.h"
+#include "system/angband.h"
 #include "system/monster-type-definition.h"
 
 MONSTER_IDX m_pop(floor_type *floor_ptr);

diff --git a/src/monster/monster-processor-util.c b/src/monster/monster-processor-util.c
index 24da497..f1a6b77 100644 (file)
--- a/src/monster/monster-processor-util.c
+++ b/src/monster/monster-processor-util.c
@@ -9,6 +9,7 @@
 
 #include "monster/monster-processor-util.h"
 #include "game-option/birth-options.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-status.h"
 
  /*!

diff --git a/src/monster/monster-processor.c b/src/monster/monster-processor.c
index a88c07e..c86f3e5 100644 (file)
--- a/src/monster/monster-processor.c
+++ b/src/monster/monster-processor.c
@@ -29,6 +29,7 @@
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-floor/quantum-effect.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index ee90aa8..d0bcc96 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -24,6 +24,7 @@
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/monster/monster-update.c b/src/monster/monster-update.c
index 2df3594..347543f 100644 (file)
--- a/src/monster/monster-update.c
+++ b/src/monster/monster-update.c
@@ -9,6 +9,7 @@
 #include "game-option/birth-options.h"
 #include "game-option/disturbance-options.h"
 #include "mind/drs-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/monster/monster-util.c b/src/monster/monster-util.c
index 651c0c5..de54470 100644 (file)
--- a/src/monster/monster-util.c
+++ b/src/monster/monster-util.c
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "floor/wild.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/mspell/mspell-damage-calculator.c b/src/mspell/mspell-damage-calculator.c
index f8247c0..1380c15 100644 (file)
--- a/src/mspell/mspell-damage-calculator.c
+++ b/src/mspell/mspell-damage-calculator.c
@@ -1,6 +1,7 @@
 #include "system/angband.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "mspell/mspell-type.h"
 #include "mspell/mspell-damage-calculator.h"

diff --git a/src/mspell/mspell-floor.c b/src/mspell/mspell-floor.c
index 3a0eef3..d78e27a 100644 (file)
--- a/src/mspell/mspell-floor.c
+++ b/src/mspell/mspell-floor.c
@@ -8,6 +8,7 @@
 #include "art-definition/art-bow-types.h"
 #include "effect/effect-characteristics.h"
 #include "mind/drs-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/mspell/mspell-special.c b/src/mspell/mspell-special.c
index 0497e90..0226d0a 100644 (file)
--- a/src/mspell/mspell-special.c
+++ b/src/mspell/mspell-special.c
@@ -12,6 +12,7 @@
 #include "monster-floor/monster-death.h"
 #include "monster-floor/monster-remover.h"
 #include "monster-floor/monster-summon.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags7.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"

diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c
index be6f530..784feac 100644 (file)
--- a/src/mspell/mspell-status.c
+++ b/src/mspell/mspell-status.c
@@ -8,6 +8,7 @@
 #include "mspell/mspell-status.h"
 #include "art-definition/art-bow-types.h"
 #include "mind/drs-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-describer.h"

diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index 023f53f..8402428 100644 (file)
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -3,6 +3,7 @@
 #include "game-option/birth-options.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index 5eb88a0..6d36e2e 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -15,6 +15,7 @@
 #include "effect/effect-characteristics.h"
 #include "game-option/birth-options.h"
 #include "grid/grid.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags-resistance.h"

diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c
index f1c62d8..f1013a9 100644 (file)
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -16,6 +16,7 @@
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index 3a89e9d..b069656 100644 (file)
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -28,6 +28,7 @@
 #include "main/sound-of-music.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags-resistance.h"

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index 2abf829..f789064 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -2,6 +2,7 @@
 #include "io/targeting.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-status.h"
 #include "mutation/mutation.h"
 #include "object/lite-processor.h"

diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 5a9887c..196fae5 100644 (file)
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -28,6 +28,7 @@
 #include "monster-floor/monster-remover.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-describer.h"

diff --git a/src/object-enchant/apply-magic-others.c b/src/object-enchant/apply-magic-others.c
index c7b33f0..ccf4793 100644 (file)
--- a/src/object-enchant/apply-magic-others.c
+++ b/src/object-enchant/apply-magic-others.c
@@ -8,6 +8,7 @@
 #include "object-enchant/apply-magic-others.h"
 #include "floor/floor.h"
 #include "game-option/cheat-options.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags9.h"
 #include "monster-race/race-indice-types.h"
 #include "monster-race/monster-race-hook.h"

diff --git a/src/object-enchant/apply-magic-others.h b/src/object-enchant/apply-magic-others.h
index 8a97521..6f98aa9 100644 (file)
--- a/src/object-enchant/apply-magic-others.h
+++ b/src/object-enchant/apply-magic-others.h
@@ -1,5 +1,6 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/object-type-definition.h"
 
 void apply_magic_others(player_type *owner_ptr, object_type *o_ptr, int power);

diff --git a/src/object-enchant/vorpal-weapon.c b/src/object-enchant/vorpal-weapon.c
index 8359e51..5ffeb1f 100644 (file)
--- a/src/object-enchant/vorpal-weapon.c
+++ b/src/object-enchant/vorpal-weapon.c
@@ -1,6 +1,7 @@
 #include "object-enchant/vorpal-weapon.h"
 #include "art-definition/art-sword-types.h"
 #include "io/files-util.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "view/display-messages.h"
 

diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index 57fc0ae..0fefa3d 100644 (file)
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -10,6 +10,7 @@
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/item-feeling.h"

diff --git a/src/object/object-hook.h b/src/object/object-hook.h
index d46ef7b..aeb2480 100644 (file)
--- a/src/object/object-hook.h
+++ b/src/object/object-hook.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/object-type-definition.h"
 
 extern bool (*item_tester_hook)(object_type *o_ptr);
 

diff --git a/src/object/object-info.c b/src/object/object-info.c
index 33ff68a..55c507a 100644 (file)
--- a/src/object/object-info.c
+++ b/src/object/object-info.c
@@ -14,6 +14,7 @@
 #include "art-definition/art-weapon-types.h"
 #include "art-definition/random-art-effects.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "object-enchant/activation-info-table.h"
 #include "object-enchant/artifact.h"
 #include "object-enchant/dragon-breaths-table.h"

diff --git a/src/object/warning.c b/src/object/warning.c
index 706ee2f..924fc3b 100644 (file)
--- a/src/object/warning.c
+++ b/src/object/warning.c
@@ -7,6 +7,7 @@
 #include "grid/feature.h"
 #include "monster-attack/monster-attack-effect.h"
 #include "monster-attack/monster-attack-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability1.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/pet/pet-fall-off.c b/src/pet/pet-fall-off.c
index 4d78034..1bd577c 100644 (file)
--- a/src/pet/pet-fall-off.c
+++ b/src/pet/pet-fall-off.c
@@ -8,6 +8,7 @@
 #include "core/stuff-handler.h"
 #include "floor/floor.h"
 #include "io/targeting.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-describer.h"
 #include "pet/pet-util.h"
 #include "player/player-damage.h"

diff --git a/src/player-attack/attack-chaos-effect.c b/src/player-attack/attack-chaos-effect.c
index d31212a..edfb745 100644 (file)
--- a/src/player-attack/attack-chaos-effect.c
+++ b/src/player-attack/attack-chaos-effect.c
@@ -8,6 +8,7 @@
 #include "player-attack/attack-chaos-effect.h"
 #include "art-definition/art-weapon-types.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-status.h"
 #include "monster/monster-info.h"

diff --git a/src/player-attack/player-attack.c b/src/player-attack/player-attack.c
index 89a9096..097529e 100644 (file)
--- a/src/player-attack/player-attack.c
+++ b/src/player-attack/player-attack.c
@@ -17,6 +17,7 @@
 #include "mind/mind-ninja.h"
 #include "mind/mind-samurai.h"
 #include "mind/monk-attack.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-describer.h"

diff --git a/src/player/eldritch-horror.c b/src/player/eldritch-horror.c
index 1853bcc..a504500 100644 (file)
--- a/src/player/eldritch-horror.c
+++ b/src/player/eldritch-horror.c
@@ -8,6 +8,7 @@
 #include "core/stuff-handler.h"
 #include "floor/floor.h"
 #include "locale/vowel-checker.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 0ccd4ff..36b15e1 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -25,6 +25,7 @@
 #include "market/arena-info-table.h"
 #include "mind/mind-mirror-master.h"
 #include "monster/monster-describer.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-description-types.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 98d4554..429661d 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -168,6 +168,7 @@
 #include "locale/vowel-checker.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 3245183..5ec2694 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -15,8 +15,9 @@
 #include "io/input-key-requester.h"
 #include "io/targeting.h"
 #include "mind/mind-ninja.h"
-#include "monster-race/race-flags7.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster-race/monster-race.h"
+#include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-info.h"
 #include "monster/monster-update.h"

diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index cce7d80..1399f0d 100644 (file)
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -7,6 +7,7 @@
 #include "game-option/cheat-types.h"
 #include "grid/feature.h"
 #include "grid/grid.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags4.h"

diff --git a/src/spell-kind/earthquake.c b/src/spell-kind/earthquake.c
index 019cf73..9a9bd16 100644 (file)
--- a/src/spell-kind/earthquake.c
+++ b/src/spell-kind/earthquake.c
@@ -7,6 +7,7 @@
 #include "game-option/play-record-options.h"
 #include "game-option/text-display-options.h"
 #include "io/write-diary.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-describer.h"

diff --git a/src/spell-kind/spells-detection.c b/src/spell-kind/spells-detection.c
index 4356a19..f488fdd 100644 (file)
--- a/src/spell-kind/spells-detection.c
+++ b/src/spell-kind/spells-detection.c
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "grid/trap.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/monster-race-hook.h"

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index e7380d4..b36f87b 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -21,6 +21,7 @@
 #include "grid/feature.h"
 #include "grid/grid.h"
 #include "io/write-diary.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"

diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index df8d7fa..623ba97 100644 (file)
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -6,6 +6,7 @@
 #include "game-option/play-record-options.h"
 #include "game-option/special-options.h"
 #include "io/write-diary.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"

diff --git a/src/spell-kind/spells-lite.c b/src/spell-kind/spells-lite.c
index 44e119a..81fc50b 100644 (file)
--- a/src/spell-kind/spells-lite.c
+++ b/src/spell-kind/spells-lite.c
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "game-option/map-screen-options.h"
 #include "grid/grid.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-status.h"

diff --git a/src/spell-kind/spells-pet.c b/src/spell-kind/spells-pet.c
index a8f9fee..329fa55 100644 (file)
--- a/src/spell-kind/spells-pet.c
+++ b/src/spell-kind/spells-pet.c
@@ -4,6 +4,7 @@
 #include "floor/floor.h"
 #include "game-option/play-record-options.h"
 #include "io/write-diary.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"

diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c
index b32068d..3b5a65d 100644 (file)
--- a/src/spell-kind/spells-sight.c
+++ b/src/spell-kind/spells-sight.c
@@ -6,6 +6,7 @@
 #include "io/input-key-acceptor.h"
 #include "locale/english.h"
 #include "lore/lore-store.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags3.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"

diff --git a/src/spell-kind/spells-teleport.c b/src/spell-kind/spells-teleport.c
index e714fff..f649a42 100644 (file)
--- a/src/spell-kind/spells-teleport.c
+++ b/src/spell-kind/spells-teleport.c
@@ -9,6 +9,7 @@
 #include "art-definition/art-bow-types.h"
 #include "cmd-io/cmd-save.h"
 #include "core/asking-player.h"
+#include "core/speed-table.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"
@@ -19,7 +20,9 @@
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "core/speed-table.h"
+#include "monster-floor/monster-move.h"
+#include "monster-floor/monster-remover.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-ability2.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
@@ -27,8 +30,6 @@
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
 #include "monster/monster-info.h"
-#include "monster-floor/monster-move.h"
-#include "monster-floor/monster-remover.h"
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/spell-realm/spells-hex.c b/src/spell-realm/spells-hex.c
index be7f6a1..95003df 100644 (file)
--- a/src/spell-realm/spells-hex.c
+++ b/src/spell-realm/spells-hex.c
@@ -1,6 +1,7 @@
 #include "spell-realm/spells-hex.h"
 #include "core/asking-player.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "player/player-effects.h" // todo 相互参照している.
 #include "player/player-skill.h"
 #include "realm/realm-hex-numbers.h"

diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c
index d506935..2e4bba6 100644 (file)
--- a/src/spell/process-effect.c
+++ b/src/spell/process-effect.c
@@ -10,6 +10,7 @@
 #include "game-option/special-options.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-describer.h"

diff --git a/src/spell/spells-diceroll.c b/src/spell/spells-diceroll.c
index 1fcca66..825c284 100644 (file)
--- a/src/spell/spells-diceroll.c
+++ b/src/spell/spells-diceroll.c
@@ -1,5 +1,6 @@
 #include "spell/spells-diceroll.h"
 #include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 690d4d3..d8be914 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -16,6 +16,7 @@
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "io/targeting.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "object-enchant/apply-magic.h"
 #include "object-enchant/artifact.h"

diff --git a/src/spell/spells-object.h b/src/spell/spells-object.h
index 6c7e5f4..92c8520 100644 (file)
--- a/src/spell/spells-object.h
+++ b/src/spell/spells-object.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/object-type-definition.h"
 
 bool create_ammo(player_type *creature_ptr);
 bool import_magic_device(player_type *creature_ptr);

diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index cf59805..95eb377 100644 (file)
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -6,6 +6,7 @@
 #include "inventory/player-inventory.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 39fc157..9bf6afa 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -49,6 +49,7 @@
 #include "monster-floor/monster-remover.h"
 #include "monster-floor/monster-summon.h"
 #include "monster-floor/place-monster-types.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "monster/monster-describer.h"

diff --git a/src/store/store-util.c b/src/store/store-util.c
index 258f97d..ef58d3e 100644 (file)
--- a/src/store/store-util.c
+++ b/src/store/store-util.c
@@ -5,6 +5,7 @@
  */
 
 #include "store/store-util.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags3.h"
 #include "object-enchant/apply-magic.h"
 #include "object-enchant/item-apply-magic.h"

diff --git a/src/store/store-util.h b/src/store/store-util.h
index ff2a1e8..feba2af 100644 (file)
--- a/src/store/store-util.h
+++ b/src/store/store-util.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/angband.h"
+#include "system/object-type-definition.h"
 
 #define STORE_OBJ_LEVEL 5 /* Magic Level for normal stores */
 

diff --git a/src/system/monster-type-definition.h b/src/system/monster-type-definition.h
index 1a6be75..7e26a00 100644 (file)
--- a/src/system/monster-type-definition.h
+++ b/src/system/monster-type-definition.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "monster/monster-timed-effect-types.h"
-#include "monster-race/monster-race.h"
 
 /*
  * Monster information, for a specific monster.
@@ -10,6 +9,7 @@
  * of objects (if any) being carried by the monster (see above).
  */
 typedef struct floor_type floor_type;
+typedef struct monster_race monster_race;
 typedef struct monster_type {
        MONRACE_IDX r_idx;              /* Monster race index 0 = dead. */
        MONRACE_IDX ap_r_idx;   /* Monster race appearance index */

diff --git a/src/view/display-lore-status.c b/src/view/display-lore-status.c
index c5530c9..d7ff56e 100644 (file)
--- a/src/view/display-lore-status.c
+++ b/src/view/display-lore-status.c
@@ -1,6 +1,7 @@
 #include "view/display-lore-status.h"
 #include "locale/japanese.h"
 #include "lore/lore-calculator.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/view/display-lore.c b/src/view/display-lore.c
index 6850a87..7d0e12e 100644 (file)
--- a/src/view/display-lore.c
+++ b/src/view/display-lore.c
@@ -10,6 +10,7 @@
 #include "locale/japanese.h"
 #include "lore/lore-calculator.h"
 #include "lore/monster-lore.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index e1d22a8..4ae5450 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -36,6 +36,7 @@
 #include "io/targeting.h"
 #include "main/sound-of-music.h"
 #include "market/arena-info-table.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster/monster-flag-types.h"

diff --git a/src/view/display-monster-status.c b/src/view/display-monster-status.c
index 26880ae..e7889e7 100644 (file)
--- a/src/view/display-monster-status.c
+++ b/src/view/display-monster-status.c
@@ -1,5 +1,6 @@
 #include "view/display-monster-status.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-info.h"
 #include "monster/smart-learn-types.h"

diff --git a/src/wizard/wizard-spoiler.c b/src/wizard/wizard-spoiler.c
index ea866a3..543abad 100644 (file)
--- a/src/wizard/wizard-spoiler.c
+++ b/src/wizard/wizard-spoiler.c
@@ -16,6 +16,7 @@
 #include "io/files-util.h"
 #include "io/input-key-acceptor.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags7.h"
 #include "object-enchant/artifact.h"

diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c
index 1dbe540..1306862 100644 (file)
--- a/src/world/world-movement-processor.c
+++ b/src/world/world-movement-processor.c
@@ -8,6 +8,7 @@
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "player/player-move.h"
 #include "view/display-main-window.h"