Remove angband.h

75 files changed, 110 insertions, 105 deletions

diff --git a/src/angband.h b/src/angband.h
deleted file mode 100644
index 5fbc94e5..00000000
--- a/src/angband.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#pragma once
-
-/*
- * Copyright (c) 1989 James E. Wilson
- *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
- */
-
-/*
- * C++ guard.
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * First, include the low-level includes.  Be sure to edit "h-config.h"
- * to reflect any hardware, operating system, or compiler nuances.
- */
-#include "h-basic.h"
-
-
-/*
- * Then, include the header files for the low-level code
- */
-#include "z-util.h"
-#include "z-form.h"
-#include "z-term.h"
-
-
-/*
- * Include the "Angband" configuration header
- */
-#include "config.h"
-
-
-/*
- * Now, include the defines and the types
- */
-#include "defines.h"
-
-/***** Some copyright messages follow below *****/
-
-/*
- * Note that these copyright messages apply to an ancient version
- * of Angband, as in, from pre-2.4.frog-knows days, and thus the
- * reference to "5.0" is rather misleading...
- */
-
-/*
- * UNIX ANGBAND Version 5.0
- */
-
-
-/* Original copyright message follows. */
-
-/*
- * ANGBAND Version 4.8	COPYRIGHT (c) Robert Alan Koeneke
- *
- *	 I lovingly dedicate this game to hackers and adventurers
- *	 everywhere...
- *
- *	 Designer and Programmer:
- *		Robert Alan Koeneke
- *		University of Oklahoma
- *
- *	 Assistant Programmer:
- *		Jimmey Wayne Todd
- *		University of Oklahoma
- *
- *	 Assistant Programmer:
- *		Gary D. McAdoo
- *		University of Oklahoma
- *
- *	 UNIX Port:
- *		James E. Wilson
- *		UC Berkeley
- *		wilson@ernie.Berkeley.EDU
- *		ucbvax!ucbernie!wilson
- */
-
-
-/*
- *	 ANGBAND may be copied and modified freely as long as the above
- *	 credits are retained.	No one who-so-ever may sell or market
- *	 this software in any form without the expressed written consent
- *	 of the author Robert Alan Koeneke.
- */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
diff --git a/src/birth.cc b/src/birth.cc
index 47a79fb5..60df3113 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -54,7 +54,9 @@
 #include "wilderness_map.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-util.h"
 
 #include <algorithm>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/bldg.cc b/src/bldg.cc
index bbbf7f10..ec089d5e 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -43,7 +43,9 @@
 #include "variable.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 /* remember building location */
 static int building_loc = 0;
diff --git a/src/cave.cc b/src/cave.cc
index 5ec48cf3..e0923821 100644
--- a/src/cave.cc
+++ b/src/cave.cc
@@ -1,6 +1,7 @@
 #include "cave.hpp"
 
 #include "cave_type.hpp"
+#include "config.h"
 #include "dungeon_flag.hpp"
 #include "feature_flag.hpp"
 #include "feature_type.hpp"
@@ -24,7 +25,9 @@
 #include "util.h"
 #include "variable.h"
 #include "variable.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-util.h"
 
 #include <cassert>
 #include <vector>
diff --git a/src/cmd1.cc b/src/cmd1.cc
index b78c9301..41fe445b 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -49,6 +49,7 @@
 #include "wild.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/cmd2.cc b/src/cmd2.cc
index 4a01c307..a8e2f5d8 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -53,7 +53,9 @@
 #include "wilderness_type_info.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <chrono>
 #include <fmt/format.h>
diff --git a/src/cmd3.cc b/src/cmd3.cc
index e44f2efc..6cd78a65 100644
--- a/src/cmd3.cc
+++ b/src/cmd3.cc
@@ -38,6 +38,7 @@
 #include "variable.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <algorithm>
diff --git a/src/cmd4.cc b/src/cmd4.cc
index 68babf55..4337e503 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -39,6 +39,7 @@
 #include "variable.h"
 #include "variable.hpp"
 #include "xtra1.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <algorithm>
diff --git a/src/cmd5.cc b/src/cmd5.cc
index 34d891d1..463c170f 100644
--- a/src/cmd5.cc
+++ b/src/cmd5.cc
@@ -43,6 +43,7 @@
 #include "wizard2.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <boost/noncopyable.hpp>
