From: Ari Johnson <ari@theari.com>
Date: Sun, 17 Apr 2011 22:41:23 +0000 (-0400)
Subject: Remove references to confmagic.h
X-Git-Url: https://git.theari.com/?a=commitdiff_plain;h=74f5f506e824bd93429f47907b7a646814b0232b;p=cobramush.git

Remove references to confmagic.h
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 98034ec..395b702 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -173,7 +173,6 @@ access.o: ../hdrs/mushdb.h
 access.o: ../hdrs/flags.h
 access.o: ../hdrs/ptab.h
 access.o: ../hdrs/chunk.h
-access.o: ../confmagic.h
 access.o: ../hdrs/mypcre.h
 access.o: ../hdrs/access.h
 access.o: ../hdrs/mymalloc.h
@@ -193,7 +192,6 @@ atr_tab.o: ../hdrs/mushdb.h
 atr_tab.o: ../hdrs/flags.h
 atr_tab.o: ../hdrs/ptab.h
 atr_tab.o: ../hdrs/chunk.h
-atr_tab.o: ../confmagic.h
 atr_tab.o: ../hdrs/mypcre.h
 atr_tab.o: ../hdrs/attrib.h
 atr_tab.o: ../hdrs/atr_tab.h
@@ -214,7 +212,6 @@ attrib.o: ../hdrs/mushdb.h
 attrib.o: ../hdrs/flags.h
 attrib.o: ../hdrs/ptab.h
 attrib.o: ../hdrs/chunk.h
-attrib.o: ../confmagic.h
 attrib.o: ../hdrs/mypcre.h
 attrib.o: ../hdrs/attrib.h
 attrib.o: ../hdrs/match.h
@@ -239,7 +236,6 @@ boolexp.o: ../hdrs/chunk.h
 boolexp.o: ../hdrs/match.h
 boolexp.o: ../hdrs/externs.h
 boolexp.o: ../hdrs/compile.h
-boolexp.o: ../confmagic.h
 boolexp.o: ../hdrs/mypcre.h
 boolexp.o: ../hdrs/lock.h
 boolexp.o: ../hdrs/boolexp.h
@@ -263,7 +259,6 @@ bsd.o: ../hdrs/mushdb.h
 bsd.o: ../hdrs/flags.h
 bsd.o: ../hdrs/ptab.h
 bsd.o: ../hdrs/chunk.h
-bsd.o: ../confmagic.h
 bsd.o: ../hdrs/mypcre.h
 bsd.o: ../hdrs/lock.h
 bsd.o: ../hdrs/boolexp.h
@@ -302,7 +297,6 @@ bufferq.o: ../hdrs/mushdb.h
 bufferq.o: ../hdrs/flags.h
 bufferq.o: ../hdrs/ptab.h
 bufferq.o: ../hdrs/chunk.h
-bufferq.o: ../confmagic.h
 bufferq.o: ../hdrs/mypcre.h
 bufferq.o: ../hdrs/bufferq.h
 bufferq.o: ../hdrs/mymalloc.h
@@ -320,7 +314,6 @@ chunk.o: ../hdrs/mushdb.h
 chunk.o: ../hdrs/flags.h
 chunk.o: ../hdrs/ptab.h
 chunk.o: ../hdrs/chunk.h
-chunk.o: ../confmagic.h
 chunk.o: ../hdrs/mypcre.h
 chunk.o: ../hdrs/command.h
 chunk.o: ../hdrs/switches.h
@@ -340,7 +333,6 @@ cmdlocal.o: ../hdrs/mushdb.h
 cmdlocal.o: ../hdrs/flags.h
 cmdlocal.o: ../hdrs/ptab.h
 cmdlocal.o: ../hdrs/chunk.h
-cmdlocal.o: ../confmagic.h
 cmdlocal.o: ../hdrs/mypcre.h
 cmdlocal.o: ../hdrs/parse.h
 cmdlocal.o: ../hdrs/command.h
@@ -359,7 +351,6 @@ cmds.o: ../hdrs/mushdb.h
 cmds.o: ../hdrs/flags.h
 cmds.o: ../hdrs/ptab.h
 cmds.o: ../hdrs/chunk.h
-cmds.o: ../confmagic.h
 cmds.o: ../hdrs/mypcre.h
 cmds.o: ../hdrs/match.h
 cmds.o: ../hdrs/game.h
@@ -388,7 +379,6 @@ command.o: ../hdrs/mushdb.h
 command.o: ../hdrs/flags.h
 command.o: ../hdrs/ptab.h
 command.o: ../hdrs/chunk.h
-command.o: ../confmagic.h
 command.o: ../hdrs/mypcre.h
 command.o: ../hdrs/game.h
 command.o: ../hdrs/match.h
@@ -421,7 +411,6 @@ compress.o: ../hdrs/mushdb.h
 compress.o: ../hdrs/flags.h
 compress.o: ../hdrs/ptab.h
 compress.o: ../hdrs/chunk.h
-compress.o: ../confmagic.h
 compress.o: ../hdrs/mypcre.h
 compress.o: ../hdrs/mymalloc.h
 conf.o: ../hdrs/copyrite.h
@@ -437,7 +426,6 @@ conf.o: ../hdrs/mushdb.h
 conf.o: ../hdrs/flags.h
 conf.o: ../hdrs/ptab.h
 conf.o: ../hdrs/chunk.h
-conf.o: ../confmagic.h
 conf.o: ../hdrs/mypcre.h
 conf.o: ../hdrs/ansi.h
 conf.o: ../hdrs/pueblo.h
@@ -465,7 +453,6 @@ cque.o: ../hdrs/externs.h
 cque.o: ../hdrs/compile.h
 cque.o: ../hdrs/dbdefs.h
 cque.o: ../hdrs/chunk.h
-cque.o: ../confmagic.h
 cque.o: ../hdrs/mypcre.h
 cque.o: ../hdrs/parse.h
 cque.o: ../hdrs/strtree.h
@@ -487,7 +474,6 @@ create.o: ../hdrs/mushdb.h
 create.o: ../hdrs/flags.h
 create.o: ../hdrs/ptab.h
 create.o: ../hdrs/chunk.h
-create.o: ../confmagic.h
 create.o: ../hdrs/mypcre.h
 create.o: ../hdrs/attrib.h
 create.o: ../hdrs/match.h
@@ -514,7 +500,6 @@ db.o: ../hdrs/mushdb.h
 db.o: ../hdrs/flags.h
 db.o: ../hdrs/ptab.h
 db.o: ../hdrs/chunk.h
-db.o: ../confmagic.h
 db.o: ../hdrs/mypcre.h
 db.o: ../hdrs/attrib.h
 db.o: ../hdrs/mymalloc.h
@@ -543,7 +528,6 @@ destroy.o: ../hdrs/externs.h
 destroy.o: ../hdrs/compile.h
 destroy.o: ../hdrs/dbdefs.h
 destroy.o: ../hdrs/chunk.h
-destroy.o: ../confmagic.h
 destroy.o: ../hdrs/mypcre.h
 destroy.o: ../hdrs/log.h
 destroy.o: ../hdrs/game.h
@@ -565,7 +549,6 @@ extchat.o: ../hdrs/mushdb.h
 extchat.o: ../hdrs/flags.h
 extchat.o: ../hdrs/ptab.h
 extchat.o: ../hdrs/chunk.h
-extchat.o: ../confmagic.h
 extchat.o: ../hdrs/mypcre.h
 extchat.o: ../hdrs/attrib.h
 extchat.o: ../hdrs/match.h
@@ -597,7 +580,6 @@ extmail.o: ../hdrs/mushdb.h
 extmail.o: ../hdrs/flags.h
 extmail.o: ../hdrs/ptab.h
 extmail.o: ../hdrs/chunk.h
