From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 7 Jun 2020 13:00:25 +0000 (+0900)
Subject: [Refactor] #40014 Separated place-monster-types.h from monster.h
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8cf46f89006a48dedc638602226d6a55f5a89bce;p=hengband%2Fhengband.git

[Refactor] #40014 Separated place-monster-types.h from monster.h
---

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 270abeff5..f854d8128 100644
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -531,6 +531,7 @@
     <ClInclude Include="..\..\src\mind\snipe-types.h" />
     <ClInclude Include="..\..\src\monster-race\race-indice-types.h" />
     <ClInclude Include="..\..\src\monster\monster-flag-types.h" />
+    <ClInclude Include="..\..\src\monster\place-monster-types.h" />
     <ClInclude Include="..\..\src\monster\smart-learn-types.h" />
     <ClInclude Include="..\..\src\object-enchant\activation-info-table.h" />
     <ClInclude Include="..\..\src\object-enchant\dragon-breaths-table.h" />
@@ -1019,7 +1020,7 @@
     <ClInclude Include="..\..\src\room\rooms-city.h" />
     <ClInclude Include="..\..\src\room\rooms-fractal.h" />
     <ClInclude Include="..\..\src\room\rooms-normal.h" />
-    <ClInclude Include="..\..\src\room\room\rooms-pit-nest.h" />
+    <ClInclude Include="..\..\src\room\rooms-pit-nest.h" />
     <ClInclude Include="..\..\src\room\rooms-special.h" />
     <ClInclude Include="..\..\src\room\rooms-trap.h" />
     <ClInclude Include="..\..\src\room\rooms-vault.h" />
diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index d8f79f00c..c0578b390 100644
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1744,9 +1744,6 @@
     <ClInclude Include="..\..\src\room\rooms-normal.h">
       <Filter>room</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\room\room\rooms-pit-nest.h">
-      <Filter>room</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\room\rooms-special.h">
       <Filter>room</Filter>
     </ClInclude>
@@ -2695,6 +2692,12 @@
     <ClInclude Include="..\..\src\monster\smart-learn-types.h">
       <Filter>monster</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\monster\place-monster-types.h">
+      <Filter>monster</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\room\rooms-pit-nest.h">
+      <Filter>room</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />
diff --git a/src/Makefile.am b/src/Makefile.am
index 88aa61ca6..b76df0941 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -289,6 +289,7 @@ hengband_SOURCES = \
 	monster/monster-process.c monster/monster-process.h \
 	monster/monster-runaway.c monster/monster-runaway.h \
 	monster/monster-safety-hiding.c monster/monster-safety-hiding.h \
+	monster/place-monster-types.h \
 	monster/smart-learn-types.h \
 	monster/monster-status.c monster/monster-status.h \
 	monster/monster-sweep-grid.c monster/monster-sweep-grid.h \
diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index 2215e8d1f..be6eaed72 100644
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -19,6 +19,7 @@
 #include "main/sound-definitions-table.h"
 #include "monster/monster-process.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-type.h"
 #include "player/player-effects.h"
diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index 4a427a800..17a107544 100644
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -29,6 +29,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-info.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index bc38f70ed..0fc679786 100644
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -14,13 +14,13 @@
 #include "inventory/player-inventory.h"
 #include "io/files-util.h"
 #include "main/sound-definitions-table.h"
+#include "monster/place-monster-types.h"
 #include "object/item-use-flags.h"
-#include "perception/object-perception.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "object/object-kind.h"
 #include "object/object-info.h"
-#include "sv-definition/sv-scroll-types.h"
+#include "object/object-kind.h"
+#include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
@@ -30,18 +30,19 @@
 #include "spell-kind/spells-floor.h"
 #include "spell-kind/spells-genocide.h"
 #include "spell-kind/spells-grid.h"
-#include "spell-realm/spells-hex.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-neighbor.h"
-#include "spell/spells-object.h"
 #include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-teleport.h"
+#include "spell-realm/spells-hex.h"
+#include "spell/spells-object.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell-kind/spells-teleport.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
 #include "store/rumor.h"
+#include "sv-definition/sv-scroll-types.h"
 #include "util/util.h"
 #include "view/display-main-window.h"
 
diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index 4b7fd252e..c5bc7c54f 100644
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -5,31 +5,32 @@
 #include "inventory/inventory-object.h"
 #include "inventory/player-inventory.h"
 #include "main/sound-definitions-table.h"
