Change mextra.h to be part of hack.h

It's broad enough.

include/hack.h

@@ -115,6 +115,7 @@
 #include "youprop.h"
 #include "wintype.h"
 #include "decl.h"
+#include "mextra.h"
 #include "timeout.h"
 #include "zap.h"
 #include "thoughtglyph.h"

src/allmain.c

@@ -5,7 +5,7 @@
 /* various code that was replicated in *main.c */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "artifact.h"
 #include "xhity.h"
 #ifdef OVLB

src/apply.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 #ifdef OVLB
 

src/artifact.c

@@ -4,7 +4,7 @@
 
 #include "hack.h"
 #include "artifact.h"
-#include "mextra.h"
+
 #include "xhity.h"
 #ifdef OVLB
 #include "artilist.h"

src/dig.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 /* #define DEBUG */	/* turn on for diagnostics */
 
 #ifdef OVLB

src/do_name.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "artifact.h"
 #ifdef OVLB
 #include "artilist.h"

src/dog.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #ifdef OVLB
 
 STATIC_DCL int NDECL(pet_type);

src/dogmove.c

@@ -5,7 +5,7 @@
 #include "hack.h"
 
 #include "mfndpos.h"
-#include "mextra.h"
+
 
 extern boolean notonhead;
 extern struct obj *propellor;

src/dokick.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 #define is_bigfoot(x)	((x) == &mons[PM_SASQUATCH])
 #define martial()	(martial_bonus() || is_bigfoot(youracedata) || \

src/dothrow.c

@@ -5,7 +5,7 @@
 /* Contains code for 't' (throw) */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "xhity.h"
 
 extern void NDECL(autoquiver);

src/eat.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "artifact.h"
 /* #define DEBUG */	/* uncomment to enable new eat code debugging */
 

src/end.c

@@ -5,7 +5,7 @@
 #define NEED_VARARGS	/* comment line for pre-compiled headers */
 
 #include "hack.h"
-#include "mextra.h"
+
 #ifndef NO_SIGNAL
 #include <signal.h>
 #endif

src/makemon.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #ifdef REINCARNATION
 #include <ctype.h>
 #endif

src/mextra.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "lev.h"
 
 /* add one component to mon */

src/minion.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "artifact.h"
 
 extern const int monstr[];

src/mon.c

@@ -12,7 +12,7 @@
 
 #include "hack.h"
 #include "mfndpos.h"
-#include "mextra.h"
+
 #include "artifact.h"
 #include <ctype.h>
 #include <stdlib.h>

src/mondata.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "horrordata.h"
 /*	These routines provide basic data for any type of monster. */
 STATIC_DCL void FDECL(set_template_data, (struct permonst *, struct permonst *, int));

src/monmove.c

@@ -5,7 +5,7 @@
 #include "hack.h"
 #include "mfndpos.h"
 #include "artifact.h"
-#include "mextra.h"
+
 extern boolean notonhead;
 
 #ifdef OVL0

src/monst.c

@@ -6,7 +6,7 @@
 #include "permonst.h"
 #include "monsym.h"
 #include "dungeon.h"	/* prerequisite for eshk,vault,epri */
-#include "mextra.h"
+
 #define NO_ATTK {0,0,0,0}
 
 #ifdef C

src/mplayer.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 STATIC_DCL const char *NDECL(dev_name);
 STATIC_DCL void FDECL(get_mplname, (struct monst *, char *));

src/muse.c

@@ -7,7 +7,7 @@
  */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 extern const int monstr[];
 

src/music.c

@@ -32,7 +32,7 @@
 #include "hack.h"
 #ifdef BARD
 #include "skills.h"
-#include "mextra.h"
+
 #endif
 
 STATIC_DCL void FDECL(awaken_monsters,(int));

src/pager.c

@@ -8,7 +8,7 @@
 #include "hack.h"
 #include "dlb.h"
 #ifdef BARD
-#include "mextra.h"
+
 #endif
 
 STATIC_DCL boolean FDECL(is_swallow_sym, (int));

src/pline.c

@@ -4,7 +4,7 @@
 
 #define NEED_VARARGS /* Uses ... */	/* comment line for pre-compiled headers */
 #include "hack.h"
-#include "mextra.h"
+
 #ifdef WIZARD
 #endif
 

src/pray.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "artifact.h"
 #include "artilist.h"
 

src/priest.c

@@ -4,7 +4,7 @@
 
 #include "hack.h"
 #include "mfndpos.h"
-#include "mextra.h"
+
 /* this matches the categorizations shown by enlightenment */
 #define ALGN_SINNED	(-4)	/* worse than strayed */
 

src/read.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "artifact.h"
 
 /* KMH -- Copied from pray.c; this really belongs in a header file */

src/seduce.c

@@ -1,5 +1,5 @@
 #include "hack.h"
-#include "mextra.h"
+
 #include "seduce.h"
 
 # ifdef SEDUCE

src/shk.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 /*#define DEBUG*/
 

src/shknam.c

@@ -5,7 +5,7 @@
 /* shknam.c -- initialize a shop */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 #ifndef OVLB
 extern const struct shclass shtypes[];

src/sounds.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #ifdef USER_SOUNDS
 # ifdef USER_SOUNDS_REGEX
 #include <regex.h>

src/steed.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 
 #ifdef STEED

src/timeout.c

@@ -5,7 +5,7 @@
 #pragma clang diagnostic ignored "-Wint-to-void-pointer-cast"
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "lev.h"	/* for checking save modes */
 
 STATIC_DCL void NDECL(stoned_dialogue);

src/trap.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 extern const char * const destroy_strings[];	/* from xhityhelpers.c */
 

src/u_init.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "artifact.h"
 
 struct trobj {

src/vault.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 
 STATIC_DCL struct monst *NDECL(findgd);
 

src/wizard.c

@@ -9,7 +9,7 @@
 
 #include "hack.h"
 #include "qtext.h"
-#include "mextra.h"
+
 
 extern const int monstr[];
 

src/xhity.c

@@ -1,7 +1,7 @@
 #include "hack.h"
 #include "artifact.h"
 #include "monflag.h"
-#include "mextra.h"
+
 #include "xhity.h"
 
 #ifdef OVLB

src/xhityhelpers.c

@@ -5,7 +5,7 @@
 #include "hack.h"
 #include "artifact.h"
 #include "monflag.h"
-#include "mextra.h"
+
 #include "xhity.h"
 
 extern boolean notonhead;

src/zap.c

@@ -3,7 +3,7 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "mextra.h"
+
 #include "xhity.h"
 
 /* Disintegration rays have special treatment; corpses are never left.