diff --git a/src/cmd6.cc b/src/cmd6.cc
index 55eefab7..c9464d79 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -52,6 +52,7 @@
 #include "wizard2.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/cmd7.cc b/src/cmd7.cc
index 5211aca1..9848e903 100644
--- a/src/cmd7.cc
+++ b/src/cmd7.cc
@@ -40,6 +40,7 @@
 #include "variable.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <fmt/format.h>
diff --git a/src/corrupt.cc b/src/corrupt.cc
index d8e95dbe..aa418f7b 100644
--- a/src/corrupt.cc
+++ b/src/corrupt.cc
@@ -13,6 +13,7 @@
 #include "xtra1.hpp"
 #include "xtra2.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 #include <fmt/format.h>
diff --git a/src/defines.h b/src/defines.h
index 2e79a223..6b7e5a2b 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,7 +1,4 @@
-/* File: defines.h */
-
-/* Purpose: global constants and macro definitions */
-
+#pragma once
 
 /*
  * Do not edit this file unless you know *exactly* what you are doing.
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 41f6b640..8891e422 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -79,6 +79,7 @@
 #include "xtra1.hpp"
 #include "xtra2.hpp"
 #include "z-rand.hpp"
+#include "z-util.h"
 
 #include <boost/filesystem.hpp>
 #include <cassert>
diff --git a/src/files.cc b/src/files.cc
index ecdd244e..186cc9e4 100644
--- a/src/files.cc
+++ b/src/files.cc
@@ -57,7 +57,9 @@
 #include "wilderness_map.hpp"
 #include "wilderness_type_info.hpp"
 #include "xtra1.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-util.h"
 
 #include <boost/algorithm/string.hpp>
 #include <iostream>
diff --git a/src/generate.cc b/src/generate.cc
index ae2a1c38..1926a88d 100644
--- a/src/generate.cc
+++ b/src/generate.cc
@@ -42,6 +42,7 @@
 #include "wild.hpp"
 #include "wilderness_map.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <cassert>
diff --git a/src/gods.cc b/src/gods.cc
index e2cd01b9..af76b365 100644
--- a/src/gods.cc
+++ b/src/gods.cc
@@ -17,6 +17,7 @@
 #include "variable.h"
 #include "variable.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <cassert>
diff --git a/src/help.cc b/src/help.cc
index 8849c126..e67809ac 100644
--- a/src/help.cc
+++ b/src/help.cc
@@ -10,6 +10,7 @@
 #include "help.hpp"
 
 #include "cave_type.hpp"
+#include "defines.h"
 #include "files.hpp"
 #include "hook_get_in.hpp"
 #include "hook_identify_in.hpp"
@@ -22,6 +23,7 @@
 #include "skills.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/init1.cc b/src/init1.cc
index c61f48a9..9c03236e 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -44,7 +44,9 @@
 #include "variable.h"
 #include "variable.hpp"
 #include "wilderness_type_info.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-util.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/classification.hpp>
diff --git a/src/init2.cc b/src/init2.cc
index 3ea3a9cf..ab1bd00a 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -6,6 +6,7 @@
 #include "cave.hpp"
 #include "cave_type.hpp"
 #include "cli_comm.hpp"
+#include "config.h"
 #include "dungeon_info_type.hpp"
 #include "ego_item_type.hpp"
 #include "files.hpp"
@@ -53,6 +54,8 @@
 #include "vault_type.hpp"
 #include "wilderness_map.hpp"
 #include "wilderness_type_info.hpp"
+#include "z-form.h"
+#include "z-util.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <cassert>
diff --git a/src/loadsave.cc b/src/loadsave.cc
index fd25dd35..87b4acc6 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -37,6 +37,7 @@
 #include "variable.h"
 #include "variable.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <boost/filesystem.hpp>
diff --git a/src/main-gcu.cc b/src/main-gcu.cc
index d1310812..885e2f3f 100644
--- a/src/main-gcu.cc
+++ b/src/main-gcu.cc
@@ -41,6 +41,7 @@
 #include "main.h"
 #include "util.h"
 #include "variable.h"
+#include "z-util.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <limits.h>
diff --git a/src/main-gtk2.cc b/src/main-gtk2.cc
index 87c455e5..92ea75e1 100644
--- a/src/main-gtk2.cc
+++ b/src/main-gtk2.cc
@@ -30,10 +30,13 @@
  * and reorganised the file a bit.
  */
 