+#include "monster/place-monster-types.h"
+#include "object-enchant/special-object-flags.h"
 #include "object/item-use-flags.h"
-#include "perception/object-perception.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
-#include "object/object-kind.h"
 #include "object/object-info.h"
-#include "object-enchant/special-object-flags.h"
-#include "sv-definition/sv-staff-types.h"
+#include "object/object-kind.h"
+#include "perception/object-perception.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-races-table.h"
 #include "player/player-status.h"
+#include "spell-kind/earthquake.h"
 #include "spell-kind/spells-detection.h"
 #include "spell-kind/spells-floor.h"
 #include "spell-kind/spells-genocide.h"
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-neighbor.h"
 #include "spell-kind/spells-sight.h"
+#include "spell-kind/spells-teleport.h"
 #include "spell/spells-staff-only.h"
 #include "spell/spells-status.h"
 #include "spell/spells-summon.h"
-#include "spell-kind/earthquake.h"
-#include "spell-kind/spells-teleport.h"
 #include "spell/spells3.h"
+#include "sv-definition/sv-staff-types.h"
 #include "util/util.h"
 #include "view/display-main-window.h"
 #include "view/object-describer.h"
diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index cba4ccac6..0b8d91aad 100644
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -38,6 +38,7 @@
 #include "main/sound-definitions-table.h"
 #include "mind/snipe-types.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/special-object-flags.h"
 #include "object-enchant/tr-types.h"
diff --git a/src/core/game-play.c b/src/core/game-play.c
index 5f5c335b8..79203076a 100644
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -40,6 +40,7 @@
 #include "market/bounty.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/creature.h"
+#include "monster/place-monster-types.h"
 #include "object/object-flavor.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index df69a9370..8d2f6a1b9 100644
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -10,6 +10,7 @@
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "mutation/mutation.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index 761c33624..bc3a7cb58 100644
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -1,6 +1,7 @@
 #include "effect/effect-item.h"
 #include "autopick/autopick.h"
 #include "floor/floor-object.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/tr-types.h"
 #include "object/object-broken.h"
diff --git a/src/floor/fixed-map-generator.c b/src/floor/fixed-map-generator.c
index 574905a7d..4fe073e3b 100644
--- 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/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/apply-magic.h"
 #include "object-enchant/artifact.h"
diff --git a/src/floor/floor-generate.c b/src/floor/floor-generate.c
index ff8f12add..f5355c7d4 100644
--- a/src/floor/floor-generate.c
+++ b/src/floor/floor-generate.c
@@ -31,6 +31,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/place-monster-types.h"
 #include "player/player-status.h"
 #include "room/rooms.h"
 #include "system/system-variables.h"
diff --git a/src/floor/floor.c b/src/floor/floor.c
index b93ca3998..482a28501 100644
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -7,12 +7,13 @@
 #include "floor/floor-object.h"
 #include "grid/grid.h"
 #include "grid/trap.h"
+#include "monster/place-monster-types.h"
 #include "object-enchant/artifact.h"
-#include "perception/object-perception.h"
+#include "object-enchant/special-object-flags.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object-enchant/special-object-flags.h"
+#include "perception/object-perception.h"
 #include "player/player-effects.h"
 #include "room/rooms.h"
 #include "world/world-object.h"
diff --git a/src/floor/wild.c b/src/floor/wild.c
index 8e56bddc5..ad5a6448e 100644
--- a/src/floor/wild.c
+++ b/src/floor/wild.c
@@ -23,6 +23,7 @@
 #include "main/init.h"
 #include "monster/monster-status.h"
 #include "monster/monster.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
diff --git a/src/grid/trap.c b/src/grid/trap.c
index 6d8a1b735..41dbd2672 100644
--- a/src/grid/trap.c
+++ b/src/grid/trap.c
@@ -14,6 +14,7 @@
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
 #include "mind/mind-mirror-master.h"
+#include "monster/place-monster-types.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index aa5509004..3a74c3b70 100644
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -1,6 +1,7 @@
 #include "inventory/inventory-curse.h"
 #include "art-definition/art-accessory-types.h"
 #include "io/files-util.h"
+#include "monster/place-monster-types.h"
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/object-curse.h"
 #include "object-enchant/special-object-flags.h"
diff --git a/src/mind/mind.c b/src/mind/mind.c
index aac79f534..dc23b5ed2 100644
--- a/src/mind/mind.c
+++ b/src/mind/mind.c
@@ -31,6 +31,7 @@
 #include "mind/mind-ninja.h"
 #include "mind/mind-warrior.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
