redundant includes

     Remove several duplicate includes I discovered while reconciling the
vms Makefile.  All of these are already being brought in via hack.h so don't
need to be explicitly included after it.

diff --git a/src/decl.c b/src/decl.c
index 5b1dad3fcfb2e3442cd4d400c238024c1ad4ae6b..8d1fbfbec794d1fe5d26273104bac68fa13571be 100644 (file)
--- a/src/decl.c
+++ b/src/decl.c
@@ -40,7 +40,6 @@ NEARDATA int in_doagain = 0;
  */
 struct dgn_topology dungeon_topology = {DUMMY};
 
-#include "quest.h"
 struct q_score quest_status = DUMMY;
 
 NEARDATA int warn_obj_cnt = 0;

diff --git a/src/display.c b/src/display.c
index 85ac929d88c1e28756cff0d7f07eceaee1cb3796..d23beabd7394cdb3b0d28a8233a319b02d720ace 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -116,7 +116,6 @@
  *                  vertical.
  */
 #include "hack.h"
-#include "region.h"
 
 STATIC_DCL void FDECL(display_monster,(XCHAR_P,XCHAR_P,struct monst *,int,XCHAR_P));
 STATIC_DCL int FDECL(swallow_to_glyph, (int, int));

diff --git a/src/mkobj.c b/src/mkobj.c
index 2db928dfeb8c9be562084e8fa3657be1f182f234..5ec8c525b693819685b0fc1c0389329788b2e2c4 100644 (file)
--- a/src/mkobj.c
+++ b/src/mkobj.c
@@ -3,7 +3,6 @@
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "prop.h"
 
 STATIC_DCL void FDECL(mkbox_cnts,(struct obj *));
 STATIC_DCL void FDECL(obj_timer_checks,(struct obj *, XCHAR_P, XCHAR_P, int));

diff --git a/src/restore.c b/src/restore.c
index 7d36d8e7f14f2cb783a2220454bfcbe7049669d3..6c6222a6477d83af8fd86d171465a969e9e8e806 100644 (file)
--- a/src/restore.c
+++ b/src/restore.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)restore.c  3.5     2005/01/04      */
+/*     SCCS Id: @(#)restore.c  3.5     2005/12/14      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -87,8 +87,6 @@ void FDECL( amii_setpens, (int) );    /* use colors from save file */
 extern int amii_numcolors;
 #endif
 
-#include "quest.h"
-
 boolean restoring = FALSE;
 static NEARDATA struct fruit *oldfruit;
 static NEARDATA long omoves;

diff --git a/src/save.c b/src/save.c
index 9477eacee295bdbd548aef0844696496410fe81e..e7204ab3567a23b8ed25e2e8edb4504b080ca1d0 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -1,10 +1,9 @@
-/*     SCCS Id: @(#)save.c     3.5     2005/01/04      */
+/*     SCCS Id: @(#)save.c     3.5     2005/12/14      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
 #include "lev.h"
-#include "quest.h"
 
 #ifndef NO_SIGNAL
 #include <signal.h>

diff --git a/src/sp_lev.c b/src/sp_lev.c
index f288f3b27be0592dbe13d975274e193bc46d32f1..cacf84adaa18313be8749b4ab10cd50f60f4a41e 100644 (file)
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)sp_lev.c   3.5     2001/09/06      */
+/*     SCCS Id: @(#)sp_lev.c   3.5     2005/12/14      */
 /*     Copyright (c) 1989 by Jean-Christophe Collet */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -22,7 +22,6 @@
 #endif
 
 #include "sp_lev.h"
-#include "rect.h"
 
 extern void FDECL(mkmap, (lev_init *));