-extmail.o: ../confmagic.h
 extmail.o: ../hdrs/mypcre.h
 extmail.o: ../hdrs/match.h
 extmail.o: ../hdrs/extmail.h
@@ -628,7 +610,6 @@ filecopy.o: ../hdrs/externs.h
 filecopy.o: ../hdrs/compile.h
 filecopy.o: ../hdrs/dbdefs.h
 filecopy.o: ../hdrs/chunk.h
-filecopy.o: ../confmagic.h
 filecopy.o: ../hdrs/mypcre.h
 filecopy.o: ../hdrs/mymalloc.h
 filecopy.o: ../hdrs/log.h
@@ -645,7 +626,6 @@ flaglocal.o: ../hdrs/mushdb.h
 flaglocal.o: ../hdrs/flags.h
 flaglocal.o: ../hdrs/ptab.h
 flaglocal.o: ../hdrs/chunk.h
-flaglocal.o: ../confmagic.h
 flaglocal.o: ../hdrs/mypcre.h
 flags.o: ../config.h
 flags.o: ../hdrs/conf.h
@@ -660,7 +640,6 @@ flags.o: ../hdrs/mushdb.h
 flags.o: ../hdrs/flags.h
 flags.o: ../hdrs/ptab.h
 flags.o: ../hdrs/chunk.h
-flags.o: ../confmagic.h
 flags.o: ../hdrs/mypcre.h
 flags.o: ../hdrs/command.h
 flags.o: ../hdrs/switches.h
@@ -690,7 +669,6 @@ funcrypt.o: ../hdrs/mushdb.h
 funcrypt.o: ../hdrs/flags.h
 funcrypt.o: ../hdrs/ptab.h
 funcrypt.o: ../hdrs/chunk.h
-funcrypt.o: ../confmagic.h
 funcrypt.o: ../hdrs/mypcre.h
 funcrypt.o: ../hdrs/version.h
 funcrypt.o: ../hdrs/extchat.h
@@ -717,7 +695,6 @@ function.o: ../hdrs/mushdb.h
 function.o: ../hdrs/flags.h
 function.o: ../hdrs/ptab.h
 function.o: ../hdrs/chunk.h
-function.o: ../confmagic.h
 function.o: ../hdrs/mypcre.h
 function.o: ../hdrs/attrib.h
 function.o: ../hdrs/function.h
@@ -743,7 +720,6 @@ fundb.o: ../hdrs/mushdb.h
 fundb.o: ../hdrs/flags.h
 fundb.o: ../hdrs/ptab.h
 fundb.o: ../hdrs/chunk.h
-fundb.o: ../confmagic.h
 fundb.o: ../hdrs/mypcre.h
 fundb.o: ../hdrs/match.h
 fundb.o: ../hdrs/parse.h
@@ -770,7 +746,6 @@ funlist.o: ../hdrs/mushdb.h
 funlist.o: ../hdrs/flags.h
 funlist.o: ../hdrs/ptab.h
 funlist.o: ../hdrs/chunk.h
-funlist.o: ../confmagic.h
 funlist.o: ../hdrs/mypcre.h
 funlist.o: ../hdrs/ansi.h
 funlist.o: ../hdrs/parse.h
@@ -796,7 +771,6 @@ funlocal.o: ../hdrs/mushdb.h
 funlocal.o: ../hdrs/flags.h
 funlocal.o: ../hdrs/ptab.h
 funlocal.o: ../hdrs/chunk.h
-funlocal.o: ../confmagic.h
 funlocal.o: ../hdrs/mypcre.h
 funlocal.o: ../hdrs/parse.h
 funlocal.o: ../hdrs/function.h
@@ -813,7 +787,6 @@ funmath.o: ../hdrs/mushdb.h
 funmath.o: ../hdrs/flags.h
 funmath.o: ../hdrs/ptab.h
 funmath.o: ../hdrs/chunk.h
-funmath.o: ../confmagic.h
 funmath.o: ../hdrs/mypcre.h
 funmath.o: ../hdrs/sort.h
 funmath.o: ../hdrs/parse.h
@@ -832,7 +805,6 @@ funmisc.o: ../hdrs/mushdb.h
 funmisc.o: ../hdrs/flags.h
 funmisc.o: ../hdrs/ptab.h
 funmisc.o: ../hdrs/chunk.h
-funmisc.o: ../confmagic.h
 funmisc.o: ../hdrs/mypcre.h
 funmisc.o: ../hdrs/version.h
 funmisc.o: ../hdrs/lock.h
@@ -858,7 +830,6 @@ funstr.o: ../hdrs/mushdb.h
 funstr.o: ../hdrs/flags.h
 funstr.o: ../hdrs/ptab.h
 funstr.o: ../hdrs/chunk.h
-funstr.o: ../confmagic.h
 funstr.o: ../hdrs/mypcre.h
 funstr.o: ../hdrs/ansi.h
 funstr.o: ../hdrs/case.h
@@ -882,7 +853,6 @@ funtime.o: ../hdrs/mushdb.h
 funtime.o: ../hdrs/flags.h
 funtime.o: ../hdrs/ptab.h
 funtime.o: ../hdrs/chunk.h
-funtime.o: ../confmagic.h
 funtime.o: ../hdrs/mypcre.h
 funtime.o: ../hdrs/parse.h
 funtime.o: ../hdrs/log.h
@@ -901,7 +871,6 @@ funufun.o: ../hdrs/mushdb.h
 funufun.o: ../hdrs/flags.h
 funufun.o: ../hdrs/ptab.h
 funufun.o: ../hdrs/chunk.h
-funufun.o: ../confmagic.h
 funufun.o: ../hdrs/mypcre.h
 funufun.o: ../hdrs/match.h
 funufun.o: ../hdrs/parse.h
@@ -922,7 +891,6 @@ game.o: ../hdrs/mushdb.h
 game.o: ../hdrs/flags.h
 game.o: ../hdrs/ptab.h
 game.o: ../hdrs/chunk.h
-game.o: ../confmagic.h
 game.o: ../hdrs/mypcre.h
 game.o: ../hdrs/game.h
 game.o: ../hdrs/attrib.h
@@ -960,7 +928,6 @@ help.o: ../hdrs/mushdb.h
 help.o: ../hdrs/flags.h
 help.o: ../hdrs/ptab.h
 help.o: ../hdrs/chunk.h
-help.o: ../confmagic.h
 help.o: ../hdrs/mypcre.h
 help.o: ../hdrs/command.h
 help.o: ../hdrs/switches.h
@@ -983,7 +950,6 @@ htab.o: ../hdrs/mushdb.h
 htab.o: ../hdrs/flags.h
 htab.o: ../hdrs/ptab.h
 htab.o: ../hdrs/chunk.h
-htab.o: ../confmagic.h
 htab.o: ../hdrs/mypcre.h
 htab.o: ../hdrs/mymalloc.h
 ident.o: ../config.h
@@ -999,7 +965,6 @@ ident.o: ../hdrs/mushdb.h
 ident.o: ../hdrs/flags.h
 ident.o: ../hdrs/ptab.h
 ident.o: ../hdrs/chunk.h
-ident.o: ../confmagic.h
 ident.o: ../hdrs/mypcre.h
 ident.o: ../hdrs/attrib.h
 ident.o: ../hdrs/ident.h
@@ -1018,7 +983,6 @@ intmap.o: ../hdrs/mushdb.h
 intmap.o: ../hdrs/flags.h
 intmap.o: ../hdrs/ptab.h
 intmap.o: ../hdrs/chunk.h
-intmap.o: ../confmagic.h
 intmap.o: ../hdrs/mypcre.h
 intmap.o: ../hdrs/mymalloc.h
 intmap.o: ../hdrs/intmap.h
