diff --git a/ChangeLog b/ChangeLog
index 8caea5d3..89ce3e8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ v0.35.02	22-Jun-2002
 		Added checks for GoldED in external program checks.
 		Added new empty path /opt/mbse/var/boxes.
 		Implemented nodes private outbound boxes.
+		Revised the dependencies for all sourcefiles.
 
 	common.a:
 		Added debug nodelist IFT flag for logging.
diff --git a/lib/Makefile b/lib/Makefile
index 0ba4cccf..ec8861d8 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,12 +7,12 @@ include ../Makefile.global
 CLCOMM_SRCS	= clcomm.c client.c crc.c semafore.c signame.c 
 CLCOMM_OBJS	= clcomm.o client.o crc.o semafore.o signame.o
 CLCOMM_HDRS	= clcomm.h
-COMMON_SRCS	= attach.c charconv_utf.c falists.c hdr.c msgflags.c parsedate.c rfcmsg.c unpacker.c \
+COMMON_SRCS	= attach.c charconv_utf.c falists.c hdr.c parsedate.c rfcmsg.c unpacker.c \
 		  batchrd.c charset.c ftn.c nodelist.c pktname.c mangle.c \
 		  charconv.c dostran.c ftnmsg.c mbfile.c nodelock.c rawio.c strcasestr.c \
 		  charconv_hz.c execute.c expipe.c getheader.c mime.c noderecord.c rfcaddr.c strutil.c \
 		  charconv_jp.c faddr.c gmtoffset.c packet.c rfcdate.c term.c 
-COMMON_OBJS	= ftscprod.o attach.o charconv_utf.o falists.o hdr.o msgflags.o parsedate.o rfcmsg.o unpacker.o \
+COMMON_OBJS	= ftscprod.o attach.o charconv_utf.o falists.o hdr.o parsedate.o rfcmsg.o unpacker.o \
 		  batchrd.o charset.o ftn.o nodelist.o pktname.o mangle.o \
 		  charconv.o dostran.o ftnmsg.o mbfile.o nodelock.o rawio.o strcasestr.o \
 		  charconv_hz.o execute.o expipe.o getheader.o mime.o noderecord.o rfcaddr.o strutil.o \
@@ -115,61 +115,60 @@ depend:		ftscprod.c
 
 # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
 # Dependencies generated by make depend
-clcomm.o: libs.h clcomm.h
-client.o: libs.h clcomm.h
-crc.o: libs.h clcomm.h
-semafore.o: libs.h structs.h clcomm.h common.h
-signame.o: libs.h clcomm.h
-attach.o: libs.h structs.h users.h records.h clcomm.h common.h
-charconv_utf.o: libs.h structs.h common.h
-falists.o: libs.h structs.h clcomm.h common.h
-hdr.o: libs.h structs.h common.h
-msgflags.o: libs.h structs.h clcomm.h common.h
-parsedate.o: libs.h structs.h common.h
-rfcmsg.o: libs.h structs.h users.h records.h common.h clcomm.h
-unpacker.o: libs.h structs.h users.h records.h clcomm.h common.h
-batchrd.o: libs.h structs.h clcomm.h common.h
-charset.o: libs.h structs.h common.h clcomm.h
-ftn.o: libs.h structs.h users.h records.h clcomm.h dbftn.h common.h
-nodelist.o: libs.h structs.h users.h records.h clcomm.h common.h
-pktname.o: libs.h structs.h users.h records.h clcomm.h common.h
-mangle.o: libs.h structs.h clcomm.h common.h
-charconv.o: libs.h structs.h users.h records.h common.h clcomm.h
-dostran.o: libs.h structs.h users.h records.h common.h
-ftnmsg.o: libs.h structs.h common.h clcomm.h
-mbfile.o: libs.h structs.h clcomm.h common.h
-nodelock.o: libs.h structs.h clcomm.h common.h
-rawio.o: libs.h structs.h common.h
-strcasestr.o: libs.h
-charconv_hz.o: libs.h structs.h common.h clcomm.h
-execute.o: libs.h structs.h clcomm.h common.h
-expipe.o: libs.h structs.h clcomm.h common.h
-getheader.o: libs.h structs.h users.h records.h clcomm.h common.h
-mime.o: libs.h structs.h clcomm.h common.h
-noderecord.o: libs.h structs.h common.h users.h records.h dbnode.h common.h
-rfcaddr.o: libs.h structs.h users.h records.h clcomm.h common.h
-strutil.o: libs.h structs.h common.h
-charconv_jp.o: libs.h structs.h common.h
-faddr.o: libs.h structs.h common.h
-gmtoffset.o: libs.h structs.h common.h
-packet.o: libs.h structs.h users.h records.h clcomm.h common.h dbnode.h
-rfcdate.o: libs.h structs.h common.h clcomm.h
-term.o: libs.h structs.h users.h ansi.h records.h common.h
-dbcfg.o: libs.h mbse.h structs.h users.h records.h dbcfg.h
-dbdupe.o: libs.h structs.h clcomm.h dbdupe.h
-dbftn.o: libs.h structs.h users.h records.h dbcfg.h dbftn.h
-dbmsgs.o: libs.h structs.h users.h records.h clcomm.h dbcfg.h dbmsgs.h
-dbnode.o: libs.h structs.h common.h users.h records.h clcomm.h dbcfg.h dbnode.h
-dbtic.o: libs.h structs.h users.h records.h clcomm.h dbcfg.h dbtic.h
-dbuser.o: libs.h structs.h users.h records.h dbcfg.h dbuser.h
-jammsg.o: libs.h clcomm.h msgtext.h msg.h jam.h jammsg.h
-msg.o: libs.h msgtext.h msg.h jammsg.h
-msgtext.o: libs.h msgtext.h msg.h
-nntp.o: libs.h structs.h users.h records.h clcomm.h mbinet.h
-pop3.o: libs.h structs.h users.h records.h clcomm.h mbinet.h
-smtp.o: libs.h structs.h users.h records.h clcomm.h mbinet.h
-diesel.o: libs.h diesel.h
-mbdiesel.o: libs.h structs.h users.h records.h common.h clcomm.h diesel.h
-memwatch.o: ../config.h ../config.h libs.h memwatch.h
-ftscprod.o: libs.h structs.h common.h
+clcomm.o: ../config.h libs.h memwatch.h clcomm.h
+client.o: ../config.h libs.h memwatch.h clcomm.h
+crc.o: ../config.h libs.h memwatch.h clcomm.h
+semafore.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+signame.o: ../config.h libs.h memwatch.h clcomm.h
+attach.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h common.h
+charconv_utf.o: ../config.h libs.h memwatch.h structs.h common.h
+falists.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+hdr.o: ../config.h libs.h memwatch.h structs.h common.h
+parsedate.o: ../config.h libs.h memwatch.h structs.h common.h
+rfcmsg.o: ../config.h libs.h memwatch.h structs.h users.h records.h common.h clcomm.h
+unpacker.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h common.h
+batchrd.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+charset.o: ../config.h libs.h memwatch.h structs.h common.h clcomm.h
+ftn.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h dbftn.h common.h
+nodelist.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h common.h
+pktname.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h common.h
+mangle.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+charconv.o: ../config.h libs.h memwatch.h structs.h users.h records.h common.h clcomm.h
+dostran.o: ../config.h libs.h memwatch.h structs.h users.h records.h common.h
+ftnmsg.o: ../config.h libs.h memwatch.h structs.h common.h clcomm.h
+mbfile.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+nodelock.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+rawio.o: ../config.h libs.h memwatch.h structs.h common.h
+strcasestr.o: ../config.h libs.h memwatch.h
+charconv_hz.o: ../config.h libs.h memwatch.h structs.h common.h clcomm.h
+execute.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+expipe.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+getheader.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h common.h
+mime.o: ../config.h libs.h memwatch.h structs.h clcomm.h common.h
+noderecord.o: ../config.h libs.h memwatch.h structs.h common.h users.h records.h dbnode.h common.h
+rfcaddr.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h common.h
+strutil.o: ../config.h libs.h memwatch.h structs.h common.h
+charconv_jp.o: ../config.h libs.h memwatch.h structs.h common.h
+faddr.o: ../config.h libs.h memwatch.h structs.h common.h
+gmtoffset.o: ../config.h libs.h memwatch.h structs.h common.h
+packet.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h common.h dbnode.h
+rfcdate.o: ../config.h libs.h memwatch.h structs.h common.h clcomm.h
+term.o: ../config.h libs.h memwatch.h structs.h users.h ansi.h records.h common.h
+dbcfg.o: ../config.h libs.h memwatch.h mbse.h structs.h users.h records.h dbcfg.h
+dbdupe.o: ../config.h libs.h memwatch.h structs.h clcomm.h dbdupe.h
+dbftn.o: ../config.h libs.h memwatch.h structs.h users.h records.h dbcfg.h dbftn.h
+dbmsgs.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h dbcfg.h dbmsgs.h
+dbnode.o: ../config.h libs.h memwatch.h structs.h common.h users.h records.h clcomm.h dbcfg.h dbnode.h
+dbtic.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h dbcfg.h dbtic.h
+dbuser.o: ../config.h libs.h memwatch.h structs.h users.h records.h dbcfg.h dbuser.h
+jammsg.o: ../config.h libs.h memwatch.h clcomm.h msgtext.h msg.h jam.h jammsg.h
+msg.o: ../config.h libs.h memwatch.h msgtext.h msg.h jammsg.h
+msgtext.o: ../config.h libs.h memwatch.h msgtext.h msg.h
+nntp.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h mbinet.h
+pop3.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h mbinet.h
+smtp.o: ../config.h libs.h memwatch.h structs.h users.h records.h clcomm.h mbinet.h
+diesel.o: ../config.h libs.h memwatch.h diesel.h
+mbdiesel.o: ../config.h libs.h memwatch.h structs.h users.h records.h common.h clcomm.h diesel.h
+memwatch.o: ../config.h libs.h memwatch.h
+ftscprod.o: ../config.h libs.h memwatch.h structs.h common.h
 # End of generated dependencies
diff --git a/lib/attach.c b/lib/attach.c
index 6eb07f3d..137e7704 100644
--- a/lib/attach.c
+++ b/lib/attach.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/batchrd.c b/lib/batchrd.c
index 6b2c8b33..74fc2043 100644
--- a/lib/batchrd.c
+++ b/lib/batchrd.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/charconv.c b/lib/charconv.c
index 04caf802..b860f2e8 100644
--- a/lib/charconv.c
+++ b/lib/charconv.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/charconv_hz.c b/lib/charconv_hz.c
index 93f2545d..89de4ccb 100644
--- a/lib/charconv_hz.c
+++ b/lib/charconv_hz.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 #include "clcomm.h"
diff --git a/lib/charconv_jp.c b/lib/charconv_jp.c
index c191a5ad..c7d4d652 100644
--- a/lib/charconv_jp.c
+++ b/lib/charconv_jp.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 
diff --git a/lib/charconv_utf.c b/lib/charconv_utf.c
index 896be839..8a172635 100644
--- a/lib/charconv_utf.c
+++ b/lib/charconv_utf.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 
diff --git a/lib/charset.c b/lib/charset.c
index d60d5411..2a57e0fc 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 #include "clcomm.h"
diff --git a/lib/clcomm.c b/lib/clcomm.c
index b0b66c2e..f2473cd6 100644
--- a/lib/clcomm.c
+++ b/lib/clcomm.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "clcomm.h"
 
 
diff --git a/lib/client.c b/lib/client.c
index 3fac67fb..473bf63d 100644
--- a/lib/client.c
+++ b/lib/client.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "clcomm.h"
 
 static int		sock = -1;	/* Unix Datagram socket		*/
diff --git a/lib/common.h b/lib/common.h
index 8e2e3e9a..51aed7e6 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -903,16 +903,6 @@ extern CYYSTYPE cyylval;
 time_t parsedate(char *, TIMEINFO *);
 
 
