Move birth.cc function declarations to separate header

We leave the no_begin_screen variable because it needs
to be accessed by non-C++ code.

8 files changed, 16 insertions, 18 deletions

diff --git a/src/birth.cc b/src/birth.cc
index 21f1f5bf..458b2049 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -5,6 +5,7 @@
  * not for profit purposes provided that this copyright and statement are
  * included in all such copies.
  */
+#include "birth.hpp"
 
 #include "angband.h"
 #include "corrupt.hpp"
@@ -586,7 +587,7 @@ static void get_history(void)
 /*
  * Fill the random_artifacts array with relevant info.
  */
-errr init_randart(void)
+static errr init_randart(void)
 {
 	int i;
 
diff --git a/src/birth.hpp b/src/birth.hpp
new file mode 100644
index 00000000..6947a427
--- /dev/null
+++ b/src/birth.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "angband.h"
+
+extern void print_desc_aux(cptr txt, int y, int x);
+extern void save_savefile_names(void);
+extern bool_ begin_screen(void);
+extern void get_height_weight(void);
+extern void player_birth(void);
diff --git a/src/cmd5.cc b/src/cmd5.cc
index 0f567a5b..97e972d0 100644
--- a/src/cmd5.cc
+++ b/src/cmd5.cc
@@ -7,6 +7,7 @@
  */
 
 #include "angband.h"
+#include "birth.hpp"
 #include "corrupt.hpp"
 #include "skills.hpp"
 #include "spell_type.hpp"
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 3848d4dd..5a669aac 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -1,7 +1,3 @@
-/* File: dungeon.c */
-
-/* Purpose: Angband game engine */
-
 /*
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
  *
@@ -11,6 +7,7 @@
  */
 
 #include "angband.h"
+#include "birth.hpp"
 #include "corrupt.hpp"
 #include "gods.hpp"
 #include "hooks.h"
diff --git a/src/externs.h b/src/externs.h
index 3a44201f..6241bef2 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -470,13 +470,7 @@ extern void help_skill(cptr skill);
 extern void help_ability(cptr ability);
 
 /* birth.c */
-extern void print_desc_aux(cptr txt, int y, int x);
-extern void save_savefile_names(void);
 extern bool_ no_begin_screen;
-extern bool_ begin_screen(void);
-extern errr init_randart(void);
-extern void get_height_weight(void);
-extern void player_birth(void);
 
 /* cave.c */
 extern int distance(int y1, int x1, int y2, int x2);
diff --git a/src/loadsave.cc b/src/loadsave.cc
index e7f7e8c1..fe6f0691 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -1,10 +1,5 @@
-/* File: loadsave.c */
-
-/* Purpose: interact with savefiles. This file was made by
-   unifying load2.c and save.c from the old codebase. Doing it
-   this way makes maintenance easier and lets us share code. */
-
 #include "angband.h"
+#include "birth.hpp"
 #include "messages.h"
 #include "modules.hpp"
 #include "quark.h"
diff --git a/src/modules.cc b/src/modules.cc
index c1408f0f..ed4df558 100644
--- a/src/modules.cc
+++ b/src/modules.cc
@@ -7,6 +7,7 @@
  */
 
 #include "angband.h"
+#include "birth.hpp"
 #include "corrupt.hpp"
 #include "hooks.h"
 
diff --git a/src/skills.cc b/src/skills.cc
index 797bf131..591f184e 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -7,7 +7,7 @@
  */
 
 #include "angband.h"
-
+#include "birth.hpp"
 #include "gods.hpp"
 #include "hooks.h"
 #include "util.hpp"