@@ -1036,7 +1000,6 @@ local.o: ../hdrs/mushdb.h
 local.o: ../hdrs/flags.h
 local.o: ../hdrs/ptab.h
 local.o: ../hdrs/chunk.h
-local.o: ../confmagic.h
 local.o: ../hdrs/mypcre.h
 local.o: ../hdrs/parse.h
 local.o: ../hdrs/command.h
@@ -1056,7 +1019,6 @@ lock.o: ../hdrs/mushdb.h
 lock.o: ../hdrs/flags.h
 lock.o: ../hdrs/ptab.h
 lock.o: ../hdrs/chunk.h
-lock.o: ../confmagic.h
 lock.o: ../hdrs/mypcre.h
 lock.o: ../hdrs/boolexp.h
 lock.o: ../hdrs/attrib.h
@@ -1080,7 +1042,6 @@ log.o: ../hdrs/mushdb.h
 log.o: ../hdrs/flags.h
 log.o: ../hdrs/ptab.h
 log.o: ../hdrs/chunk.h
-log.o: ../confmagic.h
 log.o: ../hdrs/mypcre.h
 log.o: ../hdrs/bufferq.h
 log.o: ../hdrs/log.h
@@ -1097,7 +1058,6 @@ look.o: ../hdrs/mushdb.h
 look.o: ../hdrs/flags.h
 look.o: ../hdrs/ptab.h
 look.o: ../hdrs/chunk.h
-look.o: ../confmagic.h
 look.o: ../hdrs/mypcre.h
 look.o: ../hdrs/lock.h
 look.o: ../hdrs/boolexp.h
@@ -1126,7 +1086,6 @@ malias.o: ../hdrs/mushdb.h
 malias.o: ../hdrs/flags.h
 malias.o: ../hdrs/ptab.h
 malias.o: ../hdrs/chunk.h
-malias.o: ../confmagic.h
 malias.o: ../hdrs/mypcre.h
 malias.o: ../hdrs/match.h
 malias.o: ../hdrs/parse.h
@@ -1145,7 +1104,6 @@ markup.o: ../hdrs/htab.h
 markup.o: ../hdrs/case.h
 markup.o: ../hdrs/pueblo.h
 markup.o: ../hdrs/parse.h
-markup.o: ../confmagic.h
 markup.o: ../hdrs/externs.h
 markup.o: ../hdrs/compile.h
 markup.o: ../hdrs/dbdefs.h
@@ -1172,7 +1130,6 @@ match.o: ../hdrs/externs.h
 match.o: ../hdrs/compile.h
 match.o: ../hdrs/dbdefs.h
 match.o: ../hdrs/chunk.h
-match.o: ../confmagic.h
 match.o: ../hdrs/mypcre.h
 match.o: ../hdrs/case.h
 match.o: ../hdrs/match.h
@@ -1190,7 +1147,6 @@ memcheck.o: ../hdrs/mushdb.h
 memcheck.o: ../hdrs/flags.h
 memcheck.o: ../hdrs/ptab.h
 memcheck.o: ../hdrs/chunk.h
-memcheck.o: ../confmagic.h
 memcheck.o: ../hdrs/mypcre.h
 memcheck.o: ../hdrs/mymalloc.h
 memcheck.o: ../hdrs/log.h
@@ -1207,7 +1163,6 @@ move.o: ../hdrs/mushdb.h
 move.o: ../hdrs/flags.h
 move.o: ../hdrs/ptab.h
 move.o: ../hdrs/chunk.h
-move.o: ../confmagic.h
 move.o: ../hdrs/mypcre.h
 move.o: ../hdrs/attrib.h
 move.o: ../hdrs/match.h
@@ -1225,7 +1180,6 @@ mycrypt.o: ../hdrs/copyrite.h
 mycrypt.o: ../options.h
 mycrypt.o: ../hdrs/mushtype.h
 mycrypt.o: ../hdrs/htab.h
-mycrypt.o: ../confmagic.h
 mymalloc.o: ../config.h
 mymalloc.o: ../options.h
 mymalloc.o: ../hdrs/conf.h
@@ -1240,7 +1194,6 @@ mymalloc.o: ../hdrs/chunk.h
 mymalloc.o: ../hdrs/log.h
 mymalloc.o: ../hdrs/externs.h
 mymalloc.o: ../hdrs/compile.h
-mymalloc.o: ../confmagic.h
 mymalloc.o: ../hdrs/mypcre.h
 mymalloc.o: ../hdrs/getpgsiz.h
 mymalloc.o: ../hdrs/mymalloc.h
@@ -1257,7 +1210,6 @@ mysocket.o: ../hdrs/mushdb.h
 mysocket.o: ../hdrs/flags.h
 mysocket.o: ../hdrs/ptab.h
 mysocket.o: ../hdrs/chunk.h
-mysocket.o: ../confmagic.h
 mysocket.o: ../hdrs/mypcre.h
 mysocket.o: ../hdrs/mymalloc.h
 mysocket.o: ../hdrs/mysocket.h
@@ -1276,7 +1228,6 @@ myrlimit.o: ../hdrs/mushdb.h
 myrlimit.o: ../hdrs/flags.h
 myrlimit.o: ../hdrs/ptab.h
 myrlimit.o: ../hdrs/chunk.h
-myrlimit.o: ../confmagic.h
 myrlimit.o: ../hdrs/mypcre.h
 myssl.o: ../hdrs/copyrite.h
 myssl.o: ../config.h
@@ -1285,7 +1236,6 @@ myssl.o: ../options.h
 myssl.o: ../hdrs/mushtype.h
 myssl.o: ../hdrs/htab.h
 myssl.o: ../hdrs/mysocket.h
-myssl.o: ../confmagic.h
 myssl.o: ../hdrs/externs.h
 myssl.o: ../hdrs/compile.h
 myssl.o: ../hdrs/dbdefs.h
@@ -1310,7 +1260,6 @@ notify.o: ../hdrs/externs.h
 notify.o: ../hdrs/compile.h
 notify.o: ../hdrs/dbdefs.h
 notify.o: ../hdrs/chunk.h
-notify.o: ../confmagic.h
 notify.o: ../hdrs/mypcre.h
 notify.o: ../hdrs/lock.h
 notify.o: ../hdrs/boolexp.h
@@ -1345,7 +1294,6 @@ parse.o: ../hdrs/mushdb.h
 parse.o: ../hdrs/flags.h
 parse.o: ../hdrs/ptab.h
 parse.o: ../hdrs/chunk.h
-parse.o: ../confmagic.h
 parse.o: ../hdrs/mypcre.h
 parse.o: ../hdrs/ansi.h
 parse.o: ../hdrs/function.h
@@ -1370,7 +1318,6 @@ player.o: ../hdrs/mushdb.h
 player.o: ../hdrs/flags.h
 player.o: ../hdrs/ptab.h
 player.o: ../hdrs/chunk.h
-player.o: ../confmagic.h
 player.o: ../hdrs/mypcre.h
 player.o: ../hdrs/attrib.h
 player.o: ../hdrs/access.h
@@ -1393,7 +1340,6 @@ plyrlist.o: ../hdrs/mushdb.h
 plyrlist.o: ../hdrs/flags.h
 plyrlist.o: ../hdrs/ptab.h
 plyrlist.o: ../hdrs/chunk.h
-plyrlist.o: ../confmagic.h
 plyrlist.o: ../hdrs/mypcre.h
 plyrlist.o: ../hdrs/attrib.h
 plyrlist.o: ../hdrs/mymalloc.h
@@ -1410,7 +1356,6 @@ predicat.o: ../hdrs/mushdb.h
 predicat.o: ../hdrs/flags.h
 predicat.o: ../hdrs/ptab.h
 predicat.o: ../hdrs/chunk.h
-predicat.o: ../confmagic.h
 predicat.o: ../hdrs/mypcre.h
 predicat.o: ../hdrs/attrib.h
 predicat.o: ../hdrs/lock.h