diff --git a/src/monster/monster-process.c b/src/monster/monster-process.c
index 835bef925..ced6933de 100644
--- a/src/monster/monster-process.c
+++ b/src/monster/monster-process.c
@@ -28,6 +28,7 @@
 #include "monster/monster-status.h"
 #include "monster/monster-update.h"
 #include "monster/monster-util.h"
+#include "monster/place-monster-types.h"
 #include "monster/quantum-effect.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index c2eb17d45..e50ab1495 100644
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -19,6 +19,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-process.h"
 #include "monster/monster.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/object-curse.h"
diff --git a/src/monster/monster.h b/src/monster/monster.h
index a908e306b..cf5d9ca7b 100644
--- a/src/monster/monster.h
+++ b/src/monster/monster.h
@@ -71,22 +71,6 @@ typedef struct monster_type {
 	MONSTER_IDX parent_m_idx;
 } monster_type;
 
-/*
- * Bit flags for the place_monster_???() (etc)
- */
-#define PM_ALLOW_SLEEP    0x00000001    /*!< モンスター生成フラグ: 眠っている状態で生成されても良い */
-#define PM_ALLOW_GROUP    0x00000002    /*!< モンスター生成フラグ: 集団生成されても良い */
-#define PM_FORCE_FRIENDLY 0x00000004    /*!< モンスター生成フラグ: 必ず友好的に生成される */
-#define PM_FORCE_PET      0x00000008    /*!< モンスター生成フラグ: 必ずペットとして生成される */
-#define PM_NO_KAGE        0x00000010    /*!< モンスター生成フラグ: 必ずあやしい影としては生成されない */
-#define PM_NO_PET         0x00000020    /*!< モンスター生成フラグ: 必ずペットとして生成されない */
-#define PM_ALLOW_UNIQUE   0x00000040    /*!< モンスター生成フラグ: ユニークの選択生成を許可する */
-#define PM_IGNORE_TERRAIN 0x00000080    /*!< モンスター生成フラグ: 侵入可能地形を考慮せずに生成する */
-#define PM_HASTE          0x00000100    /*!< モンスター生成フラグ: 加速状態で生成する */
-#define PM_KAGE           0x00000200    /*!< モンスター生成フラグ: 必ずあやしい影として生成する */
-#define PM_MULTIPLY       0x00000400    /*!< モンスター生成フラグ: 増殖処理時として生成する */
-#define PM_JURAL          0x00000800    /*!< モンスター生成フラグ: ジュラル星人として誤認生成する */
-
 extern bool place_monster_aux(player_type *player_ptr, MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode);
 extern bool place_monster(player_type *player_ptr, POSITION y, POSITION x, BIT_FLAGS mode);
 extern bool alloc_horde(player_type *player_ptr, POSITION y, POSITION x);
diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 639549299..5f6f60c76 100644
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -35,6 +35,7 @@
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-damage-calculator.h"
diff --git a/src/monster/monster2.c b/src/monster/monster2.c
index be0399399..f641ff306 100644
--- a/src/monster/monster2.c
+++ b/src/monster/monster2.c
@@ -32,6 +32,7 @@
 #include "monster-race/monster-race.h"
 #include "monster/monster-flag-types.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object/object-flavor.h"
