From: Hourier <hourier@users.sourceforge.jp>
Date: Tue, 2 Jun 2020 12:53:26 +0000 (+0900)
Subject: [Refactor] #40457 Moved sv-* from object/ to sv-definition/
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3831925d88638980afb1f3b0a1716bfa75fd7fea;p=hengband%2Fhengband.git

[Refactor] #40457 Moved sv-* from object/ to sv-definition/
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 43558e42c..9c2bb9689 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -318,12 +318,6 @@ hengband_SOURCES = \
 	object/object-util.h \
 	object/old-ego-extra-values.h \
 	object/special-object-flags.h \
-	object/sv-amulet-types.h object/sv-bow-types.h \
-	object/sv-digging-types.h object/sv-food-types.h \
-	object/sv-weapon-types.h object/sv-protector-types.h object/sv-armor-types.h \
-	object/sv-lite-types.h object/sv-potion-types.h object/sv-ring-types.h \
-	object/sv-rod-types.h object/sv-scroll-types.h \
-	object/sv-staff-types.h object/sv-wand-types.h object/sv-other-types.h \
 	object/item-feeling.h object/item-use-flags.h \
 	\
 	player/avatar.h player/avatar.c \
@@ -399,6 +393,15 @@ hengband_SOURCES = \
 	store/store-owners.c store/store-owners.h \
 	store/store-owner-comments.c store/store-owner-comments.h \
 	\
+	sv-definition/sv-amulet-types.h sv-definition/sv-armor-types.h \
+	sv-definition/sv-bow-types.h sv-definition/sv-digging-types.h \
+	sv-definition/sv-food-types.h sv-definition/sv-lite-types.h \
+	sv-definition/sv-potion-types.h sv-definition/sv-protector-types.h \
+	sv-definition/sv-ring-types.h sv-definition/sv-rod-types.h \
+	sv-definition/sv-scroll-types.h sv-definition/sv-staff-types.h \
+	sv-definition/sv-wand-types.h sv-definition/sv-weapon-types.h \
+	sv-definition/sv-other-types.h \
+	\
 	system/angband.h system/angband-version.h \
 	system/h-basic.h system/h-config.h \
 	system/h-define.h system/h-system.h system/h-type.h \
@@ -446,7 +449,8 @@ COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	-Iautopick -Ibirth -Icmd -Icmd-io -Icmd-item -Icombat -Icore -Idungeon \
 	-Ieffect -Ifloor -Igrid -Iinventory -Iio -Iio-dump -Iknowledge -Imarket \
 	-Imind -Imonster -Imspell -Imutation -Iobject -Ipet -Iplayer -Irealm \
-	-Iroom -Ispell -Isystem -Iterm -Iutil -Iview -Iwizard -Iworld
+	-Iroom -Ispell -Isv-definition -Isystem -Iterm -Iutil -Iview -Iwizard \
+	-Iworld
 
 install-exec-hook:
 if SET_GID
diff --git a/src/autopick/autopick-destroyer.c b/src/autopick/autopick-destroyer.c
index 7d8942b9a..70a91fe15 100644
--- a/src/autopick/autopick-destroyer.c
+++ b/src/autopick/autopick-destroyer.c
@@ -14,8 +14,8 @@
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
 #include "object/special-object-flags.h"
-#include "object/sv-other-types.h"
-#include "object/sv-wand-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-wand-types.h"
 #include "player/player-move.h"
 #include "player/player-races-table.h"
 
diff --git a/src/birth/birth-stat.c b/src/birth/birth-stat.c
index 6f3db3478..3b7edc6db 100644
--- a/src/birth/birth-stat.c
+++ b/src/birth/birth-stat.c
@@ -1,6 +1,6 @@
 #include "system/angband.h"
 #include "birth/birth-stat.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "player/player-personality.h"
 #include "player/player-personalities-table.h"
 #include "player/player-skill.h"
diff --git a/src/birth/initial-equipments-table.c b/src/birth/initial-equipments-table.c
index 1637786fb..fb897da46 100644
--- a/src/birth/initial-equipments-table.c
+++ b/src/birth/initial-equipments-table.c
@@ -1,13 +1,13 @@
 #include "system/angband.h"
 #include "birth/initial-equipments-table.h"