@@ -1427,7 +1372,6 @@ privtab.o: ../options.h
 privtab.o: ../hdrs/mushtype.h
 privtab.o: ../hdrs/htab.h
 privtab.o: ../hdrs/privtab.h
-privtab.o: ../confmagic.h
 privtab.o: ../hdrs/externs.h
 privtab.o: ../hdrs/compile.h
 privtab.o: ../hdrs/dbdefs.h
@@ -1449,7 +1393,6 @@ info_master.o: ../hdrs/mushdb.h
 info_master.o: ../hdrs/flags.h
 info_master.o: ../hdrs/ptab.h
 info_master.o: ../hdrs/chunk.h
-info_master.o: ../confmagic.h
 info_master.o: ../hdrs/mypcre.h
 info_master.o: ../hdrs/access.h
 info_master.o: ../hdrs/mysocket.h
@@ -1469,7 +1412,6 @@ ptab.o: ../hdrs/mushdb.h
 ptab.o: ../hdrs/flags.h
 ptab.o: ../hdrs/ptab.h
 ptab.o: ../hdrs/chunk.h
-ptab.o: ../confmagic.h
 ptab.o: ../hdrs/mypcre.h
 rob.o: ../config.h
 rob.o: ../hdrs/copyrite.h
@@ -1484,7 +1426,6 @@ rob.o: ../hdrs/mushdb.h
 rob.o: ../hdrs/flags.h
 rob.o: ../hdrs/ptab.h
 rob.o: ../hdrs/chunk.h
-rob.o: ../confmagic.h
 rob.o: ../hdrs/mypcre.h
 rob.o: ../hdrs/attrib.h
 rob.o: ../hdrs/match.h
@@ -1509,7 +1450,6 @@ set.o: ../hdrs/mushdb.h
 set.o: ../hdrs/flags.h
 set.o: ../hdrs/ptab.h
 set.o: ../hdrs/chunk.h
-set.o: ../confmagic.h
 set.o: ../hdrs/mypcre.h
 set.o: ../hdrs/match.h
 set.o: ../hdrs/attrib.h
@@ -1536,7 +1476,6 @@ sig.o: ../hdrs/mushdb.h
 sig.o: ../hdrs/flags.h
 sig.o: ../hdrs/ptab.h
 sig.o: ../hdrs/chunk.h
-sig.o: ../confmagic.h
 sig.o: ../hdrs/mypcre.h
 sort.o: ../hdrs/copyrite.h
 sort.o: ../config.h
@@ -1551,7 +1490,6 @@ sort.o: ../hdrs/mushdb.h
 sort.o: ../hdrs/flags.h
 sort.o: ../hdrs/ptab.h
 sort.o: ../hdrs/chunk.h
-sort.o: ../confmagic.h
 sort.o: ../hdrs/mypcre.h
 sort.o: ../hdrs/parse.h
 sort.o: ../hdrs/ansi.h
@@ -1571,7 +1509,6 @@ speech.o: ../hdrs/mushdb.h
 speech.o: ../hdrs/flags.h
 speech.o: ../hdrs/ptab.h
 speech.o: ../hdrs/chunk.h
-speech.o: ../confmagic.h
 speech.o: ../hdrs/mypcre.h
 speech.o: ../hdrs/ansi.h
 speech.o: ../hdrs/lock.h
@@ -1595,7 +1532,6 @@ sql.o: ../hdrs/mushdb.h
 sql.o: ../hdrs/flags.h
 sql.o: ../hdrs/ptab.h
 sql.o: ../hdrs/chunk.h
-sql.o: ../confmagic.h
 sql.o: ../hdrs/mypcre.h
 sql.o: ../hdrs/log.h
 sql.o: ../hdrs/parse.h
@@ -1610,7 +1546,6 @@ strdup.o: ../options.h
 strdup.o: ../hdrs/mushtype.h
 strdup.o: ../hdrs/htab.h
 strdup.o: ../hdrs/mymalloc.h
-strdup.o: ../confmagic.h
 strtree.o: ../hdrs/copyrite.h
 strtree.o: ../config.h
 strtree.o: ../hdrs/conf.h
@@ -1624,7 +1559,6 @@ strtree.o: ../hdrs/mushdb.h
 strtree.o: ../hdrs/flags.h
 strtree.o: ../hdrs/ptab.h
 strtree.o: ../hdrs/chunk.h
-strtree.o: ../confmagic.h
 strtree.o: ../hdrs/mypcre.h
 strtree.o: ../hdrs/strtree.h
 strutil.o: ../config.h
@@ -1636,7 +1570,6 @@ strutil.o: ../hdrs/htab.h
 strutil.o: ../hdrs/case.h
 strutil.o: ../hdrs/pueblo.h
 strutil.o: ../hdrs/parse.h
-strutil.o: ../confmagic.h
 strutil.o: ../hdrs/externs.h
 strutil.o: ../hdrs/compile.h
 strutil.o: ../hdrs/dbdefs.h
@@ -1661,7 +1594,6 @@ timer.o: ../hdrs/mushdb.h
 timer.o: ../hdrs/flags.h
 timer.o: ../hdrs/ptab.h
 timer.o: ../hdrs/chunk.h
-timer.o: ../confmagic.h
 timer.o: ../hdrs/mypcre.h
 timer.o: ../hdrs/lock.h
 timer.o: ../hdrs/boolexp.h
@@ -1686,7 +1618,6 @@ unparse.o: ../hdrs/mushdb.h
 unparse.o: ../hdrs/flags.h
 unparse.o: ../hdrs/ptab.h
 unparse.o: ../hdrs/chunk.h
-unparse.o: ../confmagic.h
 unparse.o: ../hdrs/mypcre.h
 unparse.o: ../hdrs/lock.h
 unparse.o: ../hdrs/boolexp.h
@@ -1708,7 +1639,6 @@ utils.o: ../hdrs/mushdb.h
 utils.o: ../hdrs/flags.h
 utils.o: ../hdrs/ptab.h
 utils.o: ../hdrs/chunk.h
-utils.o: ../confmagic.h
 utils.o: ../hdrs/mypcre.h
 utils.o: ../hdrs/ansi.h
 utils.o: ../hdrs/mymalloc.h
@@ -1730,7 +1660,6 @@ version.o: ../hdrs/mushdb.h
 version.o: ../hdrs/flags.h
 version.o: ../hdrs/ptab.h
 version.o: ../hdrs/chunk.h
-version.o: ../confmagic.h
 version.o: ../hdrs/mypcre.h
 version.o: ../hdrs/version.h
 version.o: ../hdrs/patches.h
@@ -1749,7 +1678,6 @@ warnings.o: ../hdrs/mushdb.h
 warnings.o: ../hdrs/flags.h
 warnings.o: ../hdrs/ptab.h
 warnings.o: ../hdrs/chunk.h
-warnings.o: ../confmagic.h
 warnings.o: ../hdrs/mypcre.h
 warnings.o: ../hdrs/lock.h
 warnings.o: ../hdrs/boolexp.h
@@ -1769,7 +1697,6 @@ wild.o: ../hdrs/mushdb.h
 wild.o: ../hdrs/flags.h
 wild.o: ../hdrs/ptab.h
 wild.o: ../hdrs/chunk.h
-wild.o: ../confmagic.h
 wild.o: ../hdrs/mypcre.h
 wild.o: ../hdrs/ansi.h
 wild.o: ../hdrs/mymalloc.h
@@ -1787,7 +1714,6 @@ wiz.o: ../hdrs/mushdb.h
 wiz.o: ../hdrs/flags.h
 wiz.o: ../hdrs/ptab.h
 wiz.o: ../hdrs/chunk.h
-wiz.o: ../confmagic.h
 wiz.o: ../hdrs/mypcre.h
 wiz.o: ../hdrs/attrib.h
 wiz.o: ../hdrs/match.h
