17 files changed, 36 insertions, 17 deletions
diff --git a/src/cmd1.cc b/src/cmd1.cc
index 698715a9..0b0c91ad 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -16,6 +16,7 @@
 #include "hooks.h"
 #include "mimic.hpp"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "quark.h"
 #include "skills.hpp"
 #include "spells1.hpp"
diff --git a/src/cmd2.cc b/src/cmd2.cc
index a67afc9d..d29e2bad 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -15,6 +15,7 @@
 #include "gods.hpp"
 #include "hooks.h"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "skills.hpp"
 #include "spells1.hpp"
 #include "spells2.hpp"
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 51d2b677..0f549f08 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -21,6 +21,7 @@
 #include "help.hpp"
 #include "hooks.h"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "modules.hpp"
 #include "notes.hpp"
 #include "powers.hpp"
diff --git a/src/externs.h b/src/externs.h
index dd15626f..49e09484 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -581,23 +581,6 @@ extern void process_monsters(void);
 extern void curse_equipment(int chance, int heavy_chance);
 extern void curse_equipment_dg(int chance, int heavy_chance);
 
-/* monster3.c */
-extern void dump_companions(FILE *outfile);
-extern void do_cmd_companion(void);
-extern bool_ do_control_reconnect(void);
-extern bool_ do_control_drop(void);
-extern bool_ do_control_magic(void);
-extern bool_ do_control_pickup(void);
-extern bool_ do_control_inven(void);
-extern bool_ do_control_walk(void);
-extern bool_ can_create_companion(void);
-extern void ai_deincarnate(int m_idx);
-extern bool_ ai_possessor(int m_idx, int o_idx);
-extern bool_ ai_multiply(int m_idx);
-extern bool_ change_side(monster_type *m_ptr);
-extern int is_friend(monster_type *m_ptr);
-extern bool_ is_enemy(monster_type *m_ptr, monster_type *t_ptr);
-
 /* object1.c */
 /* object2.c */
 extern byte get_item_letter_color(object_type *o_ptr);
diff --git a/src/files.cc b/src/files.cc
index 86d7b840..9765810a 100644
--- a/src/files.cc
+++ b/src/files.cc
@@ -14,6 +14,7 @@
 #include "hooks.h"
 #include "mimic.hpp"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "notes.hpp"
 #include "skills.hpp"
 #include "spells2.hpp"
diff --git a/src/melee1.cc b/src/melee1.cc
index 2d7cb3d2..28d21af1 100644
--- a/src/melee1.cc
+++ b/src/melee1.cc
@@ -11,6 +11,7 @@
 #include "cmd5.hpp"
 #include "mimic.hpp"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "skills.hpp"
 #include "spells1.hpp"
 #include "spells2.hpp"
diff --git a/src/melee2.cc b/src/melee2.cc
index 6cb1420d..bc0bfb0a 100644
--- a/src/melee2.cc
+++ b/src/melee2.cc
@@ -18,6 +18,7 @@
 #include "hooks.h"
 #include "messages.h"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "quark.h"
 #include "skills.hpp"
 #include "spells1.hpp"
diff --git a/src/monster2.cc b/src/monster2.cc
index f4b92921..e844b4a8 100644
--- a/src/monster2.cc
+++ b/src/monster2.cc
@@ -6,10 +6,12 @@
  * included in all such copies.
  */
 #include "monster2.hpp"
+
 #include "angband.h"
 #include "cave.hpp"
 #include "hooks.h"
 #include "mimic.hpp"
+#include "monster3.hpp"
 #include "randart.hpp"
 #include "spells1.hpp"
 #include "spells2.hpp"
diff --git a/src/monster3.cc b/src/monster3.cc
index 16d12f20..7012c6b5 100644
--- a/src/monster3.cc
+++ b/src/monster3.cc
@@ -6,6 +6,8 @@
  * included in all such copies.
  */
 
+#include "monster3.hpp"
+
 #include "angband.h"
 #include "cmd2.hpp"
 #include "gods.hpp"
diff --git a/src/monster3.hpp b/src/monster3.hpp
new file mode 100644
index 00000000..394c5c1d
--- /dev/null
+++ b/src/monster3.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "angband.h"
+
+extern void dump_companions(FILE *outfile);
+extern void do_cmd_companion(void);
+extern bool_ do_control_reconnect(void);
+extern bool_ do_control_drop(void);
+extern bool_ do_control_magic(void);
+extern bool_ do_control_pickup(void);
+extern bool_ do_control_inven(void);
+extern bool_ do_control_walk(void);
+extern bool_ can_create_companion(void);
+extern void ai_deincarnate(int m_idx);
+extern bool_ ai_possessor(int m_idx, int o_idx);
+extern bool_ ai_multiply(int m_idx);
+extern bool_ change_side(monster_type *m_ptr);
+extern int is_friend(monster_type *m_ptr);
+extern bool_ is_enemy(monster_type *m_ptr, monster_type *t_ptr);
diff --git a/src/powers.cc b/src/powers.cc
index e9afe984..8963e05b 100644
--- a/src/powers.cc
+++ b/src/powers.cc
@@ -15,6 +15,7 @@
 #include "hooks.h"
 #include "mimic.hpp"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "quark.h"
 #include "spells1.hpp"
 #include "spells2.hpp"
diff --git a/src/q_rand.cc b/src/q_rand.cc
index e0a1788d..4acd220b 100644
--- a/src/q_rand.cc
+++ b/src/q_rand.cc
@@ -4,6 +4,7 @@
 #include "hooks.h"
 #include "messages.h"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "skills.hpp"
 #include "util.hpp"
 
diff --git a/src/skills.cc b/src/skills.cc
index 3e11bfe4..ec48d8f7 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -16,6 +16,7 @@
 #include "help.hpp"
 #include "hooks.h"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "spells1.hpp"
 #include "spells4.hpp"
 #include "traps.hpp"
diff --git a/src/spells1.cc b/src/spells1.cc
index 9f3cc6b7..10d34240 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -14,6 +14,7 @@
 #include "cmd5.hpp"
 #include "gods.hpp"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "skills.hpp"
 #include "spell_type.hpp"
 #include "spells2.hpp"
diff --git a/src/spells2.cc b/src/spells2.cc
index 8157c818..2c1d0dc3 100644
--- a/src/spells2.cc
+++ b/src/spells2.cc
@@ -14,6 +14,7 @@
 #include "cmd7.hpp"
 #include "hooks.h"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "notes.hpp"
 #include "skills.hpp"
 #include "spells1.hpp"
diff --git a/src/spells3.cc b/src/spells3.cc
index ba4d8815..c7128754 100644
--- a/src/spells3.cc
+++ b/src/spells3.cc
@@ -5,6 +5,7 @@
 #include "cmd5.hpp"
 #include "mimic.hpp"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "skills.hpp"
 #include "spell_type.hpp"
 #include "spell_idx_list.hpp"
diff --git a/src/xtra2.cc b/src/xtra2.cc
index 1683acc7..435a2082 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -16,6 +16,7 @@
 #include "mimic.hpp"
 #include "monster1.hpp"
 #include "monster2.hpp"
+#include "monster3.hpp"
 #include "notes.hpp"
 #include "quark.h"
 #include "randart.hpp"