+#include "config.h"
 #include "files.h"
 #include "main.h"
 #include "util.h"
 #include "variable.h"
+#include "z-util.h"
+#include "z-form.h"
 
 
 /* Force ANSI standard */
diff --git a/src/main-sdl.cc b/src/main-sdl.cc
index b1603f0c..4ff6d97c 100644
--- a/src/main-sdl.cc
+++ b/src/main-sdl.cc
@@ -27,6 +27,7 @@
 #include "main.h"
 #include "util.h"
 #include "variable.h"
+#include "z-util.h"
 
 #include <SDL.h>
 #include <SDL_image.h>
diff --git a/src/main-win.c b/src/main-win.c
index 94f41ce9..61a26f0b 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -68,12 +68,15 @@
 
 
 #include "angband.h"
-#include "dungeon.h"
+#include "config.h"
+#include "defines.h"
 #include "files.h"
-#include "init2.h"
+#include "h-basic.h"
 #include "util.h"
 #include "variable.h"
-
+#include "z-form.h"
+#include "z-term.h"
+#include "z-util.h"
 
 /*
  * Determine if string "t" is a suffix of string "s"
diff --git a/src/main-x11.cc b/src/main-x11.cc
index bc065726..9ac920bc 100644
--- a/src/main-x11.cc
+++ b/src/main-x11.cc
@@ -92,10 +92,14 @@
  *
  */
 
+#include "config.h"
+#include "defines.h"
 #include "loadsave.h"
 #include "main.h"
 #include "util.h"
 #include "variable.h"
+#include "z-form.h"
+#include "z-util.h"
 
 #ifndef __MAKEDEPEND__
 #include <X11/Xlib.h>
diff --git a/src/main.cc b/src/main.cc
index 07cf64f6..6bd1eb52 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -9,6 +9,7 @@
 #include "main.h"
 
 #include "birth.hpp"
+#include "config.h"
 #include "dungeon.hpp"
 #include "files.hpp"
 #include "game.hpp"
@@ -19,6 +20,8 @@
 #include "util.hpp"
 #include "variable.h"
 #include "variable.hpp"
+#include "z-form.h"
+#include "z-util.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/melee1.cc b/src/melee1.cc
index 0c3840bc..adf54ebb 100644
--- a/src/melee1.cc
+++ b/src/melee1.cc
@@ -32,6 +32,7 @@
 #include "xtra1.hpp"
 #include "xtra2.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/melee2.cc b/src/melee2.cc
index edae671a..99486a27 100644
--- a/src/melee2.cc
+++ b/src/melee2.cc
@@ -16,6 +16,7 @@
 #include "cave.hpp"
 #include "cave_type.hpp"
 #include "cmd1.hpp"
+#include "config.h"
 #include "dungeon_flag.hpp"
 #include "feature_flag.hpp"
 #include "feature_type.hpp"
@@ -47,7 +48,9 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 #include "z-util.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/modules.cc b/src/modules.cc
index f77a63e7..c8d1d100 100644
--- a/src/modules.cc
+++ b/src/modules.cc
@@ -11,6 +11,7 @@
 #include "birth.hpp"
 #include "cave.hpp"
 #include "cave_type.hpp"
+#include "config.h"
 #include "corrupt.hpp"
 #include "files.hpp"
 #include "hook_eat_in.hpp"
@@ -36,6 +37,8 @@
 #include "util.h"
 #include "variable.h"
 #include "variable.hpp"
+#include "z-form.h"
+#include "z-util.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <cassert>
diff --git a/src/monster1.cc b/src/monster1.cc
index 07cf901d..8d39e1a8 100644
--- a/src/monster1.cc
+++ b/src/monster1.cc
@@ -20,6 +20,8 @@
 #include "variable.hpp"
 #include "wilderness_map.hpp"
 #include "wilderness_type_info.hpp"