diff --git a/src/access.c b/src/access.c
index cc7103c..7310bf5 100644
--- a/src/access.c
+++ b/src/access.c
@@ -87,7 +87,6 @@
 #include "mushdb.h"
 #include "dbdefs.h"
 #include "flags.h"
-#include "confmagic.h"
 
 /** An access flag. */
 typedef struct a_acsflag acsflag;
diff --git a/src/atr_tab.c b/src/atr_tab.c
index 036c900..5e6108c 100644
--- a/src/atr_tab.c
+++ b/src/atr_tab.c
@@ -26,7 +26,6 @@
 #include "dbdefs.h"
 #include "log.h"
 #include "parse.h"
-#include "confmagic.h"
 
 /* CatchAll */
 extern ATTR *catchall;
diff --git a/src/attrib.c b/src/attrib.c
index 24f59cb..e2b3590 100644
--- a/src/attrib.c
+++ b/src/attrib.c
@@ -25,7 +25,6 @@
 #include "mushdb.h"
 #include "lock.h"
 #include "log.h"
-#include "confmagic.h"
 
 #ifdef WIN32
 #pragma warning( disable : 4761)        /* disable warning re conversion */
diff --git a/src/boolexp.c b/src/boolexp.c
index 9e59408..f47b0ac 100644
--- a/src/boolexp.c
+++ b/src/boolexp.c
@@ -110,7 +110,6 @@
 #endif
 #include "strtree.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 #ifdef WIN32
 #pragma warning( disable : 4761)        /* disable warning re conversion */
diff --git a/src/bsd.c b/src/bsd.c
index b1f3dc9..c5233fe 100644
--- a/src/bsd.c
+++ b/src/bsd.c
@@ -141,7 +141,6 @@
 #include "game.h"
 #include "dbio.h"
 #include "intmap.h"
-#include "confmagic.h"
 #include "modules.h"
 #include "lua.h"
 #include "mushlua.h"
diff --git a/src/bufferq.c b/src/bufferq.c
index 4ecf072..660bcc9 100644
--- a/src/bufferq.c
+++ b/src/bufferq.c
@@ -36,7 +36,6 @@
 #include "bufferq.h"
 #include "mymalloc.h"
 #include "log.h"
-#include "confmagic.h"
 
 #define BUFFERQLINEOVERHEAD     (2*sizeof(int)+sizeof(time_t)+sizeof(dbref))
 
diff --git a/src/chunk.c b/src/chunk.c
index a53a229..304db95 100644
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -235,7 +235,6 @@
 #include "intrface.h"
 #include "log.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 #ifdef WIN32
 #pragma warning( disable : 4761)        /* disable warning re conversion */
diff --git a/src/cmds.c b/src/cmds.c
index 529fa72..253555f 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -30,7 +30,6 @@
 #include "command.h"
 #include "flags.h"
 #include "log.h"
-#include "confmagic.h"
 
 /* External Stuff */
 void do_poor(dbref player, char *arg1);
diff --git a/src/command.c b/src/command.c
index 4e6d98c..70d5384 100644
--- a/src/command.c
+++ b/src/command.c
@@ -38,7 +38,6 @@
 #include "log.h"
 #include "sort.h"
 #include "cmds.h"
-#include "confmagic.h"
 
 PTAB ptab_command;      /**< Prefix table for command names. */
 PTAB ptab_command_perms;        /**< Prefix table for command permissions */
diff --git a/src/comp_h.c b/src/comp_h.c
index 104fcee..72ea30f 100644
--- a/src/comp_h.c
+++ b/src/comp_h.c
@@ -23,7 +23,6 @@
 #include "externs.h"
 #include "mushdb.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 #ifdef WIN32
 #pragma warning( disable : 4244)        /* NJG: disable warning re conversion */
 #endif
diff --git a/src/comp_w.c b/src/comp_w.c
index 331ca8e..79a9783 100644
--- a/src/comp_w.c
+++ b/src/comp_w.c
@@ -126,7 +126,6 @@
 #include "mushdb.h"
 #include "mymalloc.h"
 #include "dbio.h"
-#include "confmagic.h"
 
 #define MAXTABLE 32768          /**< Maximum words in the table */
 #define MAXWORDS 100            /**< Maximum size of a word */
diff --git a/src/comp_w8.c b/src/comp_w8.c
index cfd4abd..0657ee0 100644
--- a/src/comp_w8.c
+++ b/src/comp_w8.c
@@ -126,7 +126,6 @@
 #include "externs.h"
 #include "mushdb.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 #define MAXTABLE 32768          /**< Maximum words in the table */
 #define MAXWORDS 100            /**< Maximum length of a word */
diff --git a/src/conf.c b/src/conf.c
index b5721c4..0028904 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -39,7 +39,6 @@
 #include "attrib.h"
 #include "help.h"
 #include "function.h"
-#include "confmagic.h"
 
 time_t mudtime;                 /**< game time, in seconds */
 
diff --git a/src/console.c b/src/console.c
index 00933c9..7283225 100644
--- a/src/console.c
+++ b/src/console.c
@@ -1,44 +1,3 @@
-/**
- * \file console.c
- *
- * \brief Alternative main function for PennMUSH which runs on the console
- * instead of over the network.
- */
-
-#include "copyrite.h"
-#include "config.h"
-
-#include <stdio.h>
-#include <stdarg.h>
-#ifdef I_SYS_TYPES
-#include <sys/types.h>
-#endif
-#ifdef WIN32
-#define FD_SETSIZE 256
-#include <windows.h>
-#include <winsock.h>
-#include <io.h>
-#define EINTR WSAEINTR
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define MAXHOSTNAMELEN 32
-#define LC_MESSAGES 6
-#else				/* !WIN32 */
-#ifdef I_SYS_FILE
-#include <sys/file.h>
-#endif
-#ifdef I_SYS_TIME
-#include <sys/time.h>
-#endif
-#include <sys/ioctl.h>
-#include <errno.h>
-#ifdef I_SYS_SOCKET
-#include <sys/socket.h>
-#endif
-#ifdef I_NETINET_IN
-#include <netinet/in.h>
-#endif
-#ifdef I_NETDB
-#include <netdb.h>
 #endif
 #ifdef I_SYS_PARAM
 #include <sys/param.h>
@@ -103,7 +62,6 @@
 #include "attrib.h"
 #include "game.h"
 #include "dbio.h"
-#include "confmagic.h"
 #ifdef HAS_WAITPID
 /** What does wait*() return? */
 #define WAIT_TYPE int
diff --git a/src/cque.c b/src/cque.c
index 0f17860..f15ab28 100644
--- a/src/cque.c
+++ b/src/cque.c
@@ -42,7 +42,6 @@
 #include "dbdefs.h"
 #include "log.h"
 #include "intmap.h"
-#include "confmagic.h"
 
 
 #define MAX_QID 16384
diff --git a/src/create.c b/src/create.c
index 234316b..a60147a 100644
--- a/src/create.c
+++ b/src/create.c
@@ -25,7 +25,6 @@
 #include "parse.h"
 #include "game.h"
 #include "command.h"
-#include "confmagic.h"
 #include "modules.h"
 
 extern struct module_entry_t *module_list;
diff --git a/src/csrimalloc.c b/src/csrimalloc.c
index 28e6775..d8707ff 100644
--- a/src/csrimalloc.c
+++ b/src/csrimalloc.c
@@ -955,7 +955,6 @@ proto((size_t));
 
 #endif  /* __CSRI_TRACE_H__ */                        /* Do not add anything after this line */
 
-#include "confmagic.h"
 
 #ifdef CSRI_TRACE
 /* Tracing malloc definitions - helps find leaks */