diff --git a/src/monster/place-monster-types.h b/src/monster/place-monster-types.h
new file mode 100644
index 000000000..51ba8f5f4
--- /dev/null
+++ b/src/monster/place-monster-types.h
@@ -0,0 +1,19 @@
+#pragma once
+
+/*
+ * Bit flags for the place_monster_???() (etc)
+ */
+typedef enum place_monster_type {
+	PM_ALLOW_SLEEP = 0x00000001, /*!< モンスター生成フラグ: 眠っている状態で生成されても良い */
+    PM_ALLOW_GROUP = 0x00000002, /*!< モンスター生成フラグ: 集団生成されても良い */
+    PM_FORCE_FRIENDLY = 0x00000004, /*!< モンスター生成フラグ: 必ず友好的に生成される */
+    PM_FORCE_PET = 0x00000008, /*!< モンスター生成フラグ: 必ずペットとして生成される */
+    PM_NO_KAGE = 0x00000010, /*!< モンスター生成フラグ: 必ずあやしい影としては生成されない */
+    PM_NO_PET = 0x00000020, /*!< モンスター生成フラグ: 必ずペットとして生成されない */
+    PM_ALLOW_UNIQUE = 0x00000040, /*!< モンスター生成フラグ: ユニークの選択生成を許可する */
+    PM_IGNORE_TERRAIN = 0x00000080, /*!< モンスター生成フラグ: 侵入可能地形を考慮せずに生成する */
+    PM_HASTE = 0x00000100, /*!< モンスター生成フラグ: 加速状態で生成する */
+    PM_KAGE = 0x00000200, /*!< モンスター生成フラグ: 必ずあやしい影として生成する */
+    PM_MULTIPLY = 0x00000400, /*!< モンスター生成フラグ: 増殖処理時として生成する */
+    PM_JURAL = 0x00000800, /*!< モンスター生成フラグ: ジュラル星人として誤認生成する */
+} place_monster_type;
diff --git a/src/mspell/mspell-summon.c b/src/mspell/mspell-summon.c
index 60151a207..10222cc77 100644
--- a/src/mspell/mspell-summon.c
+++ b/src/mspell/mspell-summon.c
@@ -2,6 +2,7 @@
 #include "effect/effect-characteristics.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mspell/mspell-util.h"
diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index 8c3e21763..9d0a286a3 100644
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -11,31 +11,32 @@
  */
 
 #include "system/angband.h"
+#include "cmd-action/cmd-spell.h"
+#include "cmd/cmd-basic.h"
 #include "core/stuff-handler.h"
-#include "util/util.h"
-#include "main/sound-definitions-table.h"
 #include "floor/floor.h"
 #include "grid/grid.h"
-#include "spell/spells-summon.h"
-#include "player/avatar.h"
-#include "spell/spells-status.h"
-#include "cmd-action/cmd-spell.h"
-#include "player/player-status.h"
-#include "mspell/monster-spell.h"
+#include "io/targeting.h"
+#include "main/sound-definitions-table.h"
 #include "monster/monster-status.h"
-#include "spell/spells-type.h"
-#include "cmd/cmd-basic.h"
+#include "monster/place-monster-types.h"
+#include "mspell/monster-spell.h"
+#include "mspell/mspell-damage-calculator.h"
+#include "mspell/mspell-type.h"
+#include "player/avatar.h"
 #include "player/player-effects.h"
-#include "io/targeting.h"
-#include "view/display-main-window.h"
+#include "player/player-status.h"
 #include "spell-kind/spells-launcher.h"
 #include "spell-kind/spells-lite.h"
 #include "spell-kind/spells-neighbor.h"
 #include "spell-kind/spells-sight.h"
 #include "spell-kind/spells-teleport.h"
+#include "spell/spells-status.h"
+#include "spell/spells-summon.h"
+#include "spell/spells-type.h"
 #include "spell/spells3.h"