+#include "z-form.h"
+#include "z-term.h"
 
 /*
  * Pronoun arrays, by gender.
diff --git a/src/monster2.cc b/src/monster2.cc
index 4da41b29..65564493 100644
--- a/src/monster2.cc
+++ b/src/monster2.cc
@@ -45,6 +45,7 @@
 #include "xtra1.hpp"
 #include "xtra2.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 #include "z-util.hpp"
 
 #include <algorithm>
diff --git a/src/monster3.cc b/src/monster3.cc
index c27b597b..b0c45a22 100644
--- a/src/monster3.cc
+++ b/src/monster3.cc
@@ -28,6 +28,7 @@
 #include "variable.h"
 #include "variable.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 /*
diff --git a/src/object1.cc b/src/object1.cc
index 481cc19a..6e34791c 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -52,6 +52,7 @@
 #include "variable.hpp"
 #include "wilderness_type_info.hpp"
 #include "xtra1.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <boost/algorithm/string/join.hpp>
diff --git a/src/q_betwen.cc b/src/q_betwen.cc
index a24dbffb..00d35990 100644
--- a/src/q_betwen.cc
+++ b/src/q_betwen.cc
@@ -18,6 +18,7 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_BETWEEN])
 
diff --git a/src/q_dragons.cc b/src/q_dragons.cc
index 9427b701..9831b3ac 100644
--- a/src/q_dragons.cc
+++ b/src/q_dragons.cc
@@ -17,6 +17,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_DRAGONS])
 
diff --git a/src/q_eol.cc b/src/q_eol.cc
index 4602a139..202c455a 100644
--- a/src/q_eol.cc
+++ b/src/q_eol.cc
@@ -18,6 +18,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 
diff --git a/src/q_evil.cc b/src/q_evil.cc
index 68cc2cd6..527380c6 100644
--- a/src/q_evil.cc
+++ b/src/q_evil.cc
@@ -17,6 +17,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_EVIL])
 
diff --git a/src/q_fireprof.cc b/src/q_fireprof.cc
index a351bce8..8a5a9838 100644
--- a/src/q_fireprof.cc
+++ b/src/q_fireprof.cc
@@ -16,7 +16,9 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 #include <fmt/format.h>
diff --git a/src/q_god.cc b/src/q_god.cc
index 58ae525f..c8963088 100644
--- a/src/q_god.cc
+++ b/src/q_god.cc
@@ -22,6 +22,7 @@
 #include "wilderness_map.hpp"
 #include "wilderness_type_info.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <assert.h>
 #include <fmt/format.h>
diff --git a/src/q_haunted.cc b/src/q_haunted.cc
index 42406afd..4f63f250 100644
--- a/src/q_haunted.cc
+++ b/src/q_haunted.cc
@@ -17,6 +17,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_HAUNTED])
 
diff --git a/src/q_hobbit.cc b/src/q_hobbit.cc
index 63d8dbde..9b60882b 100644
--- a/src/q_hobbit.cc
+++ b/src/q_hobbit.cc
@@ -17,7 +17,9 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 
diff --git a/src/q_invas.cc b/src/q_invas.cc
index f64e097f..836b2446 100644
--- a/src/q_invas.cc
+++ b/src/q_invas.cc
@@ -16,6 +16,7 @@
 #include "town_type.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_INVASION])
 
diff --git a/src/q_library.cc b/src/q_library.cc
index 70582404..0cbb5158 100644
--- a/src/q_library.cc
+++ b/src/q_library.cc
@@ -17,6 +17,7 @@
 #include "util.h"
 #include "variable.h"
 #include "variable.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <cassert>
diff --git a/src/q_main.cc b/src/q_main.cc
index 2d3473f1..a8d67925 100644
--- a/src/q_main.cc
+++ b/src/q_main.cc
@@ -12,6 +12,7 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 #include <cassert>
 
diff --git a/src/q_narsil.cc b/src/q_narsil.cc
index adcbb7f0..cfae1843 100644
--- a/src/q_narsil.cc
+++ b/src/q_narsil.cc
@@ -11,6 +11,7 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_NARSIL])
 
diff --git a/src/q_nazgul.cc b/src/q_nazgul.cc
index 04da23d9..a7ddea64 100644
--- a/src/q_nazgul.cc
+++ b/src/q_nazgul.cc
@@ -15,6 +15,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 
diff --git a/src/q_nirna.cc b/src/q_nirna.cc
index daaed114..495dce4e 100644
--- a/src/q_nirna.cc
+++ b/src/q_nirna.cc
@@ -10,6 +10,7 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_NIRNAETH])
 
diff --git a/src/q_one.cc b/src/q_one.cc
index c6162397..b873de18 100644
--- a/src/q_one.cc
+++ b/src/q_one.cc
@@ -24,6 +24,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_ONE])
 
diff --git a/src/q_poison.cc b/src/q_poison.cc
index 8ce9c601..c8941f90 100644
--- a/src/q_poison.cc
+++ b/src/q_poison.cc
@@ -19,7 +19,9 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_POISON])
 
diff --git a/src/q_rand.cc b/src/q_rand.cc
index 052bd2f2..7e1e37b9 100644
--- a/src/q_rand.cc
+++ b/src/q_rand.cc
@@ -30,7 +30,9 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 #include <fmt/format.h>
diff --git a/src/q_shroom.cc b/src/q_shroom.cc
index 899d55d0..1b787038 100644
--- a/src/q_shroom.cc
+++ b/src/q_shroom.cc
@@ -17,7 +17,9 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 
diff --git a/src/q_spider.cc b/src/q_spider.cc
index bfe8980a..5faaa3a4 100644
--- a/src/q_spider.cc
+++ b/src/q_spider.cc
@@ -13,6 +13,7 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_SPIDER])
 
diff --git a/src/q_thief.cc b/src/q_thief.cc
index cd34cd2f..d5d1f709 100644
--- a/src/q_thief.cc
+++ b/src/q_thief.cc
@@ -20,6 +20,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_THIEVES])
 
diff --git a/src/q_thrain.cc b/src/q_thrain.cc
index 08c0ce2c..c2aea278 100644
--- a/src/q_thrain.cc
+++ b/src/q_thrain.cc
@@ -20,7 +20,9 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 
diff --git a/src/q_troll.cc b/src/q_troll.cc
index c7a9b17c..b8699dbd 100644
--- a/src/q_troll.cc
+++ b/src/q_troll.cc
@@ -17,6 +17,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 
diff --git a/src/q_ultrag.cc b/src/q_ultrag.cc
index 1e800c77..9b2bca70 100644
--- a/src/q_ultrag.cc
+++ b/src/q_ultrag.cc
@@ -19,6 +19,7 @@
 #include "tables.hpp"
 #include "util.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_ULTRA_GOOD])
 
diff --git a/src/q_wight.cc b/src/q_wight.cc
index 975f1ff6..54712419 100644
--- a/src/q_wight.cc
+++ b/src/q_wight.cc
@@ -15,6 +15,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <cassert>
 
diff --git a/src/q_wolves.cc b/src/q_wolves.cc
index e892b316..b3a17621 100644
--- a/src/q_wolves.cc
+++ b/src/q_wolves.cc
@@ -18,6 +18,7 @@
 #include "util.hpp"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #define cquest (quest[QUEST_WOLVES])
 
diff --git a/src/skills.cc b/src/skills.cc
index 44c85551..3450eb78 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -38,6 +38,7 @@
 #include "variable.h"
 #include "variable.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <algorithm>
diff --git a/src/spells1.cc b/src/spells1.cc
index 91345e05..caa30efa 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -49,6 +49,7 @@
 #include "xtra1.hpp"
 #include "xtra2.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <chrono>
diff --git a/src/spells2.cc b/src/spells2.cc
index 00e3a415..7c91ecee 100644
--- a/src/spells2.cc
+++ b/src/spells2.cc
@@ -47,6 +47,7 @@
 #include "variable.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/spells4.cc b/src/spells4.cc
index c061b86c..31a20bc9 100644
--- a/src/spells4.cc
+++ b/src/spells4.cc
@@ -15,6 +15,7 @@
 #include "util.h"
 #include "variable.hpp"
 #include "z-rand.hpp"
+#include "z-term.h"
 
 #include <algorithm>
 #include <array>
diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc
index 2872cae5..9b97ba41 100644
--- a/src/squelch/condition.cc
+++ b/src/squelch/condition.cc
@@ -20,6 +20,8 @@
 #include "../skill_type.hpp"
 #include "../util.hpp"
 #include "../variable.hpp"
+#include "../z-form.h"
+#include "../z-term.h"
 
 namespace squelch {
 
diff --git a/src/squelch/rule.cc b/src/squelch/rule.cc
index e79fc1f2..1e7fef1a 100644
--- a/src/squelch/rule.cc
+++ b/src/squelch/rule.cc
@@ -5,7 +5,6 @@
 #include "tome/squelch/cursor.hpp"
 #include "tome/squelch/condition.hpp"
 #include "tome/squelch/tree_printer.hpp"
-#include "../angband.h"
 #include "../modules.hpp"
 #include "../object1.hpp"
 #include "../object2.hpp"
@@ -14,6 +13,7 @@
 #include "../tables.hpp"
 #include "../util.hpp"
 #include "../variable.hpp"
+#include "../z-term.h"
 
 namespace squelch {
 
diff --git a/src/squeltch.cc b/src/squeltch.cc
index 9e3d39af..7720ba52 100644
--- a/src/squeltch.cc
+++ b/src/squeltch.cc
@@ -30,6 +30,7 @@
 #include "util.h"
 #include "variable.h"
 #include "variable.hpp"
+#include "z-form.h"
 
 #include <algorithm>
 #include <deque>
diff --git a/src/store.cc b/src/store.cc
index 28ef3e18..ceb762ab 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -40,6 +40,7 @@
 #include "variable.h"
 #include "variable.hpp"
 #include "xtra1.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <cassert>
diff --git a/src/tables.cc b/src/tables.cc
index 3c9cfe29..be260be4 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -43,6 +43,7 @@
 #include "q_rand.hpp"
 #include "stats.hpp"
 #include "variable.hpp"
+#include "z-term.h"
 
 
 
diff --git a/src/tables.hpp b/src/tables.hpp
index bd23b069..aa907f0c 100644
--- a/src/tables.hpp
+++ b/src/tables.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "angband.h"
 #include "activation.hpp"
 #include "between_exit.hpp"
 #include "body.hpp"
 #include "cli_comm_fwd.hpp"
+#include "defines.h"
 #include "flags_group.hpp"
 #include "gf_name_type.hpp"
 #include "inscription_info_type.hpp"
diff --git a/src/util.cc b/src/util.cc
index afaf9a97..361f55be 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -24,6 +24,7 @@
 #include "variable.h"
 #include "variable.hpp"
 #include "xtra1.hpp"
+#include "z-form.h"
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <chrono>
diff --git a/src/variable.h b/src/variable.h
index 057b4bed..5401c78e 100644
--- a/src/variable.h
+++ b/src/variable.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "angband.h"
+#include "defines.h"
+#include "h-basic.h"
+#include "z-term.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/variable.hpp b/src/variable.hpp
index 2af69570..1dda4fc9 100644
--- a/src/variable.hpp
+++ b/src/variable.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "angband.h"
 #include "alloc_entry_fwd.hpp"
 #include "birther.hpp"
 #include "cave_type_fwd.hpp"
+#include "defines.h"
 #include "deity_type.hpp"
 #include "dungeon_flag_set.hpp"
 #include "effect_type.hpp"
diff --git a/src/wizard2.cc b/src/wizard2.cc
index 32777083..0c14703c 100644
--- a/src/wizard2.cc
+++ b/src/wizard2.cc
@@ -40,6 +40,7 @@
 #include "wilderness_type_info.hpp"
 #include "xtra1.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 /*
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 386f52eb..34141ccf 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -54,6 +54,7 @@
 #include "wilderness_map.hpp"
 #include "wilderness_type_info.hpp"
 #include "xtra2.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <cassert>
diff --git a/src/xtra2.cc b/src/xtra2.cc
index e02181d0..12dde007 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -59,6 +59,7 @@
 #include "wilderness_type_info.hpp"
 #include "wizard2.hpp"
 #include "xtra1.hpp"
+#include "z-form.h"
 #include "z-rand.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>