diff --git a/src/db.c b/src/db.c
index 4114113..75d6118 100644
--- a/src/db.c
+++ b/src/db.c
@@ -41,7 +41,6 @@
 #ifdef CHAT_SYSTEM
 #include "extchat.h"
 #endif
-#include "confmagic.h"
 #include "ansi.h"
 #include "modules.h"
 
diff --git a/src/destroy.c b/src/destroy.c
index d3c5a08..179fa22 100644
--- a/src/destroy.c
+++ b/src/destroy.c
@@ -72,7 +72,6 @@
 #include "dbdefs.h"
 #include "flags.h"
 #include "lock.h"
-#include "confmagic.h"
 #include "modules.h"
 
 
diff --git a/src/division.c b/src/division.c
index 86867ed..5b69a3d 100644
--- a/src/division.c
+++ b/src/division.c
@@ -21,7 +21,6 @@
 #include "parse.h"
 #include "htab.h"
 #include "cmds.h"
-#include "confmagic.h"
 #include "flags.h"
 #include "dbdefs.h"
 #include "dbio.h"
diff --git a/src/extchat.c b/src/extchat.c
index 340b8e4..df738c7 100644
--- a/src/extchat.c
+++ b/src/extchat.c
@@ -36,7 +36,6 @@
 #include "function.h"
 #include "command.h"
 #include "dbio.h"
-#include "confmagic.h"
 
 
 static CHAN *new_channel(void);
diff --git a/src/extmail.c b/src/extmail.c
index 477ed15..10f98c7 100644
--- a/src/extmail.c
+++ b/src/extmail.c
@@ -94,7 +94,6 @@
 #include "lock.h"
 #include "command.h"
 #include "dbio.h"
-#include "confmagic.h"
 
 #ifdef USE_MAILER
 
diff --git a/src/filecopy.c b/src/filecopy.c
index ec65075..9baa88b 100644
--- a/src/filecopy.c
+++ b/src/filecopy.c
@@ -19,7 +19,6 @@
 #include "externs.h"
 #include "mymalloc.h"
 #include "log.h"
-#include "confmagic.h"
 
 extern char confname[BUFFER_LEN];       /* From bsd.c */
 
diff --git a/src/flags.c b/src/flags.c
index 1a5e9c4..5f67a94 100644
--- a/src/flags.c
+++ b/src/flags.c
@@ -52,7 +52,6 @@
 #include "oldflags.h"
 #include "division.h"
 #include "ansi.h"
-#include "confmagic.h"
 
 
 
diff --git a/src/funcrypt.c b/src/funcrypt.c
index 8003953..7338f61 100644
--- a/src/funcrypt.c
+++ b/src/funcrypt.c
@@ -35,7 +35,6 @@
 #else
 #include "shs.h"
 #endif
-#include "confmagic.h"
 
 
 static char *crunch_code(char *code);
diff --git a/src/function.c b/src/function.c
index a309d07..3c8f856 100644
--- a/src/function.c
+++ b/src/function.c
@@ -27,7 +27,6 @@
 #include "mymalloc.h"
 #include "sort.h"
 #include "funs.h"
-#include "confmagic.h"
 #include "ansi.h"
 
 static void func_hash_insert(const char *name, FUN *func);
diff --git a/src/fundb.c b/src/fundb.c
index 77784c0..8349fa5 100644
--- a/src/fundb.c
+++ b/src/fundb.c
@@ -26,7 +26,6 @@
 #include "log.h"
 #include "attrib.h"
 #include "function.h"
-#include "confmagic.h"
 
 #ifdef WIN32
 #pragma warning( disable : 4761)        /* NJG: disable warning re conversion */
diff --git a/src/fundiv.c b/src/fundiv.c
index 4471e4f..67a7912 100644
--- a/src/fundiv.c
+++ b/src/fundiv.c
@@ -27,7 +27,6 @@
 #include "lock.h"
 #include "log.h"
 #include "attrib.h"
-#include "confmagic.h"
 
 #ifdef WIN32
 #pragma warning( disable : 4761)        /* NJG: disable warning re conversion */
diff --git a/src/funlist.c b/src/funlist.c
index 6a2814e..1197fef 100644
--- a/src/funlist.c
+++ b/src/funlist.c
@@ -26,7 +26,6 @@
 #include "mushdb.h"
 #include "lock.h"
 #include "sort.h"
-#include "confmagic.h"
 
 
 static char *next_token(char *str, char sep);
diff --git a/src/funmath.c b/src/funmath.c
index 4635fe3..82fe2aa 100644
--- a/src/funmath.c
+++ b/src/funmath.c
@@ -17,7 +17,6 @@
 #include "externs.h"
 #include "sort.h"
 #include "parse.h"
-#include "confmagic.h"
 
 #ifdef WIN32
 #pragma warning( disable : 4761)        /* NJG: disable warning re conversion */
diff --git a/src/funmisc.c b/src/funmisc.c
index 9664663..a971acb 100644
--- a/src/funmisc.c
+++ b/src/funmisc.c
@@ -28,7 +28,6 @@
 #include "command.h"
 #include "game.h"
 #include "attrib.h"
-#include "confmagic.h"
 #include "ansi.h"
 
 #ifdef WIN32
diff --git a/src/funstr.c b/src/funstr.c
index f80574f..49eccc0 100644
--- a/src/funstr.c
+++ b/src/funstr.c
@@ -27,7 +27,6 @@
 #include "htab.h"
 #include "lock.h"
 #include "sort.h"
-#include "confmagic.h"
 
 
 #ifdef WIN32
diff --git a/src/funtime.c b/src/funtime.c
index 94a0a9c..0e3dc74 100644
--- a/src/funtime.c
+++ b/src/funtime.c
@@ -24,7 +24,6 @@
 #include "match.h"
 #include "attrib.h"
 #include "attrib.h"