-#include "mspell/mspell-type.h"
-#include "mspell/mspell-damage-calculator.h"
+#include "util/util.h"
+#include "view/display-main-window.h"
 
  /*!
   * @brief モンスター魔法をプレイヤーが使用する場合の換算レベル
diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index d9299009c..7f3fc02b2 100644
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -1,6 +1,7 @@
 #include "mutation/mutation-processor.h"
 #include "io/targeting.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "mutation/mutation.h"
 #include "object/lite-processor.h"
 #include "object/object-hook.h"
diff --git a/src/mutation/mutation.c b/src/mutation/mutation.c
index 95150935b..a394c54cb 100644
--- a/src/mutation/mutation.c
+++ b/src/mutation/mutation.c
@@ -24,6 +24,7 @@
 #include "mind/mind-warrior.h"
 #include "mind/racial-vampire.h"
 #include "monster/monster-flag-types.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "object-enchant/item-feeling.h"
 #include "object/object-hook.h"
diff --git a/src/player/patron.c b/src/player/patron.c
index 1812a1b0d..593234138 100644
--- a/src/player/patron.c
+++ b/src/player/patron.c
@@ -5,6 +5,7 @@
 #include "floor/floor.h"
 #include "io/write-diary.h"
 #include "monster-race/monster-race-hook.h"
+#include "monster/place-monster-types.h"
 #include "mutation/mutation.h"
 #include "object-enchant/object-curse.h"
 #include "object/object-flavor.h"
diff --git a/src/realm/realm-arcane.c b/src/realm/realm-arcane.c
index b460c6bad..2b28674f2 100644
--- a/src/realm/realm-arcane.c
+++ b/src/realm/realm-arcane.c
@@ -1,6 +1,7 @@
 #include "realm/realm-arcane.h"
 #include "cmd-action/cmd-spell.h"
 #include "io/targeting.h"
+#include "monster/place-monster-types.h"
 #include "player/avatar.h"
 #include "player/player-effects.h"
 #include "player/player-status.h"
diff --git a/src/realm/realm-craft.c b/src/realm/realm-craft.c
index a299df494..df7986084 100644
--- a/src/realm/realm-craft.c
+++ b/src/realm/realm-craft.c
@@ -1,17 +1,16 @@
-#include "system/angband.h"
-#include "util/util.h"
-
+#include "realm/realm-craft.h"
 #include "cmd-action/cmd-spell.h"
+#include "monster/place-monster-types.h"
+#include "mutation/mutation.h"
+#include "player/player-effects.h"
+#include "player/player-status.h"
 #include "player/selfinfo.h"
 #include "spell/range-calc.h"
 #include "spell/spells-object.h"
-#include "spell/spells-summon.h"
 #include "spell/spells-status.h"
-#include "mutation/mutation.h"
-#include "player/player-status.h"
-#include "player/player-effects.h"
-#include "realm/realm-craft.h"
+#include "spell/spells-summon.h"
 #include "spell/spells3.h"
+#include "util/util.h"
 
 /*!
 * @brief 匠領域魔法の各処理を行う
diff --git a/src/realm/realm-craft.h b/src/realm/realm-craft.h
index d99c834e9..5820a57a6 100644
--- a/src/realm/realm-craft.h
+++ b/src/realm/realm-craft.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "system/angband.h"
 #include "spell/spells-util.h"
 
 concptr do_craft_spell(player_type *caster_ptr, SPELL_IDX spell, spell_type mode);
diff --git a/src/realm/realm-crusade.c b/src/realm/realm-crusade.c
index 1ab8dcb6e..c3a993da6 100644
--- a/src/realm/realm-crusade.c
+++ b/src/realm/realm-crusade.c
@@ -3,6 +3,7 @@
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "io/targeting.h"
+#include "monster/place-monster-types.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "spell/process-effect.h"
diff --git a/src/realm/realm-daemon.c b/src/realm/realm-daemon.c
index 108becd1f..259e2c5f9 100644
--- a/src/realm/realm-daemon.c
+++ b/src/realm/realm-daemon.c
@@ -1,6 +1,7 @@
 #include "realm/realm-daemon.h"
 #include "cmd-action/cmd-spell.h"
 #include "io/targeting.h"
+#include "monster/place-monster-types.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index aac7ceb3f..112b9aeac 100644
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -4,6 +4,7 @@
 #include "effect/spells-effect-util.h"
 #include "floor/floor-object.h"
 #include "io/targeting.h"
+#include "monster/place-monster-types.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
 #include "player/avatar.h"
diff --git a/src/realm/realm-trump.c b/src/realm/realm-trump.c
index 7f08c4f42..fe4572b16 100644
--- a/src/realm/realm-trump.c
+++ b/src/realm/realm-trump.c
@@ -2,6 +2,7 @@
 #include "cmd-action/cmd-spell.h"
 #include "effect/spells-effect-util.h"
 #include "io/targeting.h"
+#include "monster/place-monster-types.h"
 #include "mutation/mutation.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
diff --git a/src/room/rooms-pit-nest.c b/src/room/rooms-pit-nest.c
index 354bbc247..f9e7029d0 100644
--- a/src/room/rooms-pit-nest.c
+++ b/src/room/rooms-pit-nest.c
@@ -1,17 +1,16 @@
-#include "system/angband.h"
-#include "util/util.h"
-
-#include "grid/grid.h"
-#include "floor/floor-generate.h"
-#include "rooms.h"
-#include "room/rooms-pit-nest.h"
-#include "monster/monster.h"
-#include "monster-race/monster-race-hook.h"
+#include "room/rooms-pit-nest.h"
 #include "core/sort.h"
+#include "dungeon/dungeon.h"
+#include "floor/floor-generate.h"
 #include "floor/floor.h"
 #include "grid/feature.h"
-#include "dungeon/dungeon.h"
+#include "grid/grid.h"
+#include "monster-race/monster-race-hook.h"
+#include "monster/monster.h"
+#include "monster/place-monster-types.h"
 #include "room/pit-nest-kinds-table.h"
+#include "rooms.h"
+#include "util/util.h"
 
 /*!
 * @brief ダンジョン毎に指定されたピット配列を基準にランダムなpit/nestタイプを決める
diff --git a/src/room/rooms-pit-nest.h b/src/room/rooms-pit-nest.h
index 3795c456e..a5c1ca768 100644
--- a/src/room/rooms-pit-nest.h
+++ b/src/room/rooms-pit-nest.h
@@ -1,4 +1,7 @@
-
+#pragma once 
+
+#include "system/angband.h"
+
 /*! デバッグ時にnestのモンスター情報を確認するための構造体 / A struct for nest monster information with cheat_hear */
 typedef struct
 {
@@ -7,6 +10,6 @@ typedef struct
 }
 nest_mon_info_type;
 