-/*
- * msgflags.c
- */
-int	flag_on(char *,char *);
-int	flagset(char *);
-char	*compose_flags(int,char *);
-char	*strip_flags(char *);
-int	flag_on(char *,char *);
-
-
 
 /*
  * strcasestr.c
diff --git a/lib/crc.c b/lib/crc.c
index cf04918c..06d9a847 100644
--- a/lib/crc.c
+++ b/lib/crc.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "clcomm.h"
 
 
diff --git a/lib/dbcfg.c b/lib/dbcfg.c
index c51b7072..b857483b 100644
--- a/lib/dbcfg.c
+++ b/lib/dbcfg.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "mbse.h"
 #include "structs.h"
 #include "users.h"
diff --git a/lib/dbdupe.c b/lib/dbdupe.c
index 2b842e55..81497122 100644
--- a/lib/dbdupe.c
+++ b/lib/dbdupe.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "dbdupe.h"
diff --git a/lib/dbftn.c b/lib/dbftn.c
index ff73e6eb..90daf572 100644
--- a/lib/dbftn.c
+++ b/lib/dbftn.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/dbmsgs.c b/lib/dbmsgs.c
index 97dc6ef9..723e942b 100644
--- a/lib/dbmsgs.c
+++ b/lib/dbmsgs.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/dbnode.c b/lib/dbnode.c
index 9451435e..e404ce16 100644
--- a/lib/dbnode.c
+++ b/lib/dbnode.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 #include "users.h"
diff --git a/lib/dbtic.c b/lib/dbtic.c
index b4ba37f9..96727a8c 100644
--- a/lib/dbtic.c
+++ b/lib/dbtic.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/dbuser.c b/lib/dbuser.c
index 7c123dce..928e33d5 100644
--- a/lib/dbuser.c
+++ b/lib/dbuser.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/diesel.c b/lib/diesel.c
index a4a97d0a..65b3edf3 100644
--- a/lib/diesel.c
+++ b/lib/diesel.c
@@ -326,7 +326,9 @@ documented above, in outstring.
     
 */
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "diesel.h"
 
 /* Get(<var>, <structure_type>) allocates a new  <structure_type>  and
diff --git a/lib/dostran.c b/lib/dostran.c
index cab0d075..a821378b 100644
--- a/lib/dostran.c
+++ b/lib/dostran.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/execute.c b/lib/execute.c
index 7df4a8aa..5e4cc01f 100644
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/expipe.c b/lib/expipe.c
index 4754fc2c..2dabd15f 100644
--- a/lib/expipe.c
+++ b/lib/expipe.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/faddr.c b/lib/faddr.c
index f824f588..45f0bed8 100644
--- a/lib/faddr.c
+++ b/lib/faddr.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 
diff --git a/lib/falists.c b/lib/falists.c
index 48582c02..1d1410dc 100644
--- a/lib/falists.c
+++ b/lib/falists.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/ftn.c b/lib/ftn.c
index 1005bc10..260c375d 100644
--- a/lib/ftn.c
+++ b/lib/ftn.c
@@ -31,7 +31,9 @@
 
 #define	DB_FIDONET
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/ftnmsg.c b/lib/ftnmsg.c
index 181cdf3e..d49e24e2 100644
--- a/lib/ftnmsg.c
+++ b/lib/ftnmsg.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 #include "clcomm.h"
diff --git a/lib/getheader.c b/lib/getheader.c
index 9a3ae4ab..0b7d2bc9 100644
--- a/lib/getheader.c
+++ b/lib/getheader.c
@@ -30,7 +30,9 @@
 
 #define	DB_NODES
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/gmtoffset.c b/lib/gmtoffset.c
index 74afcb31..cce5d999 100644
--- a/lib/gmtoffset.c
+++ b/lib/gmtoffset.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 
diff --git a/lib/hdr.c b/lib/hdr.c
index 10093ba2..44c3fadf 100644
--- a/lib/hdr.c
+++ b/lib/hdr.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 
diff --git a/lib/jammsg.c b/lib/jammsg.c
index 063739b9..4756872c 100644
--- a/lib/jammsg.c
+++ b/lib/jammsg.c
@@ -34,7 +34,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "clcomm.h"
 #include "msgtext.h"
 #include "msg.h"
diff --git a/lib/libs.h b/lib/libs.h
index 950c05bf..7dbad582 100644
--- a/lib/libs.h
+++ b/lib/libs.h
@@ -33,8 +33,6 @@
 #ifndef _LIBS_H
 #define _LIBS_H
 
-#include "../config.h"
-
 #ifndef _GNU_SOURCE
 #define	_GNU_SOURCE 1
 #endif
@@ -85,7 +83,6 @@
 #include <setjmp.h>
 #include <grp.h>
 #include <sys/resource.h>
-#include "../lib/memwatch.h"
 
 #pragma pack(1)
 
diff --git a/lib/mangle.c b/lib/mangle.c
index f594cab8..14f2b5a7 100644
--- a/lib/mangle.c
+++ b/lib/mangle.c
@@ -30,7 +30,9 @@
  * Ideas taken from Samba, Copyright (C) Andrew Tridgell 1992-1998
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/mbdiesel.c b/lib/mbdiesel.c
index efca5301..69711fbb 100644
--- a/lib/mbdiesel.c
+++ b/lib/mbdiesel.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/mbfile.c b/lib/mbfile.c
index fd2789cf..693198e6 100644
--- a/lib/mbfile.c
+++ b/lib/mbfile.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/memwatch.c b/lib/memwatch.c
index 34221d11..fb5f55d7 100644
--- a/lib/memwatch.c
+++ b/lib/memwatch.c
@@ -82,7 +82,6 @@
 ** Include files
 ***********************************************************************/
 
-#include "../config.h"
 #include "libs.h"
 #include "memwatch.h"
 