-#include "confmagic.h"
 
 int do_convtime(const char *str, struct tm *ttm);
 void do_timestring(char *buff, char **bp, const char *format,
diff --git a/src/funufun.c b/src/funufun.c
index 15474ba..fbe98d2 100644
--- a/src/funufun.c
+++ b/src/funufun.c
@@ -19,7 +19,6 @@
 #include "dbdefs.h"
 #include "flags.h"
 #include "lock.h"
-#include "confmagic.h"
 
 void do_userfn(char *buff, char **bp, dbref obj, ATTR *attrib, int nargs,
                char **args, dbref executor, dbref caller, dbref enactor,
diff --git a/src/game.c b/src/game.c
index a7d43ab..6500d60 100644
--- a/src/game.c
+++ b/src/game.c
@@ -86,7 +86,6 @@ void Win32MUSH_setup(void);
 #define getrusage(x,p)   syscall(SYS_GETRUSAGE,x,p)
 #endif                          /* fix to HP-UX getrusage() braindamage */
 
-#include "confmagic.h"
 
 /* declarations */
 GLOBALTAB globals = { 0, "", 0, 0, 0, 0, 0, 0, 0, 0 };
diff --git a/src/help.c b/src/help.c
index 841f302..30abcd3 100644
--- a/src/help.c
+++ b/src/help.c
@@ -24,7 +24,6 @@
 #include "flags.h"
 #include "dbdefs.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 HASHTAB help_files;  /**< Help filenames hash table */
 
diff --git a/src/htab.c b/src/htab.c
index 231ef69..4298380 100644
--- a/src/htab.c
+++ b/src/htab.c
@@ -53,7 +53,6 @@
 
 #include "htab.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 /* The Jenkins hash:  http://burtleburtle.net/bob/hash/evahash.html */
 
diff --git a/src/ident.c b/src/ident.c
index daa6011..ef451c2 100644
--- a/src/ident.c
+++ b/src/ident.c
@@ -61,7 +61,6 @@
 #include "ident.h"
 #include "mymalloc.h"
 #include "mysocket.h"
-#include "confmagic.h"
 
   /* Low-level calls and macros */
 
diff --git a/src/info_slave.c b/src/info_slave.c
index dfced0d..204023d 100644
--- a/src/info_slave.c
+++ b/src/info_slave.c
@@ -57,7 +57,6 @@
 #include "mysocket.h"
 #include "lookup.h"
 
-#include "confmagic.h"
 
 #ifndef ENOTSUP
 #define ENOTSUP EPERM
diff --git a/src/intmap.c b/src/intmap.c
index e368793..7014dd2 100644
--- a/src/intmap.c
+++ b/src/intmap.c
@@ -56,7 +56,6 @@
 #include "externs.h"
 #include "mymalloc.h"
 #include "intmap.h"
-#include "confmagic.h"
 
 /** Structure that represents a node in a patricia tree. */
 typedef struct patricia {
diff --git a/src/lock.c b/src/lock.c
index 91f0192..8d2e4f5 100644
--- a/src/lock.c
+++ b/src/lock.c
@@ -49,7 +49,6 @@
 #include "privtab.h"
 #include "parse.h"
 #include "htab.h"
-#include "confmagic.h"
 
 
 /* If any lock_type ever contains the character '|', reading in locks
diff --git a/src/log.c b/src/log.c
index 93d8005..abfd7f8 100644
--- a/src/log.c
+++ b/src/log.c
@@ -37,7 +37,6 @@
 #include "htab.h"
 #include "bufferq.h"
 #include "log.h"
-#include "confmagic.h"
 
 static char *quick_unparse(dbref object);
 static void start_log(FILE ** fp, const char *filename);
diff --git a/src/look.c b/src/look.c
index db58478..56eb82f 100644
--- a/src/look.c
+++ b/src/look.c
@@ -29,7 +29,6 @@
 #include "command.h"
 #include "parse.h"
 #include "privtab.h"
-#include "confmagic.h"
 #include "log.h"
 
 static void look_exits(dbref player, dbref loc, const char *exit_name);
diff --git a/src/malias.c b/src/malias.c
index b5683c8..a019a30 100644
--- a/src/malias.c
+++ b/src/malias.c
@@ -64,7 +64,6 @@
 #include "pueblo.h"
 #include "log.h"
 #include "dbio.h"
-#include "confmagic.h"
 
 
 
diff --git a/src/markup.c b/src/markup.c
index 4f0b3e4..0dead9f 100644
--- a/src/markup.c
+++ b/src/markup.c
@@ -24,7 +24,6 @@
 #include "mymalloc.h"
 #include "log.h"
 #include "game.h"
-#include "confmagic.h"
 
 #define ANSI_BEGIN   "\x1B["
 #define ANSI_FINISH  "m"
diff --git a/src/match.c b/src/match.c
index bc6cef9..58b66e8 100644
--- a/src/match.c
+++ b/src/match.c
@@ -53,7 +53,6 @@
 #include "parse.h"
 #include "flags.h"
 #include "dbdefs.h"
-#include "confmagic.h"
 
 static dbref match_result_internal
   (dbref who, const char *name, int type, long flags);
diff --git a/src/memcheck.c b/src/memcheck.c
index b052f51..f2f232c 100644
--- a/src/memcheck.c
+++ b/src/memcheck.c
@@ -20,7 +20,6 @@
 #include "dbdefs.h"
 #include "mymalloc.h"
 #include "log.h"
-#include "confmagic.h"
 
 typedef struct mem_check MEM;
 
diff --git a/src/move.c b/src/move.c
index 3333eff..d6f2479 100644
--- a/src/move.c
+++ b/src/move.c
@@ -25,7 +25,6 @@
 #include "command.h"
 #include "cmds.h"
 #include "game.h"
-#include "confmagic.h"
 
 void moveit(dbref what, dbref where, int nomovemsgs);
 static void send_contents(dbref loc, dbref dest);
diff --git a/src/mushlua.c b/src/mushlua.c
index e06f868..a1fca31 100644
--- a/src/mushlua.c
+++ b/src/mushlua.c
@@ -7,7 +7,6 @@
 #include "parse.h"
 #include "htab.h"
 #include "command.h"
-#include "confmagic.h"
 
 #include "lua.h"
 #include "lualib.h"
diff --git a/src/mycrypt.c b/src/mycrypt.c
index 7e9e4d0..52437a6 100644
--- a/src/mycrypt.c
+++ b/src/mycrypt.c
@@ -17,7 +17,6 @@
 #else
 #include "shs.h"
 #endif
-#include "confmagic.h"
 
 char *mush_crypt(const char *key);
 
diff --git a/src/mymalloc.c b/src/mymalloc.c
index bfb7857..65dfd10 100644
--- a/src/mymalloc.c
+++ b/src/mymalloc.c
@@ -47,7 +47,6 @@
 #include "externs.h"
 #include "getpgsiz.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 /* An undefined or illegal MALLOC_PACKAGE is treated as system 
  * malloc, because we're such nice forgiving people
diff --git a/src/myrlimit.c b/src/myrlimit.c
index cf9c301..8de95d1 100644
--- a/src/myrlimit.c
+++ b/src/myrlimit.c
@@ -38,7 +38,6 @@
 #include "conf.h"
 #include "version.h"
 #include "externs.h"
-#include "confmagic.h"
 
 #ifdef HAS_GETRLIMIT
 void init_rlimit(void);
diff --git a/src/mysocket.c b/src/mysocket.c
index 720ad5e..d73c48f 100644
--- a/src/mysocket.c
+++ b/src/mysocket.c
@@ -106,7 +106,6 @@ extern int h_errno;
 #include "mymalloc.h"
 #include "mysocket.h"
 #include "ident.h"
-#include "confmagic.h"
 
 static int connect_nonb
   (int sockfd, const struct sockaddr *saptr, socklen_t salen, bool nonb);
diff --git a/src/myssl.c b/src/myssl.c
index 02e0946..068a782 100644
--- a/src/myssl.c
+++ b/src/myssl.c
@@ -81,7 +81,6 @@ void shutdown_checkpoint(void);
 #include "myssl.h"
 #include "log.h"
 #include "parse.h"
-#include "confmagic.h"
 
 #define MYSSL_RB        0x1     /**< Read blocked (on read) */
 #define MYSSL_WB        0x2     /**< Write blocked (on write) */
diff --git a/src/notify.c b/src/notify.c
index 6c43e15..92e16ce 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -88,7 +88,6 @@ extern CHAN *channels;
 #include "extmail.h"
 #include "attrib.h"
 #include "game.h"
-#include "confmagic.h"
 
 static int under_limit = 1;
 
diff --git a/src/parse.c b/src/parse.c
index 3f8cded..022ea95 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -36,7 +36,6 @@
 #include "flags.h"
 #include "log.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 extern char *absp[], *obj[], *poss[], *subj[];  /* fundb.c */
 extern int inum, inum_limit;
diff --git a/src/pcre.c b/src/pcre.c
index c13cece..db6a684 100644
--- a/src/pcre.c
+++ b/src/pcre.c
@@ -58,7 +58,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "confmagic.h"
 #undef min
 #undef max
 
diff --git a/src/player.c b/src/player.c
index 7707c74..5c5e457 100644
--- a/src/player.c
+++ b/src/player.c
@@ -52,7 +52,6 @@ extern char *crypt(const char *, const char *);
 extern struct module_entry_t *module_list;
 
 #include "extmail.h"
-#include "confmagic.h"
 
 dbref email_register_player
   (const char *name, const char *email, const char *host, const char *ip);
diff --git a/src/plyrlist.c b/src/plyrlist.c
index fc5da19..082a2ac 100644
--- a/src/plyrlist.c
+++ b/src/plyrlist.c
@@ -23,7 +23,6 @@
 #include "attrib.h"
 #include "htab.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 
 /** Hash table of player names */
diff --git a/src/predicat.c b/src/predicat.c
index 9cda25c..60ffdad 100644
--- a/src/predicat.c
+++ b/src/predicat.c
@@ -38,7 +38,6 @@
 #include "dbdefs.h"
 #include "privtab.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 int forbidden_name(const char *name);
 void do_switch(dbref player, char *expression, char **argv,
diff --git a/src/privtab.c b/src/privtab.c
index 838af7c..eb9f963 100644
--- a/src/privtab.c
+++ b/src/privtab.c
@@ -18,7 +18,6 @@
 #include "mushtype.h"
 #include "privtab.h"
 #include "externs.h"
-#include "confmagic.h"
 
 
 /** Convert a string to a set of privilege bits, masked by an original set.
diff --git a/src/prog.c b/src/prog.c
index eb1b52e..b597861 100644
--- a/src/prog.c
+++ b/src/prog.c
@@ -14,7 +14,6 @@
 #include "boolexp.h"
 #include "command.h"
 #include "cmds.h"
-#include "confmagic.h"
 #include "attrib.h"
 #include "flags.h"
 #include "mushdb.h"
diff --git a/src/ptab.c b/src/ptab.c
index 4b28a69..27c32fb 100644
--- a/src/ptab.c
+++ b/src/ptab.c
@@ -13,7 +13,6 @@
 #include "conf.h"
 #include "externs.h"
 #include "ptab.h"
-#include "confmagic.h"
 
 static int ptab_find_exact_nun(PTAB *tab, const char *key);
 static int WIN32_CDECL ptab_cmp(const void *, const void *);
diff --git a/src/rob.c b/src/rob.c
index 92edb73..036bf8c 100644
--- a/src/rob.c
+++ b/src/rob.c
@@ -25,7 +25,6 @@
 #include "lock.h"
 #include "dbdefs.h"
 #include "game.h"
-#include "confmagic.h"
 #include "case.h"
 
 static void do_give_to(dbref player, char *arg, int silent);
diff --git a/src/services.c b/src/services.c
index 35511fa..39fe09e 100644
--- a/src/services.c
+++ b/src/services.c
@@ -22,7 +22,6 @@
 #include "match.h"
 #include "externs.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 #ifdef WIN32SERVICES
 
diff --git a/src/set.c b/src/set.c
index fd5f61e..d1d13dc 100644
--- a/src/set.c
+++ b/src/set.c
@@ -37,7 +37,6 @@
 #include "dbdefs.h"
 #include "lock.h"
 #include "log.h"
-#include "confmagic.h"
 
 static int chown_ok(dbref player, dbref thing, dbref newowner);
 void do_attrib_flags
diff --git a/src/shs.c b/src/shs.c
index fe078ea..59744ec 100644
--- a/src/shs.c
+++ b/src/shs.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include "shs.h"
-#include "confmagic.h"
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
diff --git a/src/sig.c b/src/sig.c
index dccfc66..66a6322 100644
--- a/src/sig.c
+++ b/src/sig.c
@@ -10,7 +10,6 @@
 #include <signal.h>
 #include "conf.h"
 #include "externs.h"
-#include "confmagic.h"
 
 #ifndef HAVE_SIGPROCMASK
 static Sigfunc saved_handlers[NSIG];
diff --git a/src/sort.c b/src/sort.c
index ffca23f..eaefc5b 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -14,7 +14,6 @@
 #include "ansi.h"
 #include "command.h"
 #include "sort.h"
-#include "confmagic.h"
 
 
 #define EPSILON 0.000000001  /**< limit of precision for float equality */
diff --git a/src/speech.c b/src/speech.c
index 8bad6b0..fdf7bc7 100644
--- a/src/speech.c
+++ b/src/speech.c
@@ -27,7 +27,6 @@
 #include "game.h"
 #include "mypcre.h"
 #include "sort.h"
-#include "confmagic.h"
 
 int okay_pemit(dbref player, dbref target);
 static dbref speech_loc(dbref thing);
diff --git a/src/sql.c b/src/sql.c
index 42bc0c0..7623f61 100644
--- a/src/sql.c
+++ b/src/sql.c
@@ -56,7 +56,6 @@ static sqlite3 *sqlite3_connp = NULL;
 #include "mushdb.h"
 #include "dbdefs.h"
 #include "conf.h"
-#include "confmagic.h"
 #include "ansi.h"
 
 /* Supported platforms */
diff --git a/src/strdup.c b/src/strdup.c
index 6ff8009..9edb8ad 100644
--- a/src/strdup.c
+++ b/src/strdup.c
@@ -14,7 +14,6 @@
 #include "conf.h"
 #include "copyrite.h"
 #include "mymalloc.h"
-#include "confmagic.h"
 
 #ifndef HAVE_STRDUP
 char *strdup(const char *s);
diff --git a/src/strtree.c b/src/strtree.c
index 372a658..d996acd 100644
--- a/src/strtree.c
+++ b/src/strtree.c
@@ -43,7 +43,6 @@
 #include "externs.h"
 
 #include "strtree.h"
-#include "confmagic.h"
 
 #ifndef UCHAR_MAX
 #define UCHAR_MAX 255   /**< Largest unsigned character */
diff --git a/src/strutil.c b/src/strutil.c
index 84d03ed..da701f9 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -26,7 +26,6 @@
 #include "ansi.h"
 #include "mymalloc.h"
 #include "log.h"
-#include "confmagic.h"
 
 int format_long(intmax_t val, char *buff, char **bp, int maxlen, int base);
 
diff --git a/src/timer.c b/src/timer.c
index 168a6a0..21a163a 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -44,7 +44,6 @@
 #include "help.h"
 #include "parse.h"
 #include "attrib.h"
-#include "confmagic.h"
 #include "modules.h"
 
 /* Module extern */
diff --git a/src/unparse.c b/src/unparse.c
index ce3c956..00ba9c2 100644
--- a/src/unparse.c
+++ b/src/unparse.c
@@ -25,7 +25,6 @@
 #include "ansi.h"
 #include "pueblo.h"
 #include "parse.h"
-#include "confmagic.h"
 
 static int couldunparse;
 
diff --git a/src/utils.c b/src/utils.c
index c2f5740..372bc59 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -48,7 +48,6 @@
 #include "attrib.h"
 #include "parse.h"
 #include "lock.h"
-#include "confmagic.h"
 #include "modules.h"
 
 
diff --git a/src/version.c b/src/version.c
index 8923ea3..0a364ae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -18,7 +18,6 @@
 #ifndef WIN32
 #include "buildinf.h"
 #endif
-#include "confmagic.h"
 
 void do_version(dbref player);
 
diff --git a/src/warnings.c b/src/warnings.c
index eb41063..0141ad9 100644
--- a/src/warnings.c
+++ b/src/warnings.c
@@ -21,7 +21,6 @@
 #include "dbdefs.h"
 #include "match.h"
 #include "attrib.h"
-#include "confmagic.h"
 
 
 /* We might check for both locked and unlocked warnings if we can't
diff --git a/src/wild.c b/src/wild.c
index c34713d..4170f69 100644
--- a/src/wild.c
+++ b/src/wild.c
@@ -34,7 +34,6 @@
 #include "mymalloc.h"
 #include "parse.h"
 #include "mypcre.h"
-#include "confmagic.h"
 
 /** Force a char to be lowercase */
 #define FIXCASE(a) (DOWNCASE(a))
diff --git a/src/wiz.c b/src/wiz.c
index cec3587..73473d2 100644
--- a/src/wiz.c
+++ b/src/wiz.c
@@ -49,7 +49,6 @@
 #include "extmail.h"
 
 
-#include "confmagic.h"
 
 extern dbref find_entrance(dbref door);
 struct db_stat_info *get_stats(dbref owner);