-extern bool build_type5(player_type *player_ptr);
-extern bool build_type6(player_type *player_ptr);
-extern bool build_type13(player_type *player_ptr);
+bool build_type5(player_type *player_ptr);
+bool build_type6(player_type *player_ptr);
+bool build_type13(player_type *player_ptr);
diff --git a/src/room/rooms-special.c b/src/room/rooms-special.c
index dcf0a8fd5..b070d945f 100644
--- a/src/room/rooms-special.c
+++ b/src/room/rooms-special.c
@@ -6,6 +6,7 @@
 #include "grid/grid.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/monster.h"
+#include "monster/place-monster-types.h"
 #include "object-enchant/item-apply-magic.h"
 #include "object/object-kind-hook.h"
 #include "room/rooms.h"
diff --git a/src/room/rooms-vault.c b/src/room/rooms-vault.c
index 3e8080d75..7fff29c4c 100644
--- a/src/room/rooms-vault.c
+++ b/src/room/rooms-vault.c
@@ -1,20 +1,25 @@
-#include "system/angband.h"
-#include "util/util.h"
-#include "room/rooms-vault.h"
+/*!
+ * @brief Vaultの生成処理
+ * @date 2018/09/11
+ * @author deskull
+ */
 
+#include "room/rooms-vault.h"
+#include "dungeon/dungeon.h"
 #include "floor/floor-generate.h"
-#include "grid/grid.h"
-#include "room/rooms.h"
-#include "store/store.h"
-#include "grid/trap.h"
-#include "monster/monster.h"
-#include "grid/feature.h"
 #include "floor/floor.h"
-#include "dungeon/dungeon.h"
 #include "floor/geometry.h"
 #include "floor/wild.h"
-#include "store/store-util.h"
+#include "grid/feature.h"
+#include "grid/grid.h"
+#include "grid/trap.h"
+#include "monster/monster.h"
+#include "monster/place-monster-types.h"
 #include "object-enchant/item-apply-magic.h"
+#include "room/rooms.h"
+#include "store/store-util.h"
+#include "store/store.h"
+#include "util/util.h"
 
 /*
  * The vault generation arrays
diff --git a/src/room/rooms-vault.h b/src/room/rooms-vault.h
index 2d91ac297..e29db9881 100644
--- a/src/room/rooms-vault.h
+++ b/src/room/rooms-vault.h
@@ -1,13 +1,8 @@
 #pragma once 
 
-/*
- * Information about "vault generation"
- */
+#include "system/angband.h"
 
-typedef struct vault_type vault_type;
-
-struct vault_type
-{
+typedef struct vault_type {
 	STR_OFFSET name;	/* Name (offset) */
 	STR_OFFSET text;	/* Text (offset) */
 
@@ -15,15 +10,14 @@ struct vault_type
 	PROB rat;			/* Vault rating (unused) */
 	POSITION hgt;		/* Vault height */
 	POSITION wid;		/* Vault width */
-};
+} vault_type;
 
 extern vault_type *v_info;
 extern char *v_name;
 extern char *v_text;
-
 extern VAULT_IDX max_v_idx;
 
-extern bool build_type7(player_type *player_ptr);
-extern bool build_type8(player_type *player_ptr);
-extern bool build_type10(player_type *player_ptr);
-extern bool build_type17(player_type *player_ptr);
+bool build_type7(player_type *player_ptr);
+bool build_type8(player_type *player_ptr);
+bool build_type10(player_type *player_ptr);
+bool build_type17(player_type *player_ptr);
diff --git a/src/room/rooms.c b/src/room/rooms.c
index 6d8c7d7bf..af92dc258 100644
--- a/src/room/rooms.c
+++ b/src/room/rooms.c
@@ -36,15 +36,15 @@
  * None of the pits/nests are allowed to include "unique" monsters.\n
  */
 