-#include "object/sv-armor-types.h"
-#include "object/sv-bow-types.h"
-#include "object/sv-food-types.h"
-#include "object/sv-potion-types.h"
-#include "object/sv-ring-types.h"
-#include "object/sv-scroll-types.h"
-#include "object/sv-wand-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-bow-types.h"
+#include "sv-definition/sv-food-types.h"
+#include "sv-definition/sv-potion-types.h"
+#include "sv-definition/sv-ring-types.h"
+#include "sv-definition/sv-scroll-types.h"
+#include "sv-definition/sv-wand-types.h"
+#include "sv-definition/sv-weapon-types.h"
 
 /*!
  * プレイヤーの職業毎の初期装備テーブル。/\n
diff --git a/src/birth/inventory-initializer.c b/src/birth/inventory-initializer.c
index 884edfc40..d1815f36b 100644
--- a/src/birth/inventory-initializer.c
+++ b/src/birth/inventory-initializer.c
@@ -12,16 +12,16 @@
 #include "object/object-kind.h"
 #include "object/object1.h"
 #include "object/object2.h"
-#include "object/sv-bow-types.h"
-#include "object/sv-food-types.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-other-types.h"
-#include "object/sv-potion-types.h"
-#include "object/sv-ring-types.h"
-#include "object/sv-scroll-types.h"
-#include "object/sv-staff-types.h"
-#include "object/sv-wand-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-bow-types.h"
+#include "sv-definition/sv-food-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-potion-types.h"
+#include "sv-definition/sv-ring-types.h"
+#include "sv-definition/sv-scroll-types.h"
+#include "sv-definition/sv-staff-types.h"
+#include "sv-definition/sv-wand-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "player/player-personalities-table.h"
 #include "player/player-races-table.h"
 
diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index f1afebb23..42987f73a 100644
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -21,8 +21,8 @@
 #include "object/object-ego.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-ring-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-ring-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index 1341b504a..332c99fa0 100644
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -18,8 +18,8 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"
-#include "object/sv-food-types.h"
-#include "object/sv-other-types.h"
+#include "sv-definition/sv-food-types.h"
+#include "sv-definition/sv-other-types.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"
diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index 34e65c0e9..263be96a6 100644
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -42,7 +42,7 @@
 #include "object/object-mark-types.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"
-#include "object/sv-lite-types.h"
+#include "sv-definition/sv-lite-types.h"
 #include "object/trc-types.h"
 #include "object/object-value.h"
 #include "player/avatar.h"
diff --git a/src/cmd-item/cmd-magiceat.c b/src/cmd-item/cmd-magiceat.c
index 1ed9c8b72..3b5c73671 100644
--- a/src/cmd-item/cmd-magiceat.c
+++ b/src/cmd-item/cmd-magiceat.c
@@ -60,8 +60,8 @@
 #include "main/sound-definitions-table.h"
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/sv-other-types.h"
-#include "object/sv-rod-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-rod-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-status.h"
diff --git a/src/cmd-item/cmd-quaff.c b/src/cmd-item/cmd-quaff.c
index b40dadbdf..9fa6770ff 100644
--- a/src/cmd-item/cmd-quaff.c
+++ b/src/cmd-item/cmd-quaff.c
@@ -18,7 +18,7 @@
 #include "object/object-generator.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/sv-potion-types.h"
+#include "sv-definition/sv-potion-types.h"
 #include "player/avatar.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"
diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index 664d9531a..21fdaf9c1 100644
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -18,7 +18,7 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-kind.h"
-#include "object/sv-scroll-types.h"
+#include "sv-definition/sv-scroll-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index 1ca3b9fa1..0649df307 100644
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -11,7 +11,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"
-#include "object/sv-staff-types.h"
+#include "sv-definition/sv-staff-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c
index 11ec3cea7..ccefb4fab 100644
--- a/src/cmd-item/cmd-zaprod.c
+++ b/src/cmd-item/cmd-zaprod.c
@@ -9,8 +9,8 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"
-#include "object/sv-other-types.h"
-#include "object/sv-rod-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-rod-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
diff --git a/src/cmd-item/cmd-zapwand.c b/src/cmd-item/cmd-zapwand.c
index 54f22a8ee..29050ca35 100644
--- a/src/cmd-item/cmd-zapwand.c
+++ b/src/cmd-item/cmd-zapwand.c
@@ -10,7 +10,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"
-#include "object/sv-wand-types.h"
+#include "sv-definition/sv-wand-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 8d1b0241e..5327eb739 100644
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -46,7 +46,7 @@
 #include "object/object-kind.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"
-#include "object/sv-bow-types.h"
+#include "sv-definition/sv-bow-types.h"
 #include "object/torch.h"
 #include "object/tr-types.h"
 #include "player/avatar.h"
diff --git a/src/combat/attack-accuracy.c b/src/combat/attack-accuracy.c
index adcdea0d2..8efcd57c5 100644
--- a/src/combat/attack-accuracy.c
+++ b/src/combat/attack-accuracy.c
@@ -1,7 +1,7 @@
 #include "combat/attack-accuracy.h"
 #include "main/sound-definitions-table.h"
 #include "object/death-scythe.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-weapon-types.h"
 
 /*!
  * @brief プレイヤーからモンスターへの打撃命中判定 /
diff --git a/src/combat/attack-criticality.c b/src/combat/attack-criticality.c
index e9a814262..e6f5ea3f0 100644
--- a/src/combat/attack-criticality.c
+++ b/src/combat/attack-criticality.c
@@ -1,6 +1,6 @@
 #include "combat/combat-options-type.h"
 #include "combat/attack-criticality.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-weapon-types.h"
 
 /*!
 * @brief プレイヤーからモンスターへの打撃クリティカル判定 /
diff --git a/src/combat/player-attack.c b/src/combat/player-attack.c
index fbd5bbef1..17de1a33b 100644
--- a/src/combat/player-attack.c
+++ b/src/combat/player-attack.c
@@ -23,7 +23,7 @@
 #include "object/artifact.h"
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-skill.h"
diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index dab684f69..4f9591bf8 100644
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -18,7 +18,7 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
-#include "object/sv-bow-types.h"
+#include "sv-definition/sv-bow-types.h"
 #include "object/tr-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
diff --git a/src/core/game-play.c b/src/core/game-play.c
index 7e2f78af2..53a2f0df8 100644
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -33,7 +33,7 @@
 #include "store/store-util.h"
 #include "store/store.h"
 #include "object/object-flavor.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
 #include "player/player-personalities-table.h"
diff --git a/src/dungeon/dungeon-file.c b/src/dungeon/dungeon-file.c
index f70198fbd..2fb4134f8 100644
--- a/src/dungeon/dungeon-file.c
+++ b/src/dungeon/dungeon-file.c
@@ -57,7 +57,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
 #include "object/object2.h"
-#include "object/sv-scroll-types.h"
+#include "sv-definition/sv-scroll-types.h"
 #include "object/tr-types.h"
 #include "player/player-class.h"
 #include "player/player-race.h"
diff --git a/src/effect/effect-item.c b/src/effect/effect-item.c
index d048dc929..7a8f4fea2 100644
--- a/src/effect/effect-item.c
+++ b/src/effect/effect-item.c
@@ -6,8 +6,8 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/object-mark-types.h"
-#include "object/sv-other-types.h"
-#include "object/sv-scroll-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-scroll-types.h"
 #include "object/tr-types.h"
 #include "spell/spells-type.h"
 #include "spell/spells3.h"
diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index ca8cd8fc1..411b8e0a8 100644
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -22,7 +22,7 @@
 #include "spell/spells3.h"
 #include "object/object-generator.h"
 #include "object/special-object-flags.h"
-#include "object/sv-other-types.h"
+#include "sv-definition/sv-other-types.h"
 
 /*!
  * @brief ビーム/ボルト/ボール系魔法によるモンスターへの効果があるかないかを判定する
diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index ee2497177..0a5ce8213 100644
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -13,9 +13,9 @@
 #include "object/object-mark-types.h"
 #include "object/object-value.h"
 #include "object/special-object-flags.h"
-#include "object/sv-amulet-types.h"
-#include "object/sv-protector-types.h"
-#include "object/sv-ring-types.h"
+#include "sv-definition/sv-amulet-types.h"
+#include "sv-definition/sv-protector-types.h"
+#include "sv-definition/sv-ring-types.h"
 #include "player/player-effects.h"
 #include "player/player-move.h"
 #include "util/util.h"
diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index da4d2671e..24cc2dfa5 100644
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -9,7 +9,7 @@
 #include "object/object-kind.h"
 #include "object/object-mark-types.h"
 #include "object/object1.h"
-#include "object/sv-other-types.h"
+#include "sv-definition/sv-other-types.h"
 #include "player/player-move.h"
 #include "term/gameterm.h"
 #include "util/util.h"
diff --git a/src/io/load.c b/src/io/load.c
index 25abe5bb3..4525ffef3 100644
--- a/src/io/load.c
+++ b/src/io/load.c
@@ -73,8 +73,8 @@
 #include "object/object2.h"
 #include "object/old-ego-extra-values.h" // TODO v1.5.0以前のセーブファイルをロードする処理を分離する.
 #include "object/object-value.h"
-#include "object/sv-armor-types.h"
-#include "object/sv-lite-types.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-lite-types.h"
 #include "object/tr-types.h"
 #include "object/trc-types.h"
 #include "pet/pet-util.h"
diff --git a/src/knowledge/knowledge-experiences.c b/src/knowledge/knowledge-experiences.c
index 3d550e08f..ab232409f 100644
--- a/src/knowledge/knowledge-experiences.c
+++ b/src/knowledge/knowledge-experiences.c
@@ -9,7 +9,7 @@
 #include "io-dump/dump-util.h"
 #include "object/object-flavor.h"
 #include "object/object-kind.h"
-#include "object/sv-bow-types.h"
+#include "sv-definition/sv-bow-types.h"
 #include "player/player-skill.h"
 #include "spell/spells-execution.h"
 #include "spell/spells-util.h"
diff --git a/src/knowledge/knowledge-inventory.c b/src/knowledge/knowledge-inventory.c
index 4edfcc264..06ee13525 100644
--- a/src/knowledge/knowledge-inventory.c
+++ b/src/knowledge/knowledge-inventory.c
@@ -12,9 +12,9 @@
 #include "object/object-flavor.h"
 #include "object/object-hook.h"
 #include "object/special-object-flags.h"
-#include "object/sv-amulet-types.h"
-#include "object/sv-protector-types.h"
-#include "object/sv-ring-types.h"
+#include "sv-definition/sv-amulet-types.h"
+#include "sv-definition/sv-protector-types.h"
+#include "sv-definition/sv-ring-types.h"
 #include "object/tr-types.h"
 #include "store/store-util.h"
 
diff --git a/src/market/arena-info-table.c b/src/market/arena-info-table.c
index 456827823..11885f576 100644
--- a/src/market/arena-info-table.c
+++ b/src/market/arena-info-table.c
@@ -1,13 +1,13 @@
 #include "system/angband.h"
 #include "arena-info-table.h"
-#include "object/sv-amulet-types.h"
-#include "object/sv-food-types.h"
-#include "object/sv-potion-types.h"
-#include "object/sv-ring-types.h"
-#include "object/sv-rod-types.h"
-#include "object/sv-scroll-types.h"
-#include "object/sv-staff-types.h"
-#include "object/sv-wand-types.h"
+#include "sv-definition/sv-amulet-types.h"
+#include "sv-definition/sv-food-types.h"
+#include "sv-definition/sv-potion-types.h"
+#include "sv-definition/sv-ring-types.h"
+#include "sv-definition/sv-rod-types.h"
+#include "sv-definition/sv-scroll-types.h"
+#include "sv-definition/sv-staff-types.h"
+#include "sv-definition/sv-wand-types.h"
 
 /*!
  * @brief 闘技場のモンスターID及び報酬アイテムテーブル
diff --git a/src/market/articles-on-sale.c b/src/market/articles-on-sale.c
index 19da87cd6..7ec8cf84b 100644
--- a/src/market/articles-on-sale.c
+++ b/src/market/articles-on-sale.c
@@ -1,18 +1,18 @@
 #include "market/articles-on-sale.h"
-#include "object/sv-amulet-types.h"
-#include "object/sv-armor-types.h"
-#include "object/sv-bow-types.h"
-#include "object/sv-digging-types.h"
-#include "object/sv-food-types.h"
-#include "object/sv-other-types.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-potion-types.h"
-#include "object/sv-protector-types.h"
-#include "object/sv-scroll-types.h"
-#include "object/sv-ring-types.h"
-#include "object/sv-staff-types.h"
-#include "object/sv-wand-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-amulet-types.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-bow-types.h"
+#include "sv-definition/sv-digging-types.h"
+#include "sv-definition/sv-food-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-potion-types.h"
+#include "sv-definition/sv-protector-types.h"
+#include "sv-definition/sv-scroll-types.h"
+#include "sv-definition/sv-ring-types.h"
+#include "sv-definition/sv-staff-types.h"
+#include "sv-definition/sv-wand-types.h"
+#include "sv-definition/sv-weapon-types.h"
 
 /*!
  * 店舗で販売するオブジェクトを定義する / Hack -- Objects sold in the stores -- by tval/sval pair.
diff --git a/src/market/bounty-prize-table.c b/src/market/bounty-prize-table.c
index 5bcb4734d..573f00683 100644
--- a/src/market/bounty-prize-table.c
+++ b/src/market/bounty-prize-table.c
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "market/bounty-prize-table.h"
-#include "object/sv-potion-types.h"
-#include "object/sv-scroll-types.h"
+#include "sv-definition/sv-potion-types.h"
+#include "sv-definition/sv-scroll-types.h"
 
 bounty_prize_type prize_list[MAX_BOUNTY] = {
     { TV_POTION, SV_POTION_CURING },
diff --git a/src/market/bounty.c b/src/market/bounty.c
index ae3100b03..7ffe7eb3b 100644
--- a/src/market/bounty.c
+++ b/src/market/bounty.c
@@ -13,7 +13,7 @@
 #include "object/object-kind-hook.h"
 #include "object/object-generator.h"
 #include "object/object2.h"
-#include "object/sv-other-types.h"
+#include "sv-definition/sv-other-types.h"
 #include "player/avatar.h"
 #include "term/gameterm.h"
 #include "world/world.h"
diff --git a/src/market/building-craft-fix.c b/src/market/building-craft-fix.c
index 78c4cba02..72ec882bc 100644
--- a/src/market/building-craft-fix.c
+++ b/src/market/building-craft-fix.c
@@ -12,8 +12,8 @@
 #include "object/object-kind.h"
 #include "object/object-value.h"
 #include "object/special-object-flags.h"
-#include "object/sv-other-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "player/player-effects.h"
 
diff --git a/src/market/building-craft-weapon.c b/src/market/building-craft-weapon.c
index 3ca9d9939..7e1510af2 100644
--- a/src/market/building-craft-weapon.c
+++ b/src/market/building-craft-weapon.c
@@ -9,7 +9,7 @@
 #include "object/object-flavor.h"
 #include "object/object-generator.h"
 #include "object/object-hook.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "realm/realm-hex.h"
 #include "term/gameterm.h"
diff --git a/src/monster/monster1.c b/src/monster/monster1.c
index 0d347ca11..9251ccc2c 100644
--- a/src/monster/monster1.c
+++ b/src/monster/monster1.c
@@ -45,10 +45,10 @@
 #include "mspell/mspell-damage-calculator.h"
 #include "combat/monster-attack-types.h"
 #include "combat/monster-attack-effect.h"
-#include "object/sv-other-types.h"
-#include "object/sv-protector-types.h"
-#include "object/sv-scroll-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-protector-types.h"
+#include "sv-definition/sv-scroll-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/object2.h"
 #include "object/object-generator.h"
 
diff --git a/src/object/artifact.c b/src/object/artifact.c
index 8b91e87a3..4e97c8cff 100644
--- a/src/object/artifact.c
+++ b/src/object/artifact.c
@@ -30,8 +30,8 @@
 #include "object/object1.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"
-#include "object/sv-armor-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "object/trc-types.h"
 #include "player/avatar.h"
diff --git a/src/object/bow.c b/src/object/bow.c
index 9267eb0a1..8cba7be75 100644
--- a/src/object/bow.c
+++ b/src/object/bow.c
@@ -1,5 +1,5 @@
 #include "object/bow.h"
-#include "object/sv-bow-types.h"
+#include "sv-definition/sv-bow-types.h"
 
 /*!
  * @brief 射撃武器に対応する矢/弾薬のベースアイテムIDを返す /
diff --git a/src/object/chest.c b/src/object/chest.c
index 2069865cb..c9671cef2 100644
--- a/src/object/chest.c
+++ b/src/object/chest.c
@@ -7,7 +7,7 @@
 #include "object/item-apply-magic.h"
 #include "object/object-appraiser.h"
 #include "object/object-generator.h"
-#include "object/sv-other-types.h"
+#include "sv-definition/sv-other-types.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
diff --git a/src/object/lite-processor.c b/src/object/lite-processor.c
index b72098cc8..61c02e63b 100644
--- a/src/object/lite-processor.c
+++ b/src/object/lite-processor.c
@@ -2,7 +2,7 @@
 #include "object/lite-processor.h"
 #include "object/object-ego.h"
 #include "object/object-hook.h"
-#include "object/sv-lite-types.h"
+#include "sv-definition/sv-lite-types.h"
 #include "player/player-move.h"
 #include "world/world.h"
 
diff --git a/src/object/object-broken.c b/src/object/object-broken.c
index 63cb0940c..34aca5eaf 100644
--- a/src/object/object-broken.c
+++ b/src/object/object-broken.c
@@ -8,7 +8,7 @@
 #include "effect/effect-characteristics.h"
 #include "object/object-kind.h"
 #include "object/object2.h"
-#include "object/sv-potion-types.h"
+#include "sv-definition/sv-potion-types.h"
 #include "object/tr-types.h"
 #include "spell/process-effect.h"
 #include "spell/spells-type.h"
diff --git a/src/object/object-flavor.c b/src/object/object-flavor.c
index 8c19e4964..9a0aae3cd 100644
--- a/src/object/object-flavor.c
+++ b/src/object/object-flavor.c
@@ -22,8 +22,8 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"
-#include "object/sv-food-types.h"
-#include "object/sv-lite-types.h"
+#include "sv-definition/sv-food-types.h"
+#include "sv-definition/sv-lite-types.h"
 #include "object/tr-types.h"
 #include "player/player-class.h"
 #include "player/player-status.h"
diff --git a/src/object/object-hook.c b/src/object/object-hook.c
index eed7aadfc..041b2deb0 100644
--- a/src/object/object-hook.c
+++ b/src/object/object-hook.c
@@ -13,11 +13,11 @@
 #include "object/object-appraiser.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"
-#include "object/sv-armor-types.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-other-types.h"
-#include "object/sv-protector-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-protector-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "player/mimic-info-table.h"
 #include "player/player-class.h"
diff --git a/src/object/object-kind-hook.c b/src/object/object-kind-hook.c
index 808ec693a..23285d1e7 100644
--- a/src/object/object-kind-hook.c
+++ b/src/object/object-kind-hook.c
@@ -6,9 +6,9 @@
 
 #include "object/object-kind-hook.h"
 #include "object/object-kind.h"
-#include "object/sv-amulet-types.h"
-#include "object/sv-other-types.h"
-#include "object/sv-ring-types.h"
+#include "sv-definition/sv-amulet-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-ring-types.h"
 
 /*
  * Special "sval" limit -- first "good" magic/prayer book
diff --git a/src/object/object1.c b/src/object/object1.c
index 067524f86..316433d4a 100644
--- a/src/object/object1.c
+++ b/src/object/object1.c
@@ -28,11 +28,11 @@
 #include "object/object-hook.h"
 #include "object/object-kind.h"
 #include "object/special-object-flags.h"
-#include "object/sv-amulet-types.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-other-types.h"
-#include "object/sv-ring-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-amulet-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-ring-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "object/trc-types.h"
 #include "player/player-class.h"
diff --git a/src/object/object2.c b/src/object/object2.c
index 4aff4f3b5..9e59b8a49 100644
--- a/src/object/object2.c
+++ b/src/object/object2.c
@@ -35,13 +35,13 @@
 #include "object/object-mark-types.h"
 #include "object/object-value.h" // 暫定、相互参照している.
 #include "object/special-object-flags.h"
-#include "object/sv-amulet-types.h"
-#include "object/sv-armor-types.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-other-types.h"
-#include "object/sv-protector-types.h"
-#include "object/sv-ring-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-amulet-types.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-protector-types.h"
+#include "sv-definition/sv-ring-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/trc-types.h"
 #include "player/player-class.h"
 #include "player/player-effects.h"
diff --git a/src/object/torch.c b/src/object/torch.c
index 9fe7a1f13..a182a8c03 100644
--- a/src/object/torch.c
+++ b/src/object/torch.c
@@ -1,5 +1,5 @@
 #include "object/torch.h"
-#include "object/sv-lite-types.h"
+#include "sv-definition/sv-lite-types.h"
 #include "object/tr-types.h"
 
 /*!
diff --git a/src/player/player-effects.c b/src/player/player-effects.c
index 22a58efdd..46b711737 100644
--- a/src/player/player-effects.c
+++ b/src/player/player-effects.c
@@ -43,9 +43,9 @@
 #include "object/object-value.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"
-#include "object/sv-armor-types.h"
-#include "object/sv-protector-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-armor-types.h"
+#include "sv-definition/sv-protector-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "player/avatar.h"
 #include "player/player-class.h"
 #include "player/player-damage.h"
diff --git a/src/player/player-status.c b/src/player/player-status.c
index 5ea1cd9fc..3484c4660 100644
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -34,8 +34,8 @@
 #include "object/object-mark-types.h"
 #include "object/object1.h"
 #include "object/special-object-flags.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "object/trc-types.h"
 #include "pet/pet-util.h"
diff --git a/src/realm/realm-nature.c b/src/realm/realm-nature.c
index 41c8117a1..98836fd30 100644
--- a/src/realm/realm-nature.c
+++ b/src/realm/realm-nature.c
@@ -6,7 +6,7 @@
 #include "io/targeting.h"
 #include "object/object-generator.h"
 #include "object/object-kind-hook.h"
-#include "object/sv-food-types.h"
+#include "sv-definition/sv-food-types.h"
 #include "player/avatar.h"
 #include "player/player-damage.h"
 #include "player/player-effects.h"
diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 8754cb492..6a9c8922f 100644
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -27,12 +27,12 @@
 #include "object/object-kind.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-other-types.h"
-#include "object/sv-protector-types.h"
-#include "object/sv-scroll-types.h"
-#include "object/sv-staff-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-other-types.h"
+#include "sv-definition/sv-protector-types.h"
+#include "sv-definition/sv-scroll-types.h"
+#include "sv-definition/sv-staff-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "object/trc-types.h"
 #include "player/avatar.h"
diff --git a/src/spell/spells-summon.c b/src/spell/spells-summon.c
index db70b0250..d1e841bc6 100644
--- a/src/spell/spells-summon.c
+++ b/src/spell/spells-summon.c
@@ -6,7 +6,7 @@
 #include "monster/monster-status.h"
 #include "object/item-use-flags.h"
 #include "object/object-hook.h"
-#include "object/sv-other-types.h"
+#include "sv-definition/sv-other-types.h"
 #include "spell/spells2.h"
 
 /*!
diff --git a/src/spell/spells2.c b/src/spell/spells2.c
index 53bb4c14a..3da499ed8 100644
--- a/src/spell/spells2.c
+++ b/src/spell/spells2.c
@@ -44,7 +44,7 @@
 #include "object/object-mark-types.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"
-#include "object/sv-food-types.h"
+#include "sv-definition/sv-food-types.h"
 #include "pet/pet-fall-off.h"
 #include "pet/pet-util.h"
 #include "player/avatar.h"
diff --git a/src/store/store-util.c b/src/store/store-util.c
index cc6482c90..531742b75 100644
--- a/src/store/store-util.c
+++ b/src/store/store-util.c
@@ -14,10 +14,10 @@
 #include "object/object-value.h"
 #include "object/object2.h"
 #include "object/special-object-flags.h"
-#include "object/sv-lite-types.h"
-#include "object/sv-potion-types.h"
-#include "object/sv-scroll-types.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-lite-types.h"
+#include "sv-definition/sv-potion-types.h"
+#include "sv-definition/sv-scroll-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 
 int cur_store_num = 0;
diff --git a/src/view/display-player-middle.c b/src/view/display-player-middle.c
index 088f2c552..1978d1cbd 100644
--- a/src/view/display-player-middle.c
+++ b/src/view/display-player-middle.c
@@ -2,7 +2,7 @@
 #include "floor/floor.h"
 #include "object/object-appraiser.h"
 #include "object/special-object-flags.h"
-#include "object/sv-bow-types.h"
+#include "sv-definition/sv-bow-types.h"
 #include "player/player-effects.h"
 #include "player/player-races-table.h"
 #include "player/player-skill.h"
diff --git a/src/view/status-first-page.c b/src/view/status-first-page.c
index 4298a5169..7b74dae9a 100644
--- a/src/view/status-first-page.c
+++ b/src/view/status-first-page.c
@@ -13,7 +13,7 @@
 #include "object/object-appraiser.h"
 #include "object/object1.h"
 #include "object/special-object-flags.h"
-#include "object/sv-weapon-types.h"
+#include "sv-definition/sv-weapon-types.h"
 #include "object/tr-types.h"
 #include "term/gameterm.h"