Move modules.cc "C" linkage declarations to separate header file

4 files changed, 19 insertions, 6 deletions

diff --git a/src/externs.h b/src/externs.h
index d17890ca..333ae848 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -476,9 +476,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);
 
-/* main.c */
-extern bool_ private_check_user_directory(cptr dirpath);
-
 /*
  * Hack -- conditional (or "bizarre") externs
  */
@@ -487,6 +484,3 @@ extern bool_ private_check_user_directory(cptr dirpath);
 /* util.c */
 extern void user_name(char *buf, int id);
 #endif
-
-/* modules.cc */
-extern cptr force_module;
diff --git a/src/main.c b/src/main.c
index 17354fb2..7996bfcb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,6 +12,7 @@
 #include "dungeon.h"
 #include "files.h"
 #include "init2.h"
+#include "modules.h"
 #include "script.h"
 #include "util.h"
 
diff --git a/src/modules.cc b/src/modules.cc
index 5fa9045c..300c862a 100644
--- a/src/modules.cc
+++ b/src/modules.cc
@@ -6,6 +6,9 @@
  * included in all such copies.
  */
 
+#include "modules.hpp"
+#include "modules.h"
+
 #include "angband.h"
 #include "birth.hpp"
 #include "corrupt.hpp"
diff --git a/src/modules.h b/src/modules.h
new file mode 100644
index 00000000..8a3b88b0
--- /dev/null
+++ b/src/modules.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "h-basic.h"
+
+// C linkage required for these functions since main-* code uses them.
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern bool_ private_check_user_directory(cptr dirpath);
+extern cptr force_module;
+
+#ifdef __cplusplus
+} // extern "C"
+#endif