diff --git a/lib/mime.c b/lib/mime.c
index 462e4fe2..66b7f166 100644
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/mkprod.awk b/lib/mkprod.awk
index ead997d3..5ff1a83a 100644
--- a/lib/mkprod.awk
+++ b/lib/mkprod.awk
@@ -2,7 +2,9 @@
 #
 
 BEGIN	{
+		print "#include \"../config.h\""
 		print "#include \"libs.h\""
+		print "#include \"memwatch.h\""
 		print "#include \"structs.h\""
 		print "#include \"common.h\""
 		print ""
diff --git a/lib/msg.c b/lib/msg.c
index d8c37aaf..a5ee3274 100644
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "msgtext.h"
 #include "msg.h"
 #include "jammsg.h"
diff --git a/lib/msgtext.c b/lib/msgtext.c
index 67f68024..d98cdf37 100644
--- a/lib/msgtext.c
+++ b/lib/msgtext.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "msgtext.h"
 #include "msg.h"
 
diff --git a/lib/nntp.c b/lib/nntp.c
index b77b2ecc..1e85329f 100644
--- a/lib/nntp.c
+++ b/lib/nntp.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/nodelist.c b/lib/nodelist.c
index 05dbcb61..d739c291 100644
--- a/lib/nodelist.c
+++ b/lib/nodelist.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/nodelock.c b/lib/nodelock.c
index 0110dbad..f9f0783c 100644
--- a/lib/nodelock.c
+++ b/lib/nodelock.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/noderecord.c b/lib/noderecord.c
index 5f3e3380..67383484 100644
--- a/lib/noderecord.c
+++ b/lib/noderecord.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 #include "users.h"
diff --git a/lib/packet.c b/lib/packet.c
index 68dba938..a21a1a2b 100644
--- a/lib/packet.c
+++ b/lib/packet.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/parsedate.c b/lib/parsedate.c
index ad833299..8fd494d2 100644
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -19,7 +19,9 @@
 /* SUPPRESS 593 on yynewstate *//* Label was not used */
 /* SUPPRESS 595 on yypvt *//* Automatic variable may be used before set */
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 
diff --git a/lib/pktname.c b/lib/pktname.c
index a548c9ef..8f0a909c 100644
--- a/lib/pktname.c
+++ b/lib/pktname.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/pop3.c b/lib/pop3.c
index 95df3a49..c8caf86f 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/rawio.c b/lib/rawio.c
index b854039d..46981eb3 100644
--- a/lib/rawio.c
+++ b/lib/rawio.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 
diff --git a/lib/rfcaddr.c b/lib/rfcaddr.c
index dd5d0f77..6abe320c 100644
--- a/lib/rfcaddr.c
+++ b/lib/rfcaddr.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/rfcdate.c b/lib/rfcdate.c
index 4504eb4a..ca68f163 100644
--- a/lib/rfcdate.c
+++ b/lib/rfcdate.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 #include "clcomm.h"
diff --git a/lib/rfcmsg.c b/lib/rfcmsg.c
index 23efd3e5..e52d3fe3 100644
--- a/lib/rfcmsg.c
+++ b/lib/rfcmsg.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/semafore.c b/lib/semafore.c
index 5cae6a19..13ad4a02 100644
--- a/lib/semafore.c
+++ b/lib/semafore.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "clcomm.h"
 #include "common.h"
diff --git a/lib/signame.c b/lib/signame.c
index 8f63d4c7..783fd6c2 100644
--- a/lib/signame.c
+++ b/lib/signame.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "clcomm.h"
 
 
diff --git a/lib/smtp.c b/lib/smtp.c
index 57aaa54e..07e74770 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/lib/strcasestr.c b/lib/strcasestr.c
index 35bc82db..a8475ce4 100644
--- a/lib/strcasestr.c
+++ b/lib/strcasestr.c
@@ -1,5 +1,7 @@
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 
 #ifndef HAVE_STRCASESTR
 
diff --git a/lib/strutil.c b/lib/strutil.c
index e30a1acb..bcb848fb 100644
--- a/lib/strutil.c
+++ b/lib/strutil.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "common.h"
 
diff --git a/lib/term.c b/lib/term.c
index 80486c9d..2185d0fb 100644
--- a/lib/term.c
+++ b/lib/term.c
@@ -30,7 +30,9 @@
 
 #define	DB_USERS
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "ansi.h"
diff --git a/lib/test.c b/lib/test.c
index 1734e725..1fead4c6 100644
--- a/lib/test.c
+++ b/lib/test.c
@@ -27,7 +27,9 @@
 **
 */
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 
 #error "Hey! Don't just compile this program, read the comments first!"
 #ifndef SIGSEGV
diff --git a/lib/unpacker.c b/lib/unpacker.c
index 6fced3b5..4c505cc7 100644
--- a/lib/unpacker.c
+++ b/lib/unpacker.c
@@ -30,7 +30,9 @@
 
 #define	DB_ARCHIVE
 
+#include "../config.h"
 #include "libs.h"
+#include "memwatch.h"
 #include "structs.h"
 #include "users.h"
 #include "records.h"
diff --git a/mbcico/Makefile b/mbcico/Makefile
index c07e4499..4ff06775 100644
--- a/mbcico/Makefile
+++ b/mbcico/Makefile
@@ -86,47 +86,47 @@ depend:
 
 # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
 # Dependencies generated by make depend
-zmmisc.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h zmodem.h
-zmrle.o: ../lib/libs.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h ttyio.h session.h zmodem.h
-zmrecv.o: ../lib/libs.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h lutil.h ttyio.h session.h zmodem.h config.h emsi.h openfile.h filelist.h openport.h
-zmsend.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h zmodem.h lutil.h emsi.h filelist.h
-binkp.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbnode.h ../lib/clcomm.h ttyio.h session.h statetbl.h config.h emsi.h openfile.h respfreq.h filelist.h opentcp.h rdoptions.h lutil.h binkp.h config.h
-xmsend.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h session.h ttyio.h statetbl.h xmsend.h m7send.h filelist.h filetime.h
-xmrecv.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h session.h ttyio.h statetbl.h config.h lutil.h openfile.h m7recv.h xmrecv.h filelist.h filetime.h
-m7recv.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h statetbl.h ttyio.h m7recv.h
-m7send.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h statetbl.h ttyio.h m7send.h
-hydra.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h session.h filelist.h filetime.h ttyio.h statetbl.h config.h emsi.h openfile.h lutil.h respfreq.h mbcico.h hydra.h
-answer.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h lutil.h session.h config.h answer.h openport.h portsel.h dial.h rdoptions.h mbcico.h
-chat.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h config.h chat.h ttyio.h
-dial.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h config.h chat.h ttyio.h session.h dial.h
-dietifna.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h emsi.h dietifna.h respfreq.h filelist.h xmrecv.h xmsend.h
-emsidat.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h emsi.h session.h lutil.h config.h emsidat.h filetime.h
-filelist.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h config.h session.h filelist.h
-openfile.o: ../lib/libs.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h config.h lutil.h openfile.h
-openport.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ulock.h ttyio.h openport.h
-opentcp.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h session.h ttyio.h openport.h opentcp.h
-rdoptions.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h session.h config.h
-yoohoo.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h ../lib/dbnode.h statetbl.h ttyio.h session.h config.h emsi.h hydra.h rdoptions.h wazoo.h dietifna.h yoohoo.h
-recvbark.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h statetbl.h recvbark.h respfreq.h filelist.h
-respfreq.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h session.h lutil.h config.h atoul.h respfreq.h filelist.h
-sendbark.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h statetbl.h sendbark.h xmrecv.h
-tcp.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h statetbl.h config.h emsi.h respfreq.h filelist.h tcpproto.h tcp.h
-tcpproto.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h config.h emsi.h lutil.h openfile.h filelist.h tcpproto.h
-wazoo.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h statetbl.h config.h emsi.h respfreq.h filelist.h wazoo.h zmodem.h
-filetime.o: ../lib/libs.h filetime.h
-ftsc.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h session.h ttyio.h statetbl.h config.h ftsc.h rdoptions.h recvbark.h filelist.h sendbark.h respfreq.h xmrecv.h xmsend.h
-atoul.o: ../lib/libs.h atoul.h
-portsel.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h portsel.h
-ttyio.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ttyio.h lutil.h
-lutil.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h lutil.h
-scanout.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbftn.h config.h scanout.h lutil.h
-emsi.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbnode.h ../lib/clcomm.h ttyio.h session.h statetbl.h config.h emsi.h emsidat.h hydra.h rdoptions.h tcp.h wazoo.h
-ulock.o: ../lib/libs.h ../lib/clcomm.h
-callstat.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h callstat.h
-session.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ttyio.h statetbl.h emsi.h ftsc.h session.h yoohoo.h mbcico.h binkp.h callstat.h
-call.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h session.h callstat.h call.h config.h dial.h lutil.h portsel.h openport.h opentcp.h rdoptions.h
-mbcico.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbftn.h config.h answer.h call.h lutil.h mbcico.h session.h
-outstat.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbftn.h scanout.h callstat.h outstat.h
-nlinfo.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h nlinfo.h
-mbout.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbftn.h outstat.h nlinfo.h
+zmmisc.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h zmodem.h
+zmrle.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h ttyio.h session.h zmodem.h
+zmrecv.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h lutil.h ttyio.h session.h zmodem.h config.h emsi.h openfile.h filelist.h openport.h
+zmsend.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h zmodem.h lutil.h emsi.h filelist.h
+binkp.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbnode.h ../lib/clcomm.h ttyio.h session.h statetbl.h config.h emsi.h openfile.h respfreq.h filelist.h opentcp.h rdoptions.h lutil.h binkp.h config.h
+xmsend.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h session.h ttyio.h statetbl.h xmsend.h m7send.h filelist.h filetime.h
+xmrecv.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h session.h ttyio.h statetbl.h config.h lutil.h openfile.h m7recv.h xmrecv.h filelist.h filetime.h
+m7recv.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h statetbl.h ttyio.h m7recv.h
+m7send.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h statetbl.h ttyio.h m7send.h
+hydra.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h session.h filelist.h filetime.h ttyio.h statetbl.h config.h emsi.h openfile.h lutil.h respfreq.h mbcico.h hydra.h
+answer.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h lutil.h session.h config.h answer.h openport.h portsel.h dial.h rdoptions.h mbcico.h
+chat.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h config.h chat.h ttyio.h
+dial.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h config.h chat.h ttyio.h session.h dial.h
+dietifna.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h emsi.h dietifna.h respfreq.h filelist.h xmrecv.h xmsend.h
+emsidat.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h emsi.h session.h lutil.h config.h emsidat.h filetime.h
+filelist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h config.h session.h filelist.h
+openfile.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h config.h lutil.h openfile.h
+openport.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ulock.h ttyio.h openport.h
+opentcp.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h session.h ttyio.h openport.h opentcp.h
+rdoptions.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h session.h config.h
+yoohoo.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h ../lib/dbnode.h statetbl.h ttyio.h session.h config.h emsi.h hydra.h rdoptions.h wazoo.h dietifna.h yoohoo.h
+recvbark.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h statetbl.h recvbark.h respfreq.h filelist.h
+respfreq.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h session.h lutil.h config.h atoul.h respfreq.h filelist.h
+sendbark.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h statetbl.h sendbark.h xmrecv.h
+tcp.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h statetbl.h config.h emsi.h respfreq.h filelist.h tcpproto.h tcp.h
+tcpproto.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h config.h emsi.h lutil.h openfile.h filelist.h tcpproto.h
+wazoo.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ttyio.h session.h statetbl.h config.h emsi.h respfreq.h filelist.h wazoo.h zmodem.h
+filetime.o: ../config.h ../lib/libs.h ../lib/memwatch.h filetime.h
+ftsc.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h session.h ttyio.h statetbl.h config.h ftsc.h rdoptions.h recvbark.h filelist.h sendbark.h respfreq.h xmrecv.h xmsend.h
+atoul.o: ../config.h ../lib/libs.h ../lib/memwatch.h atoul.h
+portsel.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h portsel.h
+ttyio.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ttyio.h lutil.h
+lutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h lutil.h
+scanout.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbftn.h config.h scanout.h lutil.h
+emsi.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbnode.h ../lib/clcomm.h ttyio.h session.h statetbl.h config.h emsi.h emsidat.h hydra.h rdoptions.h tcp.h wazoo.h
+ulock.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/clcomm.h
+callstat.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h callstat.h
+session.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ttyio.h statetbl.h emsi.h ftsc.h session.h yoohoo.h mbcico.h binkp.h callstat.h
+call.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h session.h callstat.h call.h config.h dial.h lutil.h portsel.h openport.h opentcp.h rdoptions.h
+mbcico.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbftn.h config.h answer.h call.h lutil.h mbcico.h session.h
+outstat.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbftn.h scanout.h callstat.h outstat.h
+nlinfo.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h nlinfo.h
+mbout.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbftn.h outstat.h nlinfo.h
 # End of generated dependencies
diff --git a/mbcico/answer.c b/mbcico/answer.c
index 7ed0e455..820f9ef4 100644
--- a/mbcico/answer.c
+++ b/mbcico/answer.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/atoul.c b/mbcico/atoul.c
index b846e795..09b70d88 100644
--- a/mbcico/atoul.c
+++ b/mbcico/atoul.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "atoul.h"
 
 
diff --git a/mbcico/binkp.c b/mbcico/binkp.c
index 5638e4e9..53311900 100644
--- a/mbcico/binkp.c
+++ b/mbcico/binkp.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/call.c b/mbcico/call.c
index c8ed27dc..3a7c2fa6 100644
--- a/mbcico/call.c
+++ b/mbcico/call.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
@@ -148,7 +150,7 @@ int call(faddr *addr)
 	 * First see if this node can be reached over the internet and
 	 * that internet calls are allowed.
 	 */
-	if (nlent->iflags && ((localoptions & NOIBN & NOITN & NOIFC) == 0)) {
+	if (nlent->iflags && ((localoptions & (NOIBN | NOITN | NOIFC)) == 0)) {
 		if (!inetaddr) {
 			Syslog('d', "Trying to find IP address...");
 			/*
diff --git a/mbcico/callstat.c b/mbcico/callstat.c
index 565e35a1..2888093c 100644
--- a/mbcico/callstat.c
+++ b/mbcico/callstat.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/chat.c b/mbcico/chat.c
index be09b4d5..1acc8dcb 100644
--- a/mbcico/chat.c
+++ b/mbcico/chat.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/dial.c b/mbcico/dial.c
index 9a6c95cd..c39e7f54 100644
--- a/mbcico/dial.c
+++ b/mbcico/dial.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/dietifna.c b/mbcico/dietifna.c
index dc2e90c7..b0cfa43d 100644
--- a/mbcico/dietifna.c
+++ b/mbcico/dietifna.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/emsi.c b/mbcico/emsi.c
index 3c5f79df..09ed5dd1 100644
--- a/mbcico/emsi.c
+++ b/mbcico/emsi.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/emsidat.c b/mbcico/emsidat.c
index c6f687b9..f2cec525 100644
--- a/mbcico/emsidat.c
+++ b/mbcico/emsidat.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/filelist.c b/mbcico/filelist.c
index 7bdf0552..0665cee4 100644
--- a/mbcico/filelist.c
+++ b/mbcico/filelist.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/filetime.c b/mbcico/filetime.c
index e1385746..3fec981d 100644
--- a/mbcico/filetime.c
+++ b/mbcico/filetime.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "filetime.h"
 
 
diff --git a/mbcico/ftsc.c b/mbcico/ftsc.c
index 0ae8c2a7..e98d4b76 100644
--- a/mbcico/ftsc.c
+++ b/mbcico/ftsc.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/hydra.c b/mbcico/hydra.c
index f64432b5..45350f87 100644
--- a/mbcico/hydra.c
+++ b/mbcico/hydra.c
@@ -41,7 +41,9 @@
  * COPYRIGHT (C) 1991-1993; ALL RIGHTS RESERVED
  */
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/lutil.c b/mbcico/lutil.c
index 979d1c65..84bfc85a 100644
--- a/mbcico/lutil.c
+++ b/mbcico/lutil.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/m7recv.c b/mbcico/m7recv.c
index 6af5e1ef..6947c15b 100644
--- a/mbcico/m7recv.c
+++ b/mbcico/m7recv.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/m7send.c b/mbcico/m7send.c
index 589ca71a..772bfbc0 100644
--- a/mbcico/m7send.c
+++ b/mbcico/m7send.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/mbcico.c b/mbcico/mbcico.c
index bf034a4b..5d28e398 100644
--- a/mbcico/mbcico.c
+++ b/mbcico/mbcico.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/mbout.c b/mbcico/mbout.c
index 26a296b2..a05b5285 100644
--- a/mbcico/mbout.c
+++ b/mbcico/mbout.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/nlinfo.c b/mbcico/nlinfo.c
index 3bc7b367..069bca99 100644
--- a/mbcico/nlinfo.c
+++ b/mbcico/nlinfo.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/openfile.c b/mbcico/openfile.c
index 540ffcba..afaa9da5 100644
--- a/mbcico/openfile.c
+++ b/mbcico/openfile.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/clcomm.h"
 #include "../lib/common.h"
diff --git a/mbcico/openport.c b/mbcico/openport.c
index 5f3c6d99..b2fd32dd 100644
--- a/mbcico/openport.c
+++ b/mbcico/openport.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/opentcp.c b/mbcico/opentcp.c
index 6d23578f..3d102eb4 100644
--- a/mbcico/opentcp.c
+++ b/mbcico/opentcp.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/outstat.c b/mbcico/outstat.c
index 4d62f7c3..a21c39d7 100644
--- a/mbcico/outstat.c
+++ b/mbcico/outstat.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/portsel.c b/mbcico/portsel.c
index f237953e..04ee0b1d 100644
--- a/mbcico/portsel.c
+++ b/mbcico/portsel.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/rdoptions.c b/mbcico/rdoptions.c
index e142590f..01cce57c 100644
--- a/mbcico/rdoptions.c
+++ b/mbcico/rdoptions.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/recvbark.c b/mbcico/recvbark.c
index dcafdf9d..11fa2e10 100644
--- a/mbcico/recvbark.c
+++ b/mbcico/recvbark.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/respfreq.c b/mbcico/respfreq.c
index 076e6897..6bd356ab 100644
--- a/mbcico/respfreq.c
+++ b/mbcico/respfreq.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/scanout.c b/mbcico/scanout.c
index 094b1c75..f434a451 100644
--- a/mbcico/scanout.c
+++ b/mbcico/scanout.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/sendbark.c b/mbcico/sendbark.c
index f1a4c03e..124966bc 100644
--- a/mbcico/sendbark.c
+++ b/mbcico/sendbark.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/session.c b/mbcico/session.c
index feca9db9..351533f0 100644
--- a/mbcico/session.c
+++ b/mbcico/session.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/tcp.c b/mbcico/tcp.c
index d0f6f3ef..4a439ed0 100644
--- a/mbcico/tcp.c
+++ b/mbcico/tcp.c
@@ -32,7 +32,9 @@
 	contributed by Stanislav Voronyi <stas@uanet.kharkov.ua>
 */
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/tcpproto.c b/mbcico/tcpproto.c
index a972da37..bd626e90 100644
--- a/mbcico/tcpproto.c
+++ b/mbcico/tcpproto.c
@@ -32,7 +32,9 @@
         contributed by Stanislav Voronyi <stas@uanet.kharkov.ua>
 */
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/ttyio.c b/mbcico/ttyio.c
index 2158f3ef..51605c5f 100644
--- a/mbcico/ttyio.c
+++ b/mbcico/ttyio.c
@@ -31,7 +31,9 @@
 /* ### Modified by P.Saratxaga on 25 Oct 1995 ###
  * - Added if (inetaddr) code from T. Tanaka
  */
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/ulock.c b/mbcico/ulock.c
index aed5a13f..0322fdaa 100644
--- a/mbcico/ulock.c
+++ b/mbcico/ulock.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/clcomm.h"
 
 #ifndef LOCKDIR
diff --git a/mbcico/wazoo.c b/mbcico/wazoo.c
index 85eb6e7e..58f08600 100644
--- a/mbcico/wazoo.c
+++ b/mbcico/wazoo.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/xmrecv.c b/mbcico/xmrecv.c
index 26c9e97f..d891c43d 100644
--- a/mbcico/xmrecv.c
+++ b/mbcico/xmrecv.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/xmsend.c b/mbcico/xmsend.c
index ff541149..8378fa5e 100644
--- a/mbcico/xmsend.c
+++ b/mbcico/xmsend.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/yoohoo.c b/mbcico/yoohoo.c
index 93925a6c..45fadeea 100644
--- a/mbcico/yoohoo.c
+++ b/mbcico/yoohoo.c
@@ -36,7 +36,9 @@
  * - added support for 16 bit product code
  */
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbcico/zmmisc.c b/mbcico/zmmisc.c
index c21b1dd7..45e26fa7 100644
--- a/mbcico/zmmisc.c
+++ b/mbcico/zmmisc.c
@@ -60,7 +60,9 @@ static int zgethex(void);
 static int zgeth1(void);
 static void garbitch(void);
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbcico/zmrecv.c b/mbcico/zmrecv.c
index 6f64952f..92524ee9 100644
--- a/mbcico/zmrecv.c
+++ b/mbcico/zmrecv.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/clcomm.h"
 #include "../lib/common.h"
diff --git a/mbcico/zmrle.c b/mbcico/zmrle.c
index 3bdefd07..d8684e50 100644
--- a/mbcico/zmrle.c
+++ b/mbcico/zmrle.c
@@ -37,7 +37,9 @@
  *	ZMODEM RLE compression and decompression functions
  */
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/clcomm.h"
 #include "../lib/common.h"
diff --git a/mbcico/zmsend.c b/mbcico/zmsend.c
index 4ce0f566..6c2776b9 100644
--- a/mbcico/zmsend.c
+++ b/mbcico/zmsend.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbfido/Makefile b/mbfido/Makefile
index af2d7c9e..c424ed77 100644
--- a/mbfido/Makefile
+++ b/mbfido/Makefile
@@ -14,7 +14,7 @@ SRCS		= addbbs.c backalias.c flock.c hatch.c mbdiff.c mgrutil.c pack.c \
 		  hash.c mbaff.c mbseq.c notify.c postnetmail.c scannews.c tosspkt.c \
 		  mbfkill.c mbfutil.c mbfindex.c mbfcheck.c mbfpack.c mbflist.c mbfadopt.c \
 		  mbfimport.c virscan.c mbftoberep.c mbfmove.c mbfdel.c bounce.c \
-		  createm.c createf.c
+		  createm.c createf.c msgflags.c
 HDRS		= addbbs.h backalias.h flock.h hatch.h mbdiff.h mgrutil.h pack.h \
 		  postnetmail.h scannews.h tosspkt.h addpkt.h bwrite.h forward.h \
 		  lhash.h mbfido.h mkftnhdr.h ptic.h sendmail.h tracker.h \
@@ -25,14 +25,14 @@ HDRS		= addbbs.h backalias.h flock.h hatch.h mbdiff.h mgrutil.h pack.h \
 		  atoul.h filemgr.h hash.h mbaff.h mbseq.h notify.h postemail.h scan.h toberep.h \
 		  mbfkill.h mbfutil.h mbfindex.h mbfcheck.h mbfpack.h mbflist.h mbfadopt.h \
 		  mbfimport.h virscan.h mbftoberep.h mbfmove.h mbfdel.h bounce.h \
-		  createm.h createf.h
+		  createm.h createf.h msgflags.h
 MBFIDO_OBJS	= flock.o tosspkt.o mbfido.o hatch.o maketags.o virscan.o tracker.o \
 		  makestat.o scannews.o lhash.o bounce.o pack.o ulock.o tic.o ptic.o \
 		  utic.o mover.o hash.o mkftnhdr.o addbbs.o magic.o fsort.o toberep.o \
 		  ftn2rfc.o atoul.o ping.o forward.o sendmail.o scan.o addpkt.o \
 		  storenet.o storeecho.o areamgr.o filemgr.o notify.o mgrutil.o rollover.o \
 		  bwrite.o rfc2ftn.o rnews.o newspost.o aliasdb.o postemail.o postnetmail.o \
-		  postecho.o backalias.o createm.o createf.o
+		  postecho.o backalias.o createm.o createf.o msgflags.o
 MBSEQ_OBJS	= mbseq.o
 MBAFF_OBJS	= announce.o fflist.o filefind.o grlist.o mbaff.o msgutil.o
 MBINDEX_OBJS	= mbindex.o
@@ -134,75 +134,76 @@ depend:
 
 # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
 # Dependencies generated by make depend
-addbbs.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h fsort.h addbbs.h
-backalias.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h backalias.h
-flock.o: ../lib/libs.h ../lib/clcomm.h flock.h
-hatch.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbtic.h utic.h rollover.h hatch.h
-mbdiff.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbdiff.h
-mgrutil.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h ../lib/diesel.h sendmail.h rollover.h addpkt.h pack.h createm.h createf.h mgrutil.h
-pack.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbftn.h ../lib/clcomm.h ../lib/dbnode.h pack.h
-ptic.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbtic.h ../lib/clcomm.h ../lib/dbnode.h ../lib/dbdupe.h ulock.h mover.h toberep.h tic.h utic.h addbbs.h magic.h forward.h rollover.h ptic.h magic.h createf.h virscan.h
-sendmail.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbnode.h ../lib/clcomm.h ../lib/dbmsgs.h addpkt.h rollover.h sendmail.h
-tracker.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h ../lib/dbftn.h tracker.h
-addpkt.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h ../lib/dbnode.h ../lib/dbmsgs.h pack.h addpkt.h
-bwrite.o: ../lib/libs.h bwrite.h
-forward.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h ../lib/dbtic.h ../lib/diesel.h tic.h sendmail.h rollover.h mgrutil.h forward.h
-lhash.o: ../lib/libs.h ../lib/clcomm.h lhash.h
-mbfido.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbdupe.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbuser.h ../lib/dbftn.h ../lib/dbtic.h ../lib/msg.h flock.h tosspkt.h pack.h ulock.h tic.h fsort.h scan.h mbfido.h tracker.h notify.h rollover.h hatch.h scannews.h maketags.h makestat.h newspost.h rnews.h mgrutil.h backalias.h rfc2ftn.h
-mkftnhdr.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h atoul.h hash.h aliasdb.h mkftnhdr.h
-ping.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbtic.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h sendmail.h postnetmail.h ping.h
-rfc2ftn.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h mkftnhdr.h hash.h rollover.h pack.h postnetmail.h postecho.h rfc2ftn.h
-storeecho.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbmsgs.h ../lib/dbuser.h rollover.h storeecho.h
-ulock.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h flock.h ulock.h
-aliasdb.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h aliasdb.h
-fsort.o: ../lib/libs.h ../lib/clcomm.h fsort.h
-magic.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbtic.h tic.h utic.h magic.h
-mbfile.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfkill.h mbfadopt.h mbfindex.h mbfcheck.h mbfpack.h mbflist.h mbfimport.h mbftoberep.h mbfmove.h mbfdel.h mbfutil.h mbfile.h
-mover.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h mover.h
-post.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h post.h
-rnews.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h pack.h rfc2ftn.h mbfido.h ../paths.h rnews.h
-storenet.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbmsgs.h ../lib/dbuser.h rollover.h storenet.h
-utic.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h mover.h tic.h utic.h
-announce.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h ../lib/diesel.h grlist.h msgutil.h announce.h
-fflist.o: ../lib/libs.h ../lib/clcomm.h ../lib/msg.h fflist.h
-ftn2rfc.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/dbftn.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/common.h ../lib/clcomm.h rollover.h aliasdb.h postemail.h backalias.h ftn2rfc.h
-makestat.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/diesel.h ../lib/msg.h mgrutil.h makestat.h
-mbindex.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbftn.h mbindex.h
-msgutil.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h ../lib/diesel.h msgutil.h
-postecho.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h ftn2rfc.h postecho.h storeecho.h addpkt.h rollover.h
-rollover.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h rollover.h
-tic.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbftn.h ../lib/clcomm.h ulock.h ptic.h fsort.h pack.h tic.h
-areamgr.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h ../lib/diesel.h sendmail.h mgrutil.h scan.h createm.h areamgr.h
-filefind.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h ../lib/diesel.h fflist.h filefind.h msgutil.h
-grlist.o: ../lib/libs.h ../lib/clcomm.h grlist.h
-maketags.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h maketags.h
-mbmsg.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/dbcfg.h post.h mbmsg.h
-newspost.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h newspost.h
-postemail.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/dbuser.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h postemail.h
-scan.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/msg.h ../lib/clcomm.h ../lib/msgtext.h ../lib/dbnode.h ../lib/dbmsgs.h addpkt.h pack.h tracker.h ftn2rfc.h rfc2ftn.h postemail.h scan.h
-toberep.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h toberep.h
-atoul.o: ../lib/libs.h atoul.h
-filemgr.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbtic.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h ../lib/diesel.h sendmail.h mgrutil.h createf.h filemgr.h
-hash.o: ../lib/libs.h hash.h lhash.h
-mbaff.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h announce.h filefind.h mbaff.h
-mbseq.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbseq.h
-notify.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbnode.h filemgr.h areamgr.h sendmail.h notify.h
-postnetmail.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/common.h ../lib/records.h ../lib/dbcfg.h ../lib/dbuser.h ../lib/dbnode.h ../lib/dbftn.h ../lib/clcomm.h tracker.h addpkt.h storenet.h ftn2rfc.h areamgr.h filemgr.h ping.h bounce.h postemail.h
-scannews.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h mkftnhdr.h hash.h rollover.h pack.h storeecho.h rfc2ftn.h scannews.h
-tosspkt.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h tosspkt.h postnetmail.h postecho.h rollover.h createm.h
-mbfkill.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfkill.h mbfutil.h
-mbfutil.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfile.h
-mbfindex.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/diesel.h mbfutil.h mbfindex.h
-mbfcheck.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfcheck.h
-mbfpack.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfpack.h
-mbflist.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbflist.h
-mbfadopt.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h virscan.h mbfutil.h mbflist.h
-mbfimport.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h virscan.h mbfutil.h mbfimport.h
-virscan.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h virscan.h
-mbftoberep.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbftoberep.h
-mbfmove.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfmove.h
-mbfdel.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfmove.h
-bounce.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbtic.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h sendmail.h postnetmail.h ping.h
-createm.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h mgrutil.h createm.h
-createf.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mgrutil.h createf.h
+addbbs.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h fsort.h addbbs.h
+backalias.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h backalias.h
+flock.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/clcomm.h flock.h
+hatch.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbtic.h utic.h rollover.h hatch.h
+mbdiff.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbdiff.h
+mgrutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h ../lib/diesel.h sendmail.h rollover.h addpkt.h pack.h createm.h createf.h mgrutil.h
+pack.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbftn.h ../lib/clcomm.h ../lib/dbnode.h pack.h
+ptic.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbtic.h ../lib/clcomm.h ../lib/dbnode.h ../lib/dbdupe.h ulock.h mover.h toberep.h tic.h utic.h addbbs.h magic.h forward.h rollover.h ptic.h magic.h createf.h virscan.h
+sendmail.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbnode.h ../lib/clcomm.h ../lib/dbmsgs.h addpkt.h rollover.h sendmail.h
+tracker.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h ../lib/dbftn.h tracker.h
+addpkt.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h ../lib/dbnode.h ../lib/dbmsgs.h pack.h addpkt.h
+bwrite.o: ../config.h ../lib/libs.h ../lib/memwatch.h bwrite.h
+forward.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbnode.h ../lib/dbtic.h ../lib/diesel.h tic.h sendmail.h rollover.h mgrutil.h forward.h
+lhash.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/clcomm.h lhash.h
+mbfido.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbdupe.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbuser.h ../lib/dbftn.h ../lib/dbtic.h ../lib/msg.h flock.h tosspkt.h pack.h ulock.h tic.h fsort.h scan.h mbfido.h tracker.h notify.h rollover.h hatch.h scannews.h maketags.h makestat.h newspost.h rnews.h mgrutil.h backalias.h rfc2ftn.h
+mkftnhdr.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h atoul.h hash.h msgflags.h aliasdb.h mkftnhdr.h
+ping.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbtic.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h sendmail.h postnetmail.h ping.h
+rfc2ftn.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h mkftnhdr.h hash.h rollover.h pack.h postnetmail.h postecho.h msgflags.h rfc2ftn.h
+storeecho.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbmsgs.h ../lib/dbuser.h rollover.h storeecho.h
+ulock.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h flock.h ulock.h
+aliasdb.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h aliasdb.h
+fsort.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/clcomm.h fsort.h
+magic.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbtic.h tic.h utic.h magic.h
+mbfile.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfkill.h mbfadopt.h mbfindex.h mbfcheck.h mbfpack.h mbflist.h mbfimport.h mbftoberep.h mbfmove.h mbfdel.h mbfutil.h mbfile.h
+mover.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h mover.h
+post.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h post.h
+rnews.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h pack.h rfc2ftn.h mbfido.h ../paths.h rnews.h
+storenet.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbmsgs.h ../lib/dbuser.h msgflags.h rollover.h storenet.h
+utic.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h mover.h tic.h utic.h
+announce.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h ../lib/diesel.h grlist.h msgutil.h announce.h
+fflist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/clcomm.h ../lib/msg.h fflist.h
+ftn2rfc.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/dbftn.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/common.h ../lib/clcomm.h rollover.h aliasdb.h postemail.h backalias.h msgflags.h ftn2rfc.h
+makestat.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/diesel.h ../lib/msg.h mgrutil.h makestat.h
+mbindex.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbftn.h mbindex.h
+msgutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h ../lib/diesel.h msgutil.h
+postecho.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h ftn2rfc.h postecho.h storeecho.h addpkt.h rollover.h
+rollover.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h rollover.h
+tic.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbftn.h ../lib/clcomm.h ulock.h ptic.h fsort.h pack.h tic.h
+areamgr.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h ../lib/diesel.h sendmail.h mgrutil.h scan.h createm.h areamgr.h
+filefind.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h ../lib/msgtext.h ../lib/diesel.h fflist.h filefind.h msgutil.h
+grlist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/clcomm.h grlist.h
+maketags.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h maketags.h
+mbmsg.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/dbcfg.h post.h mbmsg.h
+newspost.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h newspost.h
+postemail.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/dbuser.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h postemail.h
+scan.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/msg.h ../lib/clcomm.h ../lib/msgtext.h ../lib/dbnode.h ../lib/dbmsgs.h addpkt.h pack.h tracker.h ftn2rfc.h rfc2ftn.h postemail.h scan.h
+toberep.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h tic.h toberep.h
+atoul.o: ../config.h ../lib/libs.h ../lib/memwatch.h atoul.h
+filemgr.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbtic.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h ../lib/diesel.h sendmail.h mgrutil.h createf.h filemgr.h
+hash.o: ../config.h ../lib/libs.h ../lib/memwatch.h hash.h lhash.h
+mbaff.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/msg.h announce.h filefind.h mbaff.h
+mbseq.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbseq.h
+notify.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbnode.h filemgr.h areamgr.h sendmail.h notify.h
+postnetmail.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/common.h ../lib/records.h ../lib/dbcfg.h ../lib/dbuser.h ../lib/dbnode.h ../lib/dbftn.h ../lib/clcomm.h tracker.h addpkt.h storenet.h ftn2rfc.h areamgr.h filemgr.h ping.h bounce.h postemail.h
+scannews.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/dbdupe.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/msg.h ../lib/msgtext.h mkftnhdr.h hash.h rollover.h pack.h storeecho.h rfc2ftn.h scannews.h
+tosspkt.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbmsgs.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h tosspkt.h postnetmail.h postecho.h rollover.h createm.h
+mbfkill.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfkill.h mbfutil.h
+mbfutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfile.h
+mbfindex.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/diesel.h mbfutil.h mbfindex.h
+mbfcheck.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfcheck.h
+mbfpack.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfpack.h
+mbflist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbflist.h
+mbfadopt.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h virscan.h mbfutil.h mbflist.h
+mbfimport.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h virscan.h mbfutil.h mbfimport.h
+virscan.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h virscan.h
+mbftoberep.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbftoberep.h
+mbfmove.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfmove.h
+mbfdel.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbfutil.h mbfmove.h
+bounce.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h ../lib/msgtext.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbtic.h ../lib/dbdupe.h ../lib/dbuser.h ../lib/dbftn.h sendmail.h postnetmail.h ping.h
+createm.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h mgrutil.h createm.h
+createf.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mgrutil.h createf.h
+msgflags.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/clcomm.h msgflags.h
 # End of generated dependencies
diff --git a/mbfido/addbbs.c b/mbfido/addbbs.c
index ac73f42f..e241ebf5 100644
--- a/mbfido/addbbs.c
+++ b/mbfido/addbbs.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/addpkt.c b/mbfido/addpkt.c
index b9e5f73f..84804b68 100644
--- a/mbfido/addpkt.c
+++ b/mbfido/addpkt.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/aliasdb.c b/mbfido/aliasdb.c
index e4224626..b67af9d0 100644
--- a/mbfido/aliasdb.c
+++ b/mbfido/aliasdb.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/announce.c b/mbfido/announce.c
index aa1a4a37..c2ef73df 100644
--- a/mbfido/announce.c
+++ b/mbfido/announce.c
@@ -28,8 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
-
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/areamgr.c b/mbfido/areamgr.c
index 899aab96..b36f6fe2 100644
--- a/mbfido/areamgr.c
+++ b/mbfido/areamgr.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/atoul.c b/mbfido/atoul.c
index 71a6054d..c6687a4d 100644
--- a/mbfido/atoul.c
+++ b/mbfido/atoul.c
@@ -29,8 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
-
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "atoul.h"
 
 
diff --git a/mbfido/backalias.c b/mbfido/backalias.c
index f563357a..2e73b12e 100644
--- a/mbfido/backalias.c
+++ b/mbfido/backalias.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbfido/bounce.c b/mbfido/bounce.c
index 7f0b46c9..92ae68e2 100644
--- a/mbfido/bounce.c
+++ b/mbfido/bounce.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/bwrite.c b/mbfido/bwrite.c
index 03932f56..81e6a869 100644
--- a/mbfido/bwrite.c
+++ b/mbfido/bwrite.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "bwrite.h"
 
 
diff --git a/mbfido/createf.c b/mbfido/createf.c
index 3a1684f5..78daa110 100644
--- a/mbfido/createf.c
+++ b/mbfido/createf.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/createm.c b/mbfido/createm.c
index 406a181f..d05d4dfd 100644
--- a/mbfido/createm.c
+++ b/mbfido/createm.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/fflist.c b/mbfido/fflist.c
index f5b0f6cf..0bd63577 100644
--- a/mbfido/fflist.c
+++ b/mbfido/fflist.c
@@ -29,8 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
-
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/clcomm.h"
 #include "../lib/msg.h"
 #include "fflist.h"
diff --git a/mbfido/filefind.c b/mbfido/filefind.c
index a2c39d24..27bcfe20 100644
--- a/mbfido/filefind.c
+++ b/mbfido/filefind.c
@@ -28,8 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
-
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/filemgr.c b/mbfido/filemgr.c
index f96e3851..d4b33287 100644
--- a/mbfido/filemgr.c
+++ b/mbfido/filemgr.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/flock.c b/mbfido/flock.c
index cad5fbed..ce094d88 100644
--- a/mbfido/flock.c
+++ b/mbfido/flock.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/clcomm.h"
 #include "flock.h"
 
diff --git a/mbfido/forward.c b/mbfido/forward.c
index a146fe3c..f0ef4cf0 100644
--- a/mbfido/forward.c
+++ b/mbfido/forward.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/fsort.c b/mbfido/fsort.c
index eb54ede3..f70e5454 100644
--- a/mbfido/fsort.c
+++ b/mbfido/fsort.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/clcomm.h"
 #include "fsort.h"
 
diff --git a/mbfido/ftn2rfc.c b/mbfido/ftn2rfc.c
index 9549f84e..cd026728 100644
--- a/mbfido/ftn2rfc.c
+++ b/mbfido/ftn2rfc.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
@@ -41,6 +43,7 @@
 #include "aliasdb.h"
 #include "postemail.h"
 #include "backalias.h"
+#include "msgflags.h"
 #include "ftn2rfc.h"
 
 
diff --git a/mbfido/grlist.c b/mbfido/grlist.c
index 56886bf6..11e6d90f 100644
--- a/mbfido/grlist.c
+++ b/mbfido/grlist.c
@@ -29,8 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
-
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/clcomm.h"
 #include "grlist.h"
 
diff --git a/mbfido/hash.c b/mbfido/hash.c
index 6e32f048..2e10b1b0 100644
--- a/mbfido/hash.c
+++ b/mbfido/hash.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "hash.h"
 #include "lhash.h"
 
diff --git a/mbfido/hatch.c b/mbfido/hatch.c
index 8b95c967..6baf8b95 100644
--- a/mbfido/hatch.c
+++ b/mbfido/hatch.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/lhash.c b/mbfido/lhash.c
index 0b020f9a..87ad3d14 100644
--- a/mbfido/lhash.c
+++ b/mbfido/lhash.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/clcomm.h"
 #include "lhash.h"
 
diff --git a/mbfido/magic.c b/mbfido/magic.c
index 1cbfa7dc..8446b58f 100644
--- a/mbfido/magic.c
+++ b/mbfido/magic.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/makestat.c b/mbfido/makestat.c
index 97e8bcc7..69d361aa 100644
--- a/mbfido/makestat.c
+++ b/mbfido/makestat.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/maketags.c b/mbfido/maketags.c
index 600e4ad1..3ac12a00 100644
--- a/mbfido/maketags.c
+++ b/mbfido/maketags.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbaff.c b/mbfido/mbaff.c
index 2e86ad76..bb99c15c 100644
--- a/mbfido/mbaff.c
+++ b/mbfido/mbaff.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbdiff.c b/mbfido/mbdiff.c
index 9eb8a05c..9f6ceaa0 100644
--- a/mbfido/mbdiff.c
+++ b/mbfido/mbdiff.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfadopt.c b/mbfido/mbfadopt.c
index 3af018bd..cad8b799 100644
--- a/mbfido/mbfadopt.c
+++ b/mbfido/mbfadopt.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfcheck.c b/mbfido/mbfcheck.c
index 93192964..93272def 100644
--- a/mbfido/mbfcheck.c
+++ b/mbfido/mbfcheck.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfdel.c b/mbfido/mbfdel.c
index d689988a..c1f42d98 100644
--- a/mbfido/mbfdel.c
+++ b/mbfido/mbfdel.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfido.c b/mbfido/mbfido.c
index bda1100a..e9ff1734 100644
--- a/mbfido/mbfido.c
+++ b/mbfido/mbfido.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbfido/mbfile.c b/mbfido/mbfile.c
index af1584aa..f2eda279 100644
--- a/mbfido/mbfile.c
+++ b/mbfido/mbfile.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfimport.c b/mbfido/mbfimport.c
index 9a730314..ea330ab5 100644
--- a/mbfido/mbfimport.c
+++ b/mbfido/mbfimport.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfindex.c b/mbfido/mbfindex.c
index 377e5bf0..a07669d0 100644
--- a/mbfido/mbfindex.c
+++ b/mbfido/mbfindex.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfkill.c b/mbfido/mbfkill.c
index 01f55e5b..a933460f 100644
--- a/mbfido/mbfkill.c
+++ b/mbfido/mbfkill.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbflist.c b/mbfido/mbflist.c
index 45b69d3d..41bfc551 100644
--- a/mbfido/mbflist.c
+++ b/mbfido/mbflist.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfmove.c b/mbfido/mbfmove.c
index 20057421..dcfcbe51 100644
--- a/mbfido/mbfmove.c
+++ b/mbfido/mbfmove.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfpack.c b/mbfido/mbfpack.c
index 15e82dc0..6b5f49ab 100644
--- a/mbfido/mbfpack.c
+++ b/mbfido/mbfpack.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbftoberep.c b/mbfido/mbftoberep.c
index 37122787..f9a4973e 100644
--- a/mbfido/mbftoberep.c
+++ b/mbfido/mbftoberep.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbfutil.c b/mbfido/mbfutil.c
index 43ff0ae3..85d865be 100644
--- a/mbfido/mbfutil.c
+++ b/mbfido/mbfutil.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbindex.c b/mbfido/mbindex.c
index 22b95841..bbbbf54e 100644
--- a/mbfido/mbindex.c
+++ b/mbfido/mbindex.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbmsg.c b/mbfido/mbmsg.c
index 30c5e544..4cbc381a 100644
--- a/mbfido/mbmsg.c
+++ b/mbfido/mbmsg.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mbseq.c b/mbfido/mbseq.c
index 5d0460f9..3643d7ab 100644
--- a/mbfido/mbseq.c
+++ b/mbfido/mbseq.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mgrutil.c b/mbfido/mgrutil.c
index a9710084..d2ba0f89 100644
--- a/mbfido/mgrutil.c
+++ b/mbfido/mgrutil.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/mkftnhdr.c b/mbfido/mkftnhdr.c
index 5fc04f9e..5edcf7a3 100644
--- a/mbfido/mkftnhdr.c
+++ b/mbfido/mkftnhdr.c
@@ -41,7 +41,9 @@
  * - corriged a bug when Organization: has only blanks
  */
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
@@ -50,6 +52,7 @@
 #include "../lib/dbcfg.h"
 #include "atoul.h"
 #include "hash.h"
+#include "msgflags.h"
 #include "aliasdb.h"
 #include "mkftnhdr.h"
 
diff --git a/mbfido/mover.c b/mbfido/mover.c
index 4560bec9..ac1ce923 100644
--- a/mbfido/mover.c
+++ b/mbfido/mover.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/lib/msgflags.c b/mbfido/msgflags.c
similarity index 94%
rename from lib/msgflags.c
rename to mbfido/msgflags.c
index 33b59716..24f50e00 100644
--- a/lib/msgflags.c
+++ b/mbfido/msgflags.c
@@ -28,10 +28,12 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
-#include "libs.h"
-#include "structs.h"
-#include "clcomm.h"
-#include "common.h"
+#include "../config.h"
+#include "../lib/libs.h"
+#include "../lib/memwatch.h"
+#include "../lib/structs.h"
+#include "../lib/clcomm.h"
+#include "msgflags.h"
 
 
 static char *flnm[] = {
diff --git a/mbfido/msgflags.h b/mbfido/msgflags.h
new file mode 100644
index 00000000..c5eeac94
--- /dev/null
+++ b/mbfido/msgflags.h
@@ -0,0 +1,13 @@
+#ifndef _MSGFLAGS_H
+#define	_MSGFLAGS_H
+
+/* $Id$ */
+
+int     flag_on(char *,char *);
+int     flagset(char *);
+char    *compose_flags(int,char *);
+char    *strip_flags(char *);
+int     flag_on(char *,char *);
+
+#endif
+
diff --git a/mbfido/msgutil.c b/mbfido/msgutil.c
index aaaa67a2..b3dd5f58 100644
--- a/mbfido/msgutil.c
+++ b/mbfido/msgutil.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/newspost.c b/mbfido/newspost.c
index 5d5368d3..f2f5c377 100644
--- a/mbfido/newspost.c
+++ b/mbfido/newspost.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/notify.c b/mbfido/notify.c
index 4bb68828..103915d2 100644
--- a/mbfido/notify.c
+++ b/mbfido/notify.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/pack.c b/mbfido/pack.c
index f9197732..af5100dd 100644
--- a/mbfido/pack.c
+++ b/mbfido/pack.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/ping.c b/mbfido/ping.c
index 9f67ccc0..0c751151 100644
--- a/mbfido/ping.c
+++ b/mbfido/ping.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/post.c b/mbfido/post.c
index f4445709..b7a06575 100644
--- a/mbfido/post.c
+++ b/mbfido/post.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/postecho.c b/mbfido/postecho.c
index 0709ba94..1be6b359 100644
--- a/mbfido/postecho.c
+++ b/mbfido/postecho.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/postemail.c b/mbfido/postemail.c
index c17edfc2..59f43b07 100644
--- a/mbfido/postemail.c
+++ b/mbfido/postemail.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/postnetmail.c b/mbfido/postnetmail.c
index 09432a4a..a486b30e 100644
--- a/mbfido/postnetmail.c
+++ b/mbfido/postnetmail.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/common.h"
diff --git a/mbfido/ptic.c b/mbfido/ptic.c
index d9f2924d..c2ae32e7 100644
--- a/mbfido/ptic.c
+++ b/mbfido/ptic.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/rfc2ftn.c b/mbfido/rfc2ftn.c
index 5e59b750..151529ba 100644
--- a/mbfido/rfc2ftn.c
+++ b/mbfido/rfc2ftn.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
@@ -46,6 +48,7 @@
 #include "pack.h"
 #include "postnetmail.h"
 #include "postecho.h"
+#include "msgflags.h"
 #include "rfc2ftn.h"
 
 
diff --git a/mbfido/rnews.c b/mbfido/rnews.c
index db6fb94a..b07fba61 100644
--- a/mbfido/rnews.c
+++ b/mbfido/rnews.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/rollover.c b/mbfido/rollover.c
index 1074d295..ae89cf80 100644
--- a/mbfido/rollover.c
+++ b/mbfido/rollover.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/scan.c b/mbfido/scan.c
index 56b6a926..8608a437 100644
--- a/mbfido/scan.c
+++ b/mbfido/scan.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/scannews.c b/mbfido/scannews.c
index a55bf8c7..5f406874 100644
--- a/mbfido/scannews.c
+++ b/mbfido/scannews.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/sendmail.c b/mbfido/sendmail.c
index d1962fa6..e5f37966 100644
--- a/mbfido/sendmail.c
+++ b/mbfido/sendmail.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/storeecho.c b/mbfido/storeecho.c
index a38eb08c..4f8184c8 100644
--- a/mbfido/storeecho.c
+++ b/mbfido/storeecho.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/storenet.c b/mbfido/storenet.c
index 3f73ebfe..7bc3146f 100644
--- a/mbfido/storenet.c
+++ b/mbfido/storenet.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
@@ -38,6 +40,7 @@
 #include "../lib/msgtext.h"
 #include "../lib/dbmsgs.h"
 #include "../lib/dbuser.h"
+#include "msgflags.h"
 #include "rollover.h"
 #include "storenet.h"
 
diff --git a/mbfido/tic.c b/mbfido/tic.c
index 30fed82f..5f91d65d 100644
--- a/mbfido/tic.c
+++ b/mbfido/tic.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/toberep.c b/mbfido/toberep.c
index 513b2da5..147d06a7 100644
--- a/mbfido/toberep.c
+++ b/mbfido/toberep.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/tosspkt.c b/mbfido/tosspkt.c
index 52d16a0a..e37dd3e1 100644
--- a/mbfido/tosspkt.c
+++ b/mbfido/tosspkt.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/tracker.c b/mbfido/tracker.c
index 1ec74466..9a7fa461 100644
--- a/mbfido/tracker.c
+++ b/mbfido/tracker.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/ulock.c b/mbfido/ulock.c
index e35c70f2..c133a7f9 100644
--- a/mbfido/ulock.c
+++ b/mbfido/ulock.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/utic.c b/mbfido/utic.c
index dd336f58..ff9b873f 100644
--- a/mbfido/utic.c
+++ b/mbfido/utic.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbfido/virscan.c b/mbfido/virscan.c
index 0bf0a240..9036a2f7 100644
--- a/mbfido/virscan.c
+++ b/mbfido/virscan.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbmon/Makefile b/mbmon/Makefile
index 7f8954c7..b90b3aa0 100644
--- a/mbmon/Makefile
+++ b/mbmon/Makefile
@@ -57,7 +57,7 @@ depend:
 
 # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
 # Dependencies generated by make depend
-mutil.o: ../lib/libs.h common.h mutil.h
-mbmon.o: ../lib/libs.h common.h mutil.h
-common.o: ../lib/libs.h common.h
+mutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h common.h mutil.h
+mbmon.o: ../config.h ../lib/libs.h ../lib/memwatch.h common.h mutil.h
+common.o: ../config.h ../lib/libs.h ../lib/memwatch.h common.h
 # End of generated dependencies
diff --git a/mbmon/common.c b/mbmon/common.c
index b41503c1..53f84cf1 100644
--- a/mbmon/common.c
+++ b/mbmon/common.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include <sys/un.h>
 #include "common.h"
 
diff --git a/mbmon/mbmon.c b/mbmon/mbmon.c
index 964c18b6..e3240135 100644
--- a/mbmon/mbmon.c
+++ b/mbmon/mbmon.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "common.h"
 #include "mutil.h"
 
diff --git a/mbmon/mutil.c b/mbmon/mutil.c
index 754c035a..b0e62a44 100644
--- a/mbmon/mutil.c
+++ b/mbmon/mutil.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "common.h"
 #include "mutil.h"
 
diff --git a/mbsebbs/Makefile b/mbsebbs/Makefile
index 1ebbde28..921c9184 100644
--- a/mbsebbs/Makefile
+++ b/mbsebbs/Makefile
@@ -134,49 +134,49 @@ depend:
 
 # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
 # Dependencies generated by make depend
-bank.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h bank.h input.h language.h dispfile.h timeout.h timecheck.h whoson.h exitinfo.h
-filesub.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h filesub.h funcs.h language.h input.h misc.h timeout.h exitinfo.h change.h
-language.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h input.h language.h
-mbtoberep.o: ../lib/libs.h ../lib/structs.h
-msgutil.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msgtext.h ../lib/msg.h oneline.h msgutil.h
-oneline.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h oneline.h funcs.h input.h language.h
-bbslist.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h bbslist.h funcs.h input.h language.h
-morefile.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h input.h language.h morefile.h timeout.h
-email.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/msgtext.h ../lib/msg.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h exitinfo.h language.h mail.h timeout.h msgutil.h input.h email.h whoson.h
-fsedit.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/ansi.h ../lib/common.h ../lib/clcomm.h mail.h input.h language.h timeout.h pinfo.h fsedit.h
-lineedit.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mail.h input.h language.h timeout.h lineedit.h
-mblang.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h
-mbuser.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbuser.h
-page.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h dispfile.h input.h chat.h page.h timeout.h mail.h language.h
-bye.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h dispfile.h misc.h language.h bye.h
-funcs.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/msgtext.h ../lib/msg.h ../lib/clcomm.h funcs.h
-mail.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/msgtext.h ../lib/clcomm.h ../lib/msg.h mail.h funcs.h input.h language.h misc.h timeout.h oneline.h exitinfo.h lineedit.h fsedit.h filesub.h msgutil.h pop3.h email.h door.h whoson.h
-newuser.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h funcs.h input.h newuser.h language.h timeout.h change.h dispfile.h
-pinfo.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h pinfo.h input.h
-timecheck.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h timecheck.h funcs.h bye.h exitinfo.h language.h input.h
-change.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h change.h dispfile.h funcs.h input.h language.h misc.h timeout.h exitinfo.h bye.h
-exitinfo.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h funcs.h input.h language.h oneline.h misc.h bye.h timeout.h timecheck.h exitinfo.h
-mball.o: ../lib/libs.h ../lib/structs.h ../lib/mbse.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbcfg.h ../lib/clcomm.h mball.h
-mbsebbs.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h mbsebbs.h user.h dispfile.h language.h menu.h misc.h bye.h timeout.h funcs.h
-menu.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h oneline.h mail.h bbslist.h change.h bank.h chat.h file.h funcs.h input.h misc.h nextuser.h safe.h timeout.h menu.h page.h pinfo.h bye.h timecheck.h whoson.h language.h offline.h email.h door.h dispfile.h userlist.h timestats.h logentry.h morefile.h lastcallers.h
-nextuser.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/ansi.h ../lib/clcomm.h ../lib/common.h nextuser.h funcs.h input.h language.h timeout.h
-pop3.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/msgtext.h ../lib/msg.h msgutil.h pop3.h
-lastcallers.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h input.h language.h lastcallers.h
-safe.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h whoson.h dispfile.h input.h misc.h safe.h timeout.h language.h
-timeout.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h timeout.h funcs.h bye.h filesub.h language.h
-chat.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h chat.h funcs.h input.h language.h misc.h whoson.h
-file.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h filesub.h file.h funcs.h input.h language.h misc.h timeout.h exitinfo.h whoson.h change.h
-mbchat.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h
-mbstat.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbstat.h
-misc.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h funcs.h input.h language.h misc.h timeout.h exitinfo.h
-offline.o: ../lib/libs.h ../lib/structs.h ../lib/mbse.h ../lib/users.h ../lib/records.h ../lib/bluewave.h ../lib/common.h ../lib/clcomm.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h file.h filesub.h exitinfo.h timeout.h msgutil.h pop3.h offline.h whoson.h
-user.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h timeout.h user.h dispfile.h funcs.h input.h misc.h bye.h file.h mail.h change.h menu.h exitinfo.h language.h offline.h email.h
-mbnewusr.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mbnewusr.h funcs.h input.h language.h misc.h timeout.h newuser.h
-input.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h input.h timeout.h language.h
-whoson.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h input.h language.h exitinfo.h whoson.h
-door.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h input.h timeout.h exitinfo.h whoson.h door.h
-dispfile.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/msgtext.h ../lib/msg.h ../lib/clcomm.h funcs.h language.h oneline.h misc.h timeout.h timecheck.h exitinfo.h mail.h email.h dispfile.h
-userlist.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h userlist.h language.h input.h timeout.h
-timestats.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h timestats.h funcs.h language.h input.h exitinfo.h
-logentry.o: ../lib/libs.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h logentry.h
+bank.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h bank.h input.h language.h dispfile.h timeout.h timecheck.h whoson.h exitinfo.h
+filesub.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h filesub.h funcs.h language.h input.h misc.h timeout.h exitinfo.h change.h
+language.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h input.h language.h
+mbtoberep.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h
+msgutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msgtext.h ../lib/msg.h oneline.h msgutil.h
+oneline.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h oneline.h funcs.h input.h language.h
+bbslist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h bbslist.h funcs.h input.h language.h
+morefile.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h input.h language.h morefile.h timeout.h
+email.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/msgtext.h ../lib/msg.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h exitinfo.h language.h mail.h timeout.h msgutil.h input.h email.h whoson.h
+fsedit.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/ansi.h ../lib/common.h ../lib/clcomm.h mail.h input.h language.h timeout.h pinfo.h fsedit.h
+lineedit.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mail.h input.h language.h timeout.h lineedit.h
+mblang.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h
+mbuser.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbuser.h
+page.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h dispfile.h input.h chat.h page.h timeout.h mail.h language.h
+bye.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h dispfile.h misc.h language.h bye.h
+funcs.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/msgtext.h ../lib/msg.h ../lib/clcomm.h funcs.h
+mail.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/msgtext.h ../lib/clcomm.h ../lib/msg.h mail.h funcs.h input.h language.h misc.h timeout.h oneline.h exitinfo.h lineedit.h fsedit.h filesub.h msgutil.h pop3.h email.h door.h whoson.h
+newuser.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h funcs.h input.h newuser.h language.h timeout.h change.h dispfile.h
+pinfo.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h pinfo.h input.h
+timecheck.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h timecheck.h funcs.h bye.h exitinfo.h language.h input.h
+change.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h change.h dispfile.h funcs.h input.h language.h misc.h timeout.h exitinfo.h bye.h
+exitinfo.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h funcs.h input.h language.h oneline.h misc.h bye.h timeout.h timecheck.h exitinfo.h
+mball.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/mbse.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/dbcfg.h ../lib/clcomm.h mball.h
+mbsebbs.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h mbsebbs.h user.h dispfile.h language.h menu.h misc.h bye.h timeout.h funcs.h
+menu.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h oneline.h mail.h bbslist.h change.h bank.h chat.h file.h funcs.h input.h misc.h nextuser.h safe.h timeout.h menu.h page.h pinfo.h bye.h timecheck.h whoson.h language.h offline.h email.h door.h dispfile.h userlist.h timestats.h logentry.h morefile.h lastcallers.h
+nextuser.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/ansi.h ../lib/clcomm.h ../lib/common.h nextuser.h funcs.h input.h language.h timeout.h
+pop3.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/mbinet.h ../lib/msgtext.h ../lib/msg.h msgutil.h pop3.h
+lastcallers.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h input.h language.h lastcallers.h
+safe.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h whoson.h dispfile.h input.h misc.h safe.h timeout.h language.h
+timeout.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h timeout.h funcs.h bye.h filesub.h language.h
+chat.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h chat.h funcs.h input.h language.h misc.h whoson.h
+file.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h filesub.h file.h funcs.h input.h language.h misc.h timeout.h exitinfo.h whoson.h change.h
+mbchat.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h
+mbstat.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/dbcfg.h mbstat.h
+misc.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h funcs.h input.h language.h misc.h timeout.h exitinfo.h
+offline.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/mbse.h ../lib/users.h ../lib/records.h ../lib/bluewave.h ../lib/common.h ../lib/clcomm.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h file.h filesub.h exitinfo.h timeout.h msgutil.h pop3.h offline.h whoson.h
+user.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h timeout.h user.h dispfile.h funcs.h input.h misc.h bye.h file.h mail.h change.h menu.h exitinfo.h language.h offline.h email.h
+mbnewusr.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mbnewusr.h funcs.h input.h language.h misc.h timeout.h newuser.h
+input.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h input.h timeout.h language.h
+whoson.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h input.h language.h exitinfo.h whoson.h
+door.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h input.h timeout.h exitinfo.h whoson.h door.h
+dispfile.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/msgtext.h ../lib/msg.h ../lib/clcomm.h funcs.h language.h oneline.h misc.h timeout.h timecheck.h exitinfo.h mail.h email.h dispfile.h
+userlist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h userlist.h language.h input.h timeout.h
+timestats.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h timestats.h funcs.h language.h input.h exitinfo.h
+logentry.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/mbse.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h logentry.h
 # End of generated dependencies
diff --git a/mbsebbs/bank.c b/mbsebbs/bank.c
index 3197c9d9..7c0f482e 100644
--- a/mbsebbs/bank.c
+++ b/mbsebbs/bank.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"  
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/bbslist.c b/mbsebbs/bbslist.c
index 250f3e5d..adae189f 100644
--- a/mbsebbs/bbslist.c
+++ b/mbsebbs/bbslist.c
@@ -31,7 +31,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/bye.c b/mbsebbs/bye.c
index e8f46f1f..6e15e4f7 100644
--- a/mbsebbs/bye.c
+++ b/mbsebbs/bye.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/change.c b/mbsebbs/change.c
index b09fede4..874fc6a1 100644
--- a/mbsebbs/change.c
+++ b/mbsebbs/change.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/chat.c b/mbsebbs/chat.c
index ab390518..8bf035f5 100644
--- a/mbsebbs/chat.c
+++ b/mbsebbs/chat.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/dispfile.c b/mbsebbs/dispfile.c
index 6ae99d02..52732f29 100644
--- a/mbsebbs/dispfile.c
+++ b/mbsebbs/dispfile.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/door.c b/mbsebbs/door.c
index 0f893316..5f457cfe 100644
--- a/mbsebbs/door.c
+++ b/mbsebbs/door.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/email.c b/mbsebbs/email.c
index 9d4306f2..ac280670 100644
--- a/mbsebbs/email.c
+++ b/mbsebbs/email.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/exitinfo.c b/mbsebbs/exitinfo.c
index e6b2ac65..677df0b4 100644
--- a/mbsebbs/exitinfo.c
+++ b/mbsebbs/exitinfo.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/file.c b/mbsebbs/file.c
index 5b29fe0c..68096c54 100644
--- a/mbsebbs/file.c
+++ b/mbsebbs/file.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/filesub.c b/mbsebbs/filesub.c
index 18f1c105..6e12c879 100644
--- a/mbsebbs/filesub.c
+++ b/mbsebbs/filesub.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/fsedit.c b/mbsebbs/fsedit.c
index 3b1f58f4..4d672185 100644
--- a/mbsebbs/fsedit.c
+++ b/mbsebbs/fsedit.c
@@ -28,8 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
-
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/funcs.c b/mbsebbs/funcs.c
index b63bd20a..bebff062 100644
--- a/mbsebbs/funcs.c
+++ b/mbsebbs/funcs.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/input.c b/mbsebbs/input.c
index 14380e18..08498b65 100644
--- a/mbsebbs/input.c
+++ b/mbsebbs/input.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/language.c b/mbsebbs/language.c
index 5ef28b0f..c366d62c 100644
--- a/mbsebbs/language.c
+++ b/mbsebbs/language.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/lastcallers.c b/mbsebbs/lastcallers.c
index b10f6484..77bd9333 100644
--- a/mbsebbs/lastcallers.c
+++ b/mbsebbs/lastcallers.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/lineedit.c b/mbsebbs/lineedit.c
index ef75d11b..f330802a 100644
--- a/mbsebbs/lineedit.c
+++ b/mbsebbs/lineedit.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/logentry.c b/mbsebbs/logentry.c
index 965e9ddc..24597736 100644
--- a/mbsebbs/logentry.c
+++ b/mbsebbs/logentry.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/mail.c b/mbsebbs/mail.c
index 4577a5eb..6b42f6bd 100644
--- a/mbsebbs/mail.c
+++ b/mbsebbs/mail.c
@@ -35,7 +35,9 @@
  *
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/mball.c b/mbsebbs/mball.c
index 2021b194..f144e784 100644
--- a/mbsebbs/mball.c
+++ b/mbsebbs/mball.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/mbse.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/mbchat.c b/mbsebbs/mbchat.c
index 5d1e1e94..40bfbaa9 100644
--- a/mbsebbs/mbchat.c
+++ b/mbsebbs/mbchat.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbsebbs/mblang.c b/mbsebbs/mblang.c
index 8a7aebcf..3bced825 100644
--- a/mbsebbs/mblang.c
+++ b/mbsebbs/mblang.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsebbs/mbnewusr.c b/mbsebbs/mbnewusr.c
index a486382c..08931076 100644
--- a/mbsebbs/mbnewusr.c
+++ b/mbsebbs/mbnewusr.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/mbsebbs.c b/mbsebbs/mbsebbs.c
index 3dcb55c3..ec2482c8 100644
--- a/mbsebbs/mbsebbs.c
+++ b/mbsebbs/mbsebbs.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/mbstat.c b/mbsebbs/mbstat.c
index e154f553..aff38982 100644
--- a/mbsebbs/mbstat.c
+++ b/mbsebbs/mbstat.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsebbs/mbtoberep.c b/mbsebbs/mbtoberep.c
index 9136000c..d7100b5b 100644
--- a/mbsebbs/mbtoberep.c
+++ b/mbsebbs/mbtoberep.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 
 
diff --git a/mbsebbs/mbuser.c b/mbsebbs/mbuser.c
index e1dde330..01930540 100644
--- a/mbsebbs/mbuser.c
+++ b/mbsebbs/mbuser.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsebbs/menu.c b/mbsebbs/menu.c
index dc4ab6b7..f890e73c 100644
--- a/mbsebbs/menu.c
+++ b/mbsebbs/menu.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/misc.c b/mbsebbs/misc.c
index f1fdf017..96bd02dd 100644
--- a/mbsebbs/misc.c
+++ b/mbsebbs/misc.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/morefile.c b/mbsebbs/morefile.c
index f940c860..02b2b629 100644
--- a/mbsebbs/morefile.c
+++ b/mbsebbs/morefile.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/msgutil.c b/mbsebbs/msgutil.c
index 9ab3863d..1e150955 100644
--- a/mbsebbs/msgutil.c
+++ b/mbsebbs/msgutil.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/newuser.c b/mbsebbs/newuser.c
index 0c9e93db..561a552b 100644
--- a/mbsebbs/newuser.c
+++ b/mbsebbs/newuser.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/nextuser.c b/mbsebbs/nextuser.c
index 509a8b93..e42f0d33 100644
--- a/mbsebbs/nextuser.c
+++ b/mbsebbs/nextuser.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/offline.c b/mbsebbs/offline.c
index 154817a0..08b234e2 100644
--- a/mbsebbs/offline.c
+++ b/mbsebbs/offline.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/mbse.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/oneline.c b/mbsebbs/oneline.c
index 48893b3e..0a72cc0a 100644
--- a/mbsebbs/oneline.c
+++ b/mbsebbs/oneline.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/page.c b/mbsebbs/page.c
index 38756c5a..85ddf750 100644
--- a/mbsebbs/page.c
+++ b/mbsebbs/page.c
@@ -29,7 +29,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/pinfo.c b/mbsebbs/pinfo.c
index 7f18863e..2faebd10 100644
--- a/mbsebbs/pinfo.c
+++ b/mbsebbs/pinfo.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/pop3.c b/mbsebbs/pop3.c
index 283d7830..79d556ee 100644
--- a/mbsebbs/pop3.c
+++ b/mbsebbs/pop3.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/safe.c b/mbsebbs/safe.c
index 27c6c176..8982770d 100644
--- a/mbsebbs/safe.c
+++ b/mbsebbs/safe.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/timecheck.c b/mbsebbs/timecheck.c
index 84b93d2b..ffa56f6c 100644
--- a/mbsebbs/timecheck.c
+++ b/mbsebbs/timecheck.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/timeout.c b/mbsebbs/timeout.c
index 7955c384..9b0c1854 100644
--- a/mbsebbs/timeout.c
+++ b/mbsebbs/timeout.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/timestats.c b/mbsebbs/timestats.c
index 4d25ecb6..738867e7 100644
--- a/mbsebbs/timestats.c
+++ b/mbsebbs/timestats.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/user.c b/mbsebbs/user.c
index 8256703a..a497cfa6 100644
--- a/mbsebbs/user.c
+++ b/mbsebbs/user.c
@@ -30,7 +30,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/userlist.c b/mbsebbs/userlist.c
index a26a1f86..db715e64 100644
--- a/mbsebbs/userlist.c
+++ b/mbsebbs/userlist.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsebbs/whoson.c b/mbsebbs/whoson.c
index 6e29ecf7..212d7c1f 100644
--- a/mbsebbs/whoson.c
+++ b/mbsebbs/whoson.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/mbse.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
diff --git a/mbsetup/Makefile b/mbsetup/Makefile
index 61e85fde..b0057fac 100644
--- a/mbsetup/Makefile
+++ b/mbsetup/Makefile
@@ -70,42 +70,42 @@ depend:
 
 # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
 # Dependencies generated by make depend
-grlist.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h screen.h grlist.h ledit.h
-m_domain.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_menu.h m_domain.h
-m_fgroup.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_node.h m_archive.h m_ngroup.h m_ticarea.h m_fgroup.h
-m_lang.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_lang.h
-m_marea.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h screen.h mutil.h ledit.h grlist.h m_global.h m_node.h m_mgroup.h m_marea.h
-m_new.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h grlist.h m_new.h m_lang.h m_marea.h m_ngroup.h
-m_protocol.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h ../paths.h screen.h mutil.h ledit.h stlist.h m_global.h m_protocol.h
-m_ticarea.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h grlist.h m_global.h m_node.h m_fgroup.h m_farea.h m_archive.h m_ticarea.h
-mbsetup.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_bbs.h m_farea.h m_fgroup.h m_mail.h m_mgroup.h m_hatch.h m_tic.h m_ticarea.h m_magic.h m_fido.h m_lang.h m_archive.h m_virus.h m_tty.h m_limits.h m_users.h m_node.h m_fdb.h m_new.h m_ol.h m_bbslist.h m_safe.h m_protocol.h m_ff.h m_modem.h m_marea.h m_ngroup.h m_service.h m_domain.h m_task.h
-ledit.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h screen.h mutil.h ledit.h
-m_farea.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_fgroup.h m_archive.h m_farea.h m_fgroup.h m_ngroup.h
-m_fido.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_fido.h
-m_limits.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_limits.h
-m_menu.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mutil.h screen.h ledit.h m_lang.h m_menu.h
-m_ngroup.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_ngroup.h
-m_service.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_service.h
-m_tty.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_modem.h m_global.h m_tty.h
-mutil.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h
-m_archive.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../paths.h screen.h mutil.h ledit.h stlist.h m_global.h m_archive.h
-m_fdb.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_farea.h m_fdb.h
-m_global.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_node.h m_marea.h m_ticarea.h m_new.h m_global.h
-m_magic.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_ticarea.h m_global.h m_magic.h
-m_mgroup.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_node.h m_marea.h m_mgroup.h
-m_node.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h grlist.h stlist.h m_global.h m_lang.h m_ticarea.h m_marea.h m_node.h
-m_task.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_task.h
-m_users.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_lang.h m_global.h m_archive.h m_protocol.h m_users.h
-screen.o: ../lib/libs.h ../lib/structs.h ../lib/ansi.h ../lib/common.h ../lib/clcomm.h screen.h
-m_bbs.o: ../lib/libs.h ../lib/structs.h ../lib/common.h screen.h mutil.h ledit.h m_lang.h m_protocol.h m_ol.h m_fgroup.h m_farea.h m_menu.h m_safe.h m_bbs.h m_bbslist.h m_limits.h
-m_ff.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h screen.h mutil.h ledit.h stlist.h m_global.h m_ff.h m_lang.h m_marea.h
-m_hatch.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_fgroup.h m_ticarea.h m_hatch.h
-m_mail.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h screen.h mutil.h ledit.h m_global.h m_marea.h m_mgroup.h m_mail.h
-m_modem.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_modem.h
-m_ol.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_ol.h
-m_tic.o: ../lib/libs.h ../lib/structs.h ../lib/common.h screen.h mutil.h ledit.h m_fgroup.h m_ticarea.h m_magic.h m_hatch.h m_tic.h
-m_virus.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h ../paths.h screen.h mutil.h ledit.h stlist.h m_global.h m_virus.h
-stlist.o: ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h stlist.h
-m_bbslist.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_bbslist.h
-m_safe.o: ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_safe.h
+grlist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h screen.h grlist.h ledit.h
+m_domain.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_menu.h m_domain.h
+m_fgroup.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_node.h m_archive.h m_ngroup.h m_ticarea.h m_fgroup.h
+m_lang.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_lang.h
+m_marea.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h screen.h mutil.h ledit.h grlist.h m_global.h m_node.h m_mgroup.h m_marea.h
+m_new.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h grlist.h m_new.h m_lang.h m_marea.h m_ngroup.h
+m_protocol.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h ../paths.h screen.h mutil.h ledit.h stlist.h m_global.h m_protocol.h
+m_ticarea.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h grlist.h m_global.h m_node.h m_fgroup.h m_farea.h m_archive.h m_ticarea.h
+mbsetup.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_bbs.h m_farea.h m_fgroup.h m_mail.h m_mgroup.h m_hatch.h m_tic.h m_ticarea.h m_magic.h m_fido.h m_lang.h m_archive.h m_virus.h m_tty.h m_limits.h m_users.h m_node.h m_fdb.h m_new.h m_ol.h m_bbslist.h m_safe.h m_protocol.h m_ff.h m_modem.h m_marea.h m_ngroup.h m_service.h m_domain.h m_task.h
+ledit.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/msg.h screen.h mutil.h ledit.h
+m_farea.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_fgroup.h m_archive.h m_farea.h m_fgroup.h m_ngroup.h
+m_fido.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_fido.h
+m_limits.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_limits.h
+m_menu.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h mutil.h screen.h ledit.h m_lang.h m_menu.h
+m_ngroup.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_ngroup.h
+m_service.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_service.h
+m_tty.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_modem.h m_global.h m_tty.h
+mutil.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h
+m_archive.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../paths.h screen.h mutil.h ledit.h stlist.h m_global.h m_archive.h
+m_fdb.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_farea.h m_fdb.h
+m_global.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_node.h m_marea.h m_ticarea.h m_new.h m_global.h
+m_magic.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_ticarea.h m_global.h m_magic.h
+m_mgroup.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_node.h m_marea.h m_mgroup.h
+m_node.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h grlist.h stlist.h m_global.h m_lang.h m_ticarea.h m_marea.h m_node.h
+m_task.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_task.h
+m_users.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_lang.h m_global.h m_archive.h m_protocol.h m_users.h
+screen.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/ansi.h ../lib/common.h ../lib/clcomm.h screen.h
+m_bbs.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h screen.h mutil.h ledit.h m_lang.h m_protocol.h m_ol.h m_fgroup.h m_farea.h m_menu.h m_safe.h m_bbs.h m_bbslist.h m_limits.h
+m_ff.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h screen.h mutil.h ledit.h stlist.h m_global.h m_ff.h m_lang.h m_marea.h
+m_hatch.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_fgroup.h m_ticarea.h m_hatch.h
+m_mail.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h screen.h mutil.h ledit.h m_global.h m_marea.h m_mgroup.h m_mail.h
+m_modem.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h stlist.h m_global.h m_modem.h
+m_ol.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_ol.h
+m_tic.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h screen.h mutil.h ledit.h m_fgroup.h m_ticarea.h m_magic.h m_hatch.h m_tic.h
+m_virus.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h ../paths.h screen.h mutil.h ledit.h stlist.h m_global.h m_virus.h
+stlist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h stlist.h
+m_bbslist.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_bbslist.h
+m_safe.o: ../config.h ../lib/libs.h ../lib/memwatch.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h screen.h mutil.h ledit.h m_global.h m_safe.h
 # End of generated dependencies
diff --git a/mbsetup/grlist.c b/mbsetup/grlist.c
index 3eb7df5b..30ff6f21 100644
--- a/mbsetup/grlist.c
+++ b/mbsetup/grlist.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbsetup/ledit.c b/mbsetup/ledit.c
index db377bd7..d5c3238d 100644
--- a/mbsetup/ledit.c
+++ b/mbsetup/ledit.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_archive.c b/mbsetup/m_archive.c
index 2588d7cb..74703aa2 100644
--- a/mbsetup/m_archive.c
+++ b/mbsetup/m_archive.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_bbs.c b/mbsetup/m_bbs.c
index dc1c6763..0fe76bd7 100644
--- a/mbsetup/m_bbs.c
+++ b/mbsetup/m_bbs.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "screen.h"
diff --git a/mbsetup/m_bbslist.c b/mbsetup/m_bbslist.c
index 71e4b366..93357f89 100644
--- a/mbsetup/m_bbslist.c
+++ b/mbsetup/m_bbslist.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_domain.c b/mbsetup/m_domain.c
index e53b9711..542966b3 100644
--- a/mbsetup/m_domain.c
+++ b/mbsetup/m_domain.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_farea.c b/mbsetup/m_farea.c
index 805dd339..f02a24bc 100644
--- a/mbsetup/m_farea.c
+++ b/mbsetup/m_farea.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_fdb.c b/mbsetup/m_fdb.c
index 0c0ef4eb..bcc99d2e 100644
--- a/mbsetup/m_fdb.c
+++ b/mbsetup/m_fdb.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_ff.c b/mbsetup/m_ff.c
index bd411cf8..9124acac 100644
--- a/mbsetup/m_ff.c
+++ b/mbsetup/m_ff.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c
index df6967e4..3bfdc0c9 100644
--- a/mbsetup/m_fgroup.c
+++ b/mbsetup/m_fgroup.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_fido.c b/mbsetup/m_fido.c
index 164d12cf..8cd60481 100644
--- a/mbsetup/m_fido.c
+++ b/mbsetup/m_fido.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c
index c90adbf0..86d6b975 100644
--- a/mbsetup/m_global.c
+++ b/mbsetup/m_global.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_hatch.c b/mbsetup/m_hatch.c
index a494d8fb..5a91494b 100644
--- a/mbsetup/m_hatch.c
+++ b/mbsetup/m_hatch.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_lang.c b/mbsetup/m_lang.c
index 4f12351f..dffd22e3 100644
--- a/mbsetup/m_lang.c
+++ b/mbsetup/m_lang.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_limits.c b/mbsetup/m_limits.c
index c81e27d4..4de4a93f 100644
--- a/mbsetup/m_limits.c
+++ b/mbsetup/m_limits.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_magic.c b/mbsetup/m_magic.c
index 1dd8236b..41658081 100644
--- a/mbsetup/m_magic.c
+++ b/mbsetup/m_magic.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_mail.c b/mbsetup/m_mail.c
index 2600edba..0ca643e4 100644
--- a/mbsetup/m_mail.c
+++ b/mbsetup/m_mail.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_marea.c b/mbsetup/m_marea.c
index 86c75645..c15eb83b 100644
--- a/mbsetup/m_marea.c
+++ b/mbsetup/m_marea.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_menu.c b/mbsetup/m_menu.c
index e2299f0d..ee7e0417 100644
--- a/mbsetup/m_menu.c
+++ b/mbsetup/m_menu.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_mgroup.c b/mbsetup/m_mgroup.c
index b5dec00f..666c14fa 100644
--- a/mbsetup/m_mgroup.c
+++ b/mbsetup/m_mgroup.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_modem.c b/mbsetup/m_modem.c
index 479ee208..c5fe5f18 100644
--- a/mbsetup/m_modem.c
+++ b/mbsetup/m_modem.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_new.c b/mbsetup/m_new.c
index bf7d3fd9..a5b10203 100644
--- a/mbsetup/m_new.c
+++ b/mbsetup/m_new.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_ngroup.c b/mbsetup/m_ngroup.c
index 6ff8b6df..2ebdb3a0 100644
--- a/mbsetup/m_ngroup.c
+++ b/mbsetup/m_ngroup.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c
index aebfc8e7..79b525ca 100644
--- a/mbsetup/m_node.c
+++ b/mbsetup/m_node.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_ol.c b/mbsetup/m_ol.c
index e5b1de3a..e94eb0ca 100644
--- a/mbsetup/m_ol.c
+++ b/mbsetup/m_ol.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_protocol.c b/mbsetup/m_protocol.c
index d94b5564..05c6717d 100644
--- a/mbsetup/m_protocol.c
+++ b/mbsetup/m_protocol.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_safe.c b/mbsetup/m_safe.c
index b55a10f9..4de8aa5c 100644
--- a/mbsetup/m_safe.c
+++ b/mbsetup/m_safe.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_service.c b/mbsetup/m_service.c
index cdf71d26..4a41c46a 100644
--- a/mbsetup/m_service.c
+++ b/mbsetup/m_service.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_task.c b/mbsetup/m_task.c
index 24d4e7f3..39a0dcf0 100644
--- a/mbsetup/m_task.c
+++ b/mbsetup/m_task.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_tic.c b/mbsetup/m_tic.c
index 811a9c4c..f1f7eabe 100644
--- a/mbsetup/m_tic.c
+++ b/mbsetup/m_tic.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "screen.h"
diff --git a/mbsetup/m_ticarea.c b/mbsetup/m_ticarea.c
index 752e2cb4..acb6b0d0 100644
--- a/mbsetup/m_ticarea.c
+++ b/mbsetup/m_ticarea.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_tty.c b/mbsetup/m_tty.c
index 6cf82792..9cf051cb 100644
--- a/mbsetup/m_tty.c
+++ b/mbsetup/m_tty.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_users.c b/mbsetup/m_users.c
index fa374252..1006f82d 100644
--- a/mbsetup/m_users.c
+++ b/mbsetup/m_users.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/m_virus.c b/mbsetup/m_virus.c
index 76f46821..c4670b41 100644
--- a/mbsetup/m_virus.c
+++ b/mbsetup/m_virus.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/mbsetup.c b/mbsetup/mbsetup.c
index 66dd2b89..3b027406 100644
--- a/mbsetup/mbsetup.c
+++ b/mbsetup/mbsetup.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/users.h"
 #include "../lib/records.h"
diff --git a/mbsetup/mutil.c b/mbsetup/mutil.c
index 78f76de0..41890835 100644
--- a/mbsetup/mutil.c
+++ b/mbsetup/mutil.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/mbsetup/screen.c b/mbsetup/screen.c
index 8a2802aa..bfdeb950 100644
--- a/mbsetup/screen.c
+++ b/mbsetup/screen.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/ansi.h"
 #include "../lib/common.h"
diff --git a/mbsetup/stlist.c b/mbsetup/stlist.c
index bac0a1fa..4ea58cd9 100644
--- a/mbsetup/stlist.c
+++ b/mbsetup/stlist.c
@@ -28,7 +28,9 @@
  * Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *****************************************************************************/
 
+#include "../config.h"
 #include "../lib/libs.h"
+#include "../lib/memwatch.h"
 #include "../lib/structs.h"
 #include "../lib/common.h"
 #include "../lib/clcomm.h"
diff --git a/unix/Makefile b/unix/Makefile
index 0d6d1f07..7d760fdf 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -97,7 +97,7 @@ mbpasswd.o: ../config.h encrypt.h rad64.h myname.h xmalloc.h pwio.h shadowio.h p
 mbuseradd.o: ../config.h mbuseradd.h
 rad64.o: ../config.h rad64.h
 getdef.o: ../config.h getdef.h
-pw_util.o: pw_util.h
+pw_util.o: ../config.h pw_util.h
 mblogin.o: ../config.h mblogin.h ../lib/users.h getdef.h env.h chowntty.h basename.h shell.h pwdcheck.h pwauth.h loginprompt.h utmp.h limits.h setupenv.h sub.h log.h setugid.h
 env.o: ../config.h mblogin.h xmalloc.h
 chowntty.o: ../config.h mblogin.h getdef.h chowntty.h
diff --git a/unix/pw_util.c b/unix/pw_util.c
index ae8d2a55..3c51c6dc 100644
--- a/unix/pw_util.c
+++ b/unix/pw_util.c
@@ -64,6 +64,7 @@
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 
+#include "../config.h"
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/time.h>