-#include "system/angband.h"
-#include "util/util.h"
-
-#include "grid/feature.h"
-#include "floor/floor.h"
-#include "floor/floor-generate.h"
-#include "dungeon/dungeon.h"
 #include "room/rooms.h"
-
+#include "dungeon/dungeon.h"
+#include "floor/floor-generate.h"
+#include "floor/floor.h"
+#include "grid/feature.h"
+#include "grid/trap.h"
+#include "monster/monster.h"
+#include "monster/place-monster-types.h"
+#include "object-enchant/item-apply-magic.h"
 #include "room/rooms-city.h"
 #include "room/rooms-fractal.h"
 #include "room/rooms-normal.h"
@@ -52,11 +52,7 @@
 #include "room/rooms-special.h"
 #include "room/rooms-trap.h"
 #include "room/rooms-vault.h"
-
-#include "grid/trap.h"
-
-#include "monster/monster.h"
-#include "object-enchant/item-apply-magic.h"
+#include "util/util.h"
 
  /*!
   * 各部屋タイプの生成比定義
diff --git a/src/room/rooms.h b/src/room/rooms.h
index cdcfa1a52..9c4dd8c9d 100644
--- a/src/room/rooms.h
+++ b/src/room/rooms.h
@@ -11,6 +11,7 @@
 
 #pragma once
 
+#include "system/angband.h"
 #include "grid/grid.h"
 
 #define ALLOW_CAVERNS_AND_LAKES
diff --git a/src/specific-object/chest.c b/src/specific-object/chest.c
index bcf584af5..04b610f5e 100644
--- a/src/specific-object/chest.c
+++ b/src/specific-object/chest.c
@@ -4,10 +4,10 @@
 #include "grid/grid.h"
 #include "grid/trap.h"
 #include "main/sound-definitions-table.h"
+#include "monster/place-monster-types.h"
 #include "object-enchant/item-apply-magic.h"
-#include "perception/object-perception.h"
 #include "object/object-generator.h"
-#include "sv-definition/sv-other-types.h"
+#include "perception/object-perception.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
@@ -17,6 +17,7 @@
 #include "spell/spells-summon.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
+#include "sv-definition/sv-other-types.h"
 #include "util/util.h"
 
 /*!< この値以降の小項目IDを持った箱は大型の箱としてドロップ数を増やす / Special "sval" limit -- first "large" chest */
diff --git a/src/spell-kind/spells-random.c b/src/spell-kind/spells-random.c
index f2475a11e..46de083a0 100644
--- a/src/spell-kind/spells-random.c
+++ b/src/spell-kind/spells-random.c
@@ -9,6 +9,7 @@
 #include "floor/floor.h"
 #include "io/targeting.h"
 #include "main/sound-definitions-table.h"
+#include "monster/place-monster-types.h"
 #include "mutation/mutation.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
diff --git a/src/spell-realm/spells-trump.c b/src/spell-realm/spells-trump.c
index db95b11a5..6a27d8909 100644
--- a/src/spell-realm/spells-trump.c
+++ b/src/spell-realm/spells-trump.c
@@ -1,6 +1,7 @@
 #include "spell-realm/spells-trump.h"
 #include "floor/floor.h"
 #include "io/targeting.h"
+#include "monster/place-monster-types.h"
 #include "mutation/mutation.h"
 #include "player/avatar.h"
 #include "player/player-effects.h"
diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index df461f13a..b3191996c 100644
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -5,6 +5,7 @@
 #include "inventory/player-inventory.h"
 #include "monster-race/race-indice-types.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "object/item-use-flags.h"
 #include "object/object-hook.h"
diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 9d2391e09..b951f5a31 100644
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -39,6 +39,7 @@
 #include "monster/monster-flag-types.h"
 #include "monster/monster-process.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "object-enchant/artifact.h"
diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index 7ab97ab3f..e32dc5128 100644
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -31,6 +31,7 @@
 #include "io/write-diary.h"
 #include "market/arena.h"
 #include "monster/monster-status.h"
+#include "monster/place-monster-types.h"
 #include "monster/smart-learn-types.h"
 #include "mspell/monster-spell.h"
 #include "mutation/mutation.h"