7 files changed, 21 insertions, 18 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 5ffcd7e0..a744894b 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -17,6 +17,7 @@
 #include "cmd6.hpp"
 #include "cmd7.hpp"
 #include "corrupt.hpp"
+#include "gen_evol.hpp"
 #include "gods.hpp"
 #include "help.hpp"
 #include "hooks.h"
diff --git a/src/externs.h b/src/externs.h
index d78eb05e..9a8460ed 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -494,13 +494,6 @@ extern void race_legends(void);
 extern void show_highclass(int building);
 extern errr get_xtra_line(const char * file_name, monster_type *m_ptr, char * output);
 
-/* gen_maze.c */
-extern bool_ level_generate_maze();
-
-/* gen_life.c */
-extern bool_ level_generate_life();
-extern void evolve_level(bool_ noise);
-
 /* generate.c */
 extern bool_ new_player_spot(int branch);
 extern void add_level_generator(cptr name, bool_ (*generator)(), bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs);
diff --git a/src/gen_evol.cc b/src/gen_evol.cc
index c866a4d1..0dc86910 100644
--- a/src/gen_evol.cc
+++ b/src/gen_evol.cc
@@ -1,8 +1,4 @@
 /*
- * Generate a game of life level and make it evolve
- */
-
-/*
  * Copyright (c) 2003 DarkGod.
  *
  * This software may be copied and distributed for educational, research, and
@@ -10,6 +6,8 @@
  * included in all such copies.
  */
 
+#include "gen_evol.hpp"
+
 #include "angband.h"
 #include "cave.hpp"
 #include "levels.hpp"
diff --git a/src/gen_evol.hpp b/src/gen_evol.hpp
new file mode 100644
index 00000000..65b1320d
--- /dev/null
+++ b/src/gen_evol.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "h-basic.h"
+
+extern bool_ level_generate_life();
+extern void evolve_level(bool_ noise);
diff --git a/src/gen_maze.cc b/src/gen_maze.cc
index a7da6eaa..387fecd8 100644
--- a/src/gen_maze.cc
+++ b/src/gen_maze.cc
@@ -1,8 +1,4 @@
 /*
- * Maze dungeon generator
- */
-
-/*
  * Copyright (c) 2003 DarkGod. And somebody who posted the algorith on
  * rec.games.roguelike.development. I can't remember teh name :( please mail me
  *
@@ -11,6 +7,8 @@
  * included in all such copies.
  */
 
+#include "gen_evol.hpp"
+
 #include "angband.h"
 #include "cave.hpp"
 #include "levels.hpp"
@@ -24,7 +22,7 @@
  */
 typedef signed char maze_row[(MAX_WID / 2) + 2];
 
-void dig(maze_row *maze, int y, int x, int d)
+static void dig(maze_row *maze, int y, int x, int d)
 {
 	int k;
 	int dy = 0, dx = 0;
diff --git a/src/gen_maze.hpp b/src/gen_maze.hpp
new file mode 100644
index 00000000..28c092e3
--- /dev/null
+++ b/src/gen_maze.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "h-basic.h"
+
+extern bool_ level_generate_maze();
diff --git a/src/init2.cc b/src/init2.cc
index 16f5d8be..d840f4ef 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -1,9 +1,11 @@
 #include "angband.h"
 #include "cave.hpp"
-#include "modules.hpp"
+#include "gen_evol.hpp"
+#include "gen_maze.hpp"
+#include "hooks.h"
 #include "messages.h"
+#include "modules.hpp"
 #include "quark.h"
-#include "hooks.h"
 #include "randart.hpp"
 #include "spells3.hpp"
 #include "squeltch.hpp"