Move cmd3.cc function declarations to separate header

10 files changed, 35 insertions, 25 deletions

diff --git a/src/bldg.cc b/src/bldg.cc
index 1c9386cd..59d9fa60 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -14,6 +14,7 @@
  */
 
 #include "angband.h"
+#include "cmd3.hpp"
 #include "hooks.h"
 #include "mimic.hpp"
 #include "q_library.h"
diff --git a/src/cmd3.cc b/src/cmd3.cc
index 9084907b..5a41af1e 100644
--- a/src/cmd3.cc
+++ b/src/cmd3.cc
@@ -5,6 +5,7 @@
  * not for profit purposes provided that this copyright and statement are
  * included in all such copies.
  */
+#include "cmd3.hpp"
 
 #include "angband.h"
 #include "cave.hpp"
diff --git a/src/cmd3.hpp b/src/cmd3.hpp
new file mode 100644
index 00000000..ae0dcf61
--- /dev/null
+++ b/src/cmd3.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "angband.h"
+
+extern void do_cmd_html_dump(void);
+extern void cli_add(cptr active, cptr trigger, cptr descr);
+extern void do_cmd_cli(void);
+extern void do_cmd_cli_help(void);
+extern void do_cmd_inven(void);
+extern void do_cmd_equip(void);
+extern void do_cmd_wield(void);
+extern void do_cmd_takeoff(void);
+extern void do_cmd_drop(void);
+extern void do_cmd_destroy(void);
+extern void do_cmd_observe(void);
+extern void do_cmd_uninscribe(void);
+extern void do_cmd_inscribe(void);
+extern void do_cmd_refill(void);
+extern void do_cmd_target(void);
+extern void do_cmd_look(void);
+extern void do_cmd_locate(void);
+extern void do_cmd_query_symbol(void);
+extern bool_ do_cmd_sense_grid_mana(void);
+extern bool_ research_mon(void);
+extern s32b portable_hole_weight(void);
+extern void set_portable_hole_weight(void);
+extern void do_cmd_portable_hole(void);
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 8bd1fe77..4ca132d4 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -11,6 +11,7 @@
 #include "cave.hpp"
 #include "cmd1.hpp"
 #include "cmd2.hpp"
+#include "cmd3.hpp"
 #include "corrupt.hpp"
 #include "gods.hpp"
 #include "help.hpp"
diff --git a/src/externs.h b/src/externs.h
index 5f0c8b0f..08465398 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -462,31 +462,6 @@ extern const char *get_version_string();
 /* birth.c */
 extern bool_ no_begin_screen;
 
-/* cmd3.c */
-extern void do_cmd_html_dump(void);
-extern void cli_add(cptr active, cptr trigger, cptr descr);
-extern void do_cmd_cli(void);
-extern void do_cmd_cli_help(void);
-extern void do_cmd_inven(void);
-extern void do_cmd_equip(void);
-extern void do_cmd_wield(void);
-extern void do_cmd_takeoff(void);
-extern void do_cmd_drop(void);
-extern void do_cmd_destroy(void);
-extern void do_cmd_observe(void);
-extern void do_cmd_uninscribe(void);
-extern void do_cmd_inscribe(void);
-extern void do_cmd_refill(void);
-extern void do_cmd_target(void);
-extern void do_cmd_look(void);
-extern void do_cmd_locate(void);
-extern void do_cmd_query_symbol(void);
-extern bool_ do_cmd_sense_grid_mana(void);
-extern bool_ research_mon(void);
-extern s32b portable_hole_weight(void);
-extern void set_portable_hole_weight(void);
-extern void do_cmd_portable_hole(void);
-
 /* cmd4.c */
 extern bool_ change_option(cptr name, bool_ value);
 extern void macro_recorder_start(void);
diff --git a/src/files.cc b/src/files.cc
index 0c32794c..57f0ea99 100644
--- a/src/files.cc
+++ b/src/files.cc
@@ -9,6 +9,7 @@
 #include "angband.h"
 #include "cave.hpp"
 #include "corrupt.hpp"
+#include "cmd3.hpp"
 #include "hiscore.h"
 #include "hooks.h"
 #include "mimic.hpp"
diff --git a/src/skills.cc b/src/skills.cc
index 700405b8..9bbefd24 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -9,6 +9,7 @@
 #include "angband.h"
 #include "birth.hpp"
 #include "cmd2.hpp"
+#include "cmd3.hpp"
 #include "gods.hpp"
 #include "help.hpp"
 #include "hooks.h"
diff --git a/src/spells1.cc b/src/spells1.cc
index b5138e92..d8d4c2bb 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -9,6 +9,7 @@
 #include "angband.h"
 #include "cave.hpp"
 #include "cmd1.hpp"
+#include "cmd3.hpp"
 #include "gods.hpp"
 #include "skills.hpp"
 #include "spell_type.hpp"
diff --git a/src/store.cc b/src/store.cc
index 7f7bef88..610017ba 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -10,6 +10,7 @@
 
 #include "bldg.hpp"
 #include "cave.hpp"
+#include "cmd3.hpp"
 #include "hooks.h"
 #include "quark.h"
 #include "spell_type.hpp"
diff --git a/src/util.cc b/src/util.cc
index eec9bfa7..1c11e3bf 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -4,6 +4,7 @@
 
 #include "util.hpp"
 #include "angband.h"
+#include "cmd3.hpp"
 #include "messages.h"
 #include "quark.h"
 #include "xtra1.hpp"