Move #include from h/mh.h to source files

Included files should not include further files. Now, only the
necessary files are included and not all of them in every file.

A large bunch of this work is done, but there are some more
nested include files.

diff --git a/h/mh.h b/h/mh.h
index 17d5c2f8a8f0a0c391568f9158c21c8127c72771..8e8c11ac1412c47981aa94444aa29983fa69198e 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -4,23 +4,10 @@
 
 #include <config.h>
 
-#include <unistd.h>
 #include <stdio.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
 
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
-#include <locale.h>
-#include <limits.h>
 
 /*
 ** Well-used constants

diff --git a/sbr/concat.c b/sbr/concat.c
index 5c519e9f4896f324fcd6df117e338c12b1f6db28..4a57656f149afb583324c978d09e942f31c9ace0 100644 (file)
--- a/sbr/concat.c
+++ b/sbr/concat.c
@@ -9,6 +9,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <stdarg.h>
 
 
 static char *

diff --git a/sbr/context_read.c b/sbr/context_read.c
index abf666c6fc57874447fae456f1263cf04ad73442..166fe592906174795b39e2d167190f1cea1d095a 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -27,6 +27,8 @@
 #include <h/mh.h>    /* mh internals */
 #include <errno.h>   /* system call errors */
 #include <pwd.h>     /* structure for getpwuid() results */
+#include <unistd.h>
+#include <sys/stat.h>
 
 void
 context_read(void)

diff --git a/sbr/cpydata.c b/sbr/cpydata.c
index 048579ebe61db5c6538952e7d687e761dd28ea5d..6fa21f7e2ce0de93993a155bd24e58532d6117c7 100644 (file)
--- a/sbr/cpydata.c
+++ b/sbr/cpydata.c
@@ -6,6 +6,7 @@
 ** complete copyright information.
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 
 void

diff --git a/sbr/cpydgst.c b/sbr/cpydgst.c
index b788fefbaa07ac1b8a94b285b0e96d7391e75bbf..a9e5bc6e4aafebe9cbf0d49a450eacbd88064835 100644 (file)
--- a/sbr/cpydgst.c
+++ b/sbr/cpydgst.c
@@ -7,6 +7,7 @@
 ** complete copyright information.
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 
 /*

diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c
index 59ec95209b0ae90f3bd790b9bb49ca2847dadae2..b59a8e7ea718440fc5f2ca21621d8f491c936544 100644 (file)
--- a/sbr/crawl_folders.c
+++ b/sbr/crawl_folders.c
@@ -9,6 +9,8 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
+#include <dirent.h>
+#include <sys/stat.h>
 
 struct crawl_context {
        int max;    /*

diff --git a/sbr/error.c b/sbr/error.c
index 599b91d0db06199cdd33264b3770d1450f7c40e4..28f3255aa0a98de308b870d23469feaf7b0959b9 100644 (file)
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <errno.h>
+#include <stdarg.h>
 
 
 /*

diff --git a/sbr/execprog.c b/sbr/execprog.c
index f1f03bcdcd1acdff3176dba9698212274a5f8ebc..28ef8105f64a79958c4252f9f8f1212fd95567ae 100644 (file)
--- a/sbr/execprog.c
+++ b/sbr/execprog.c
@@ -4,6 +4,8 @@
 */
 
 #include <h/mh.h>
+#include <unistd.h>
+#include <stdarg.h>
 
 
 int

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 1fc5f36d9984831c7609bb64e0f6d005d3b5b47b..d299efc4d4e07f97b2c864cd4777221b7cffadd7 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -43,6 +43,7 @@
 #include <h/tws.h>
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
+#include <ctype.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c
index 9fd34c8e1b4350782be1164cbb544ab81469f4fb..e71b8d023f5e5fbefa73775481eccb1404f10654 100644 (file)
--- a/sbr/fmt_new.c
+++ b/sbr/fmt_new.c
@@ -8,6 +8,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 static char *formats = NULL;
 

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 1f55a65105410a5cc9dab5557faf4fb82983e817..0616d17dfdccf91f385555822a81a56251eb9bf7 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -14,6 +14,7 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/fmt_compile.h>
+#include <ctype.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 69083cc862946c76a19ae5181e9c2445a6cade0d..4cc8d6c65a49b739288cb4806f09ac2efc9dee68 100644 (file)
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -6,9 +6,11 @@
 ** complete copyright information.
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 /*
 ** Link message into a folder.  Return the new number

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 17b99bef6f857524eec1d92bb68f2e25339b38af..0ecf382b9ad40eb0113005e7d505a7d77a9f1ec5 100644 (file)
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -6,6 +6,7 @@
 ** complete copyright information.
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 
 /*

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 159949a0728045333e07ce5284330a036744483f..ec51d64e664947ce87687ee4140e5ca2f515792b 100644 (file)
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -6,8 +6,11 @@
 ** complete copyright information.
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 #include <h/utils.h>
+#include <dirent.h>
+#include <sys/stat.h>
 
 /* We allocate the `mi' array 1024 elements at a time */
 #define NUMMSGS  1024

diff --git a/sbr/gans.c b/sbr/gans.c
index c90bfefd20a320bec629705cada53832ec86b79d..c62eb7724d153034fff82b8ee23fb0c7b8cba22d 100644 (file)
--- a/sbr/gans.c
+++ b/sbr/gans.c
@@ -7,6 +7,7 @@
 */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 
 int

diff --git a/sbr/getanswer.c b/sbr/getanswer.c
index 9bac0e5295743e1cd0dae867adb22bdd7b4c88b4..4de8a89260f9393779155670847412146b5e59fa 100644 (file)
--- a/sbr/getanswer.c
+++ b/sbr/getanswer.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <stdio.h>
+#include <unistd.h>
 
 
 int

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index b1879b380b033a4932e2d8a4db229a91d4eff241..bdce7bbb563b2ab10342feb0afd766645aa495bf 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -15,9 +15,11 @@
 ** Ruud de Rooij <ruud@debian.org>  Sun, 28 Mar 1999 15:34:03 +0200
 */
 
+#include <unistd.h>
 #include <h/mh.h>
 #include <h/signals.h>
 #include <h/utils.h>
+#include <sys/stat.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/sbr/m_atoi.c b/sbr/m_atoi.c
index b903b7e80a3e01b24ab6d4716a9a15faa27279ac..0dcbffe4517bd1a797c847b963341303b40fa24a 100644 (file)
--- a/sbr/m_atoi.c
+++ b/sbr/m_atoi.c
@@ -9,6 +9,7 @@
 */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 
 int

diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index 85d4e587770d0ef4f462e9b33740b48f673c3d9a..7f2a7a8e2ae010c9758f455253b698ac1656c0a8 100644 (file)
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -10,6 +10,7 @@
 /* FIXME: This code needs rework! Rewrite as a parser? */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 /*
 ** error codes for sequence

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 059e0e377620363b735c30a750492284b645f941..a3852feb2640386a36e685b489e3ae788d6f170a 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <ctype.h>
 
 /*
 ** This module has a long and checkered history.

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index 4c7703cd745d68b0c2aeedd4a0bd48253e73db34..ff5d00c71b6948818a30283efcea8cfeb9737aab 100644 (file)
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -6,8 +6,10 @@
 ** complete copyright information.
 */
 
-#include <errno.h>
 #include <h/mh.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 static char *get_temp_dir();
 

diff --git a/sbr/makedir.c b/sbr/makedir.c
index ea393852f2aea989977f4f9d9dede79b9e23e83c..c4870dd73f303053fa0f2c79b660e06855056806 100644 (file)
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <sys/param.h>
 #include <sys/file.h>
+#include <sys/stat.h>
 
 int
 makedir(char *dir)

diff --git a/sbr/mts.c b/sbr/mts.c
index a65d9de043c9b0173391f5471566baec10f9036d..b52740df5608ca25aa02e9a32551f9806a192fc3 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -13,6 +13,7 @@
 #include <pwd.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <unistd.h>
 
 /*
 ** static prototypes

diff --git a/sbr/path.c b/sbr/path.c
index 21796a7aec9ba46f0b84eaccc2187feabb6dca97..90d3a27387ab9373a97c19c35dcfb9133c8ed33e 100644 (file)
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include <pwd.h>
+#include <unistd.h>
 
 
 /*

diff --git a/sbr/seq_nameok.c b/sbr/seq_nameok.c
index a61dd9c0d771f4b0d03e1a32dd1cba64f0ebaf36..54d63eed641bac4d874ced7360c3b8ca95214ff7 100644 (file)
--- a/sbr/seq_nameok.c
+++ b/sbr/seq_nameok.c
@@ -7,6 +7,7 @@
 */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 
 /*

diff --git a/sbr/seq_save.c b/sbr/seq_save.c
index 745fa25ba0765c992291948cc2eea5daf26a906e..f546cb89c6dea9311f44f940eac683df4d1d55a0 100644 (file)
--- a/sbr/seq_save.c
+++ b/sbr/seq_save.c
@@ -9,6 +9,7 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
+#include <unistd.h>
 
 
 /*

diff --git a/sbr/strcasecmp.c b/sbr/strcasecmp.c
index 608b4a582d703f2e26be0f6f743890eeaf925dbf..d59c10c8d190d92d93d6bb8cc390f61c2a47845f 100644 (file)
--- a/sbr/strcasecmp.c
+++ b/sbr/strcasecmp.c
@@ -7,6 +7,7 @@
 */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 /*
 ** Our version of strcasecmp has to deal with NULL strings.

diff --git a/sbr/trim.c b/sbr/trim.c
index 9f08d99d2a18a5b65153134d28dd8a75ecb9117b..249faf9c8929e670cb2b0f8f2bf28bd99bc7162b 100644 (file)
--- a/sbr/trim.c
+++ b/sbr/trim.c
@@ -7,6 +7,7 @@
 */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 
 char *

diff --git a/sbr/trimcpy.c b/sbr/trimcpy.c
index 64dd84879ed313fe7aee77fa9390a6a203283135..0d7f58a8190b2b373a3e98865e9753b9aa32343d 100644 (file)
--- a/sbr/trimcpy.c
+++ b/sbr/trimcpy.c
@@ -9,6 +9,7 @@
 */
 
 #include <h/mh.h>
+#include <ctype.h>
 
 
 char *

diff --git a/sbr/utils.c b/sbr/utils.c
index 297ad45c2ac5b3fcfa9367860805e362e1f028ac..1a9093d88140752ec5f4b2a08eb77a80e9467e48 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -11,6 +11,8 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 /*
 ** We allocate space for messages (msgs array)

diff --git a/uip/ali.c b/uip/ali.c
index 4d7617bff7802022721c0569e5ded3118b6854b9..e7bc90f691000f0d1a3b2761254a7ab4c8d0d968 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -10,6 +10,7 @@
 #include <h/addrsbr.h>
 #include <h/aliasbr.h>
 #include <h/utils.h>
+#include <locale.h>
 
 /*
 ** maximum number of names

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 8b32826b5f9122611ae92bf0aea0c26b24d6f4e2..97f0c3428a4234f0e4d257765462f918a7dbeb45 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -11,6 +11,7 @@
 #include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
+#include <ctype.h>
 
 static int akvis;
 static char *akerrst;

diff --git a/uip/anno.c b/uip/anno.c
index 0483dffc201510935e70116ab12459aea5cfda30..7a65a7fc725cdc868b3860e6905f961b2915c1a0 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -17,6 +17,10 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <utime.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static enum { MODE_ADD, MODE_DEL, MODE_LIST } mode = MODE_ADD;
 

diff --git a/uip/ap.c b/uip/ap.c
index 41554d7ed14c231fb25f2c4ca8327ab9c0d18e37..a74eb961c9240b9e0c1b670b4f4f0bfdd1c19692 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,6 +9,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
+#include <locale.h>
 
 #define NADDRS 100
 

diff --git a/uip/burst.c b/uip/burst.c
index db2ddc68871e36ecce091400d37789028fc31e6d..21b218ba72e2a151211312227df9fac34d9704b7 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -7,6 +7,9 @@
 */
 
 #include <h/mh.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERBSW 0

diff --git a/uip/comp.c b/uip/comp.c
index f867593251fb3d2a1b5838d4f3c76a2b77c6c12b..62e4cd2216c01865f00ccff84c744c1bce998055 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -9,6 +9,8 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define EDITRSW  0

diff --git a/uip/dist.c b/uip/dist.c
index 47d7ed507fe6e21090c865996052a523769d67d0..21c67028f30a7303fa35232ef08d3fc80075c837 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -9,6 +9,8 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define ANNOSW  0

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 42c3ce8740c2a13435298f27a67fc2bcfc391745..cf668ad0e7a544841f34ddfe70b32bd0e2b2e11f 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -9,6 +9,9 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;

diff --git a/uip/dp.c b/uip/dp.c
index 22e725c30cfb0c2a4515c0edc837d5fd16883311..b6efbe842d9d48b2ad651bb396281791a0f0faef 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -9,6 +9,7 @@
 #include <h/mh.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
+#include <locale.h>
 
 #define NDATES 100
 

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 5b5cf0ee00b2860a258afc1214ede8789189e000..5fbbb617bec33d5a2e523ef7be522dbc8413c1f5 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -6,14 +6,15 @@
 ** complete copyright information.
 */
 
-#include <stdlib.h>
-#include <h/utils.h>
-
 #include <h/mh.h>
+#include <h/utils.h>
 #include <h/dropsbr.h>
 #include <h/tws.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 
 /*

diff --git a/uip/flist.c b/uip/flist.c
index c0c8b5f63c4c4443cb34354158cc9f369080c90f..c0a056c8b0a44a14974abb4369f3ccaea989678a 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -16,6 +16,11 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 /*
 ** We allocate space to record the names of folders

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index dd5dbcb1e38a219f650e2a5412796544505ead1a..884aa4fe7996fd8756d919a091592cce95fcdb20 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -10,6 +10,7 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/scansbr.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define FORMSW  0

diff --git a/uip/folder.c b/uip/folder.c
index e46519b5aa723a43b9ebec0df5fdbc015113b018..84b43650b77a3a3b4f37fc331651655ed95db00b 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -12,6 +12,8 @@
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 #include <errno.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define ALLSW  0

diff --git a/uip/forw.c b/uip/forw.c
index 1ba80eed549c81086e999202a85a4ebe53b2dd89..91ce04a8a29f074191885e060bfc753fea883745 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -11,7 +11,8 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
-
+#include <unistd.h>
+#include <locale.h>
 
 #define IFORMAT  "digest-issue-%s"
 #define VFORMAT  "digest-volume-%s"

diff --git a/uip/inc.c b/uip/inc.c
index 33672de6fdc27d8498ee7e2ce6c289934888d797..1cac19fd822618e49a752e97ed18ebae030845ba 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -29,13 +29,19 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
-
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/signals.h>
 #include <h/tws.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 
 static struct swit switches[] = {
 #define AUDSW  0

diff --git a/uip/mark.c b/uip/mark.c
index e58ec64d83f86ea3bce998d5e78c2fa8c1cad9ee..57a6553090183c278093682d978170526ca8c47c 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -10,6 +10,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define ADDSW  0

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 2ffd09cec52399feff9e65d5ec0be55799edc47e..c862bc342ee150e64e8f5209788f940e79f8fc2b 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -20,6 +20,10 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/mhfree.c b/uip/mhfree.c
index c9a0418813b90a034ce19f16d5a5139886c535b4..c87306691f453bb4a6753700c4eab7a8738a4dc3 100644 (file)
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include <unistd.h>
 
 /* The list of top-level contents to display */
 CT *cts = NULL;

diff --git a/uip/mhl.c b/uip/mhl.c
index 09fa36659fd39b851cd8bcc35163f98b720343fe..386cf95cd9fed4b36d0132e1fbfe981b678bdcc2 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -13,6 +13,9 @@
 #include <h/tws.h>
 #include <h/utils.h>
 #include <signal.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 /*
 ** MAJOR BUG:

diff --git a/uip/mhlist.c b/uip/mhlist.c
index cf55c4cfb3027c7894699e5cbfe8bae51cabf7db..ceb9336cc09b40d0c6f45f3470880d68357280e8 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -15,6 +15,9 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERBSW  0

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 08f35c73048fb1917fe178fe43e76f5103822bfc..a59e0e88e5860655e220cda558aae4be705a9858 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -14,6 +14,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <sys/stat.h>
 
 /* mhmisc.c */
 int part_ok(CT, int);

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 9936261f7543de272e606cd5764b20bc0a44df37..eea92b72115f86d1a42172d4bc948cbc9204fa1f 100644 (file)
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -11,7 +11,9 @@
 #include <h/utils.h>
 #include <signal.h>
 #include <fcntl.h>
-
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define BODYSW  0

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 0c8e644abfc2d6025f440c5fafa1d4723aab5868..0f0a8d60682ccd1ad772bf08054aeee5f348d5b7 100644 (file)
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -11,6 +11,8 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <stdarg.h>
+#include <sys/stat.h>
 
 extern int debugsw;
 

diff --git a/uip/mhparse.c b/uip/mhparse.c
index e83932c52f2d6387ed7e77bfcae212122a439661..a32592647335fb9cac12df0958b807b6a1b3996d 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -14,6 +14,9 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
 extern int debugsw;
 

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 67408ed9897192df05aa2d947b1c87c566f28e1a..47146f4f2b93e9bb451171552d64b5f9e070b32d 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -8,6 +8,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERSIONSW 0

diff --git a/uip/mhshow.c b/uip/mhshow.c
index e56b6120da46eae46aa88b03fa037736e2857495..3713495e6306ae07c41a5f2e4e13797a07d57f4a 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -15,6 +15,9 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERBSW  0

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index fe40f9d808171d39fac2a362fc1d26d094abee61..f6d86cdabedb14496a4043c12d060ff1441452d4 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -16,6 +16,8 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <sys/wait.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 extern int debugsw;
 

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 63fa5abcdb9acc851f0ba165630a3db46b33443a..74442ad5a4fb6fc32d655868f3993ae9dbee3655 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -15,6 +15,9 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define AUTOSW  0

diff --git a/uip/mhtest.c b/uip/mhtest.c
index aa7e411e195c9e313d580ca48219c1a375b7ec70..c31a2dcc536842418afac6c9d8290ca20ae04455 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -15,6 +15,9 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERBSW  0

diff --git a/uip/new.c b/uip/new.c
index 04fb949b614c538d0c677c0f633139f11f991535..e95ee6ab317a1a48ff14f07694f7c32d7bca3ee9 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -10,15 +10,15 @@
 ** Inspired by Luke Mewburn's new: http://www.mewburn.net/luke/src/new
 */
 
+#include <h/mh.h>
+#include <h/crawl_folders.h>
+#include <h/utils.h>
 #include <sys/types.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <h/mh.h>
-#include <h/crawl_folders.h>
-#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define MODESW 0

diff --git a/uip/packf.c b/uip/packf.c
index f9d02e8f5da56de4520a2aaf2c86eb23281bcc30..78f64c04c934048596b025ad7d45bca7dbbdf83a 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -11,6 +11,8 @@
 #include <h/dropsbr.h>
 #include <h/utils.h>
 #include <errno.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERSIONSW  0

diff --git a/uip/pick.c b/uip/pick.c
index d31f9b801275012a417c8474bb707a35ac2e4b8b..07dca9a98b342930cd5f67e16ab308f78518616b 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -9,6 +9,8 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/prompter.c b/uip/prompter.c
index e42e8df7c93bac10a71484b6c32c409a4cd19555..2bcd92a2076602bd96c820766707822deda66a02 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -13,6 +13,9 @@
 #include <signal.h>
 #include <setjmp.h>
 #include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define PREPSW  0

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index c3650595da8382af9c3093fa743da0e63432108a..4e052ccd09cfceb9a5fb6e9aa36415ec43828957 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -11,6 +11,9 @@
 #include <h/rcvmail.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define FORMSW  0

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 352f785b6bbf0affc7ed33ac6b48086d602764d2..4c271dffe45e186bcc2064309d350f8a4fb2e54d 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -10,6 +10,8 @@
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERSIONSW  0

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 0b5ad85ce5aa715a181978a24934eb6842bc888d..61a91b24f35d4dc69e35c26c5628cd44a8bedfa8 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -11,6 +11,9 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define CRETSW  0

diff --git a/uip/refile.c b/uip/refile.c
index 96f355a610f2d4de977763522617d3170a192b47..17e6d614a9662682a7440320b771fad54cff1f60 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -11,6 +11,8 @@
 #include <h/utils.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define LINKSW  0

diff --git a/uip/repl.c b/uip/repl.c
index 42bcfdc5d72869c661a90889d7221b51ac4a9c10..a5864c11debf0f41e0bf2e4d74befa27aa3b41a6 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -12,7 +12,10 @@
 #include <h/fmt_scan.h>
 #include <sys/file.h>  /* L_SET */
 #include <errno.h>
-
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define GROUPSW  0

diff --git a/uip/rmf.c b/uip/rmf.c
index 164ec77b48f979124a14ec00fd96621af6f061be..615369caa7922855b500ff4ed2152dd9aa1644d5 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,6 +7,9 @@
 */
 
 #include <h/mh.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define INTRSW  0

diff --git a/uip/rmm.c b/uip/rmm.c
index 03d4568bb1a3e988e48b8fe79ecad2636b7bd67d..520ce036d92026fec8eb00fd3a6a232c45d9a9c1 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -8,6 +8,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define UNLINKSW  0

diff --git a/uip/scan.c b/uip/scan.c
index 29aea6560c786761cae1b561f289a7ca03cda223..f53cf1dd1209369b7d373dfe5b0d574459efc923 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -12,6 +12,8 @@
 #include <h/tws.h>
 #include <h/utils.h>
 #include <errno.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define FORMSW  0

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 865f2f72bbba8f6406e577a961e8e62ea9be8b20..4fa5a0d9be579a9bebcd37e2b6ba41caf03c1f1b 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -12,6 +12,8 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
 #ifdef _FSTDIO
 # define _ptr _p  /* Gag */

diff --git a/uip/send.c b/uip/send.c
index 234dfb29a773b075e3466b05db875fe15fc3732e..41ef92a5823ef89769ba5654f6ab9ca38f404243 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -16,12 +16,20 @@
 #include <h/utils.h>
 #include <sysexits.h>
 #include <sys/wait.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 #include <time.h>
 
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
 int debugsw = 0;  /* global */
 char *altmsg = NULL;
 char *annotext = NULL;

diff --git a/uip/slocal.c b/uip/slocal.c
index 17be186bcd540625e84ad97f0b509698687452ff..41f986dcb089b36e965f91731bddcc6095ee4d07 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -15,17 +15,19 @@
 **
 */
 
-
 #include <h/mh.h>
 #include <h/rcvmail.h>
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/utils.h>
-
 #include <pwd.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 #ifdef INITGROUPS_HEADER
 #include INITGROUPS_HEADER

diff --git a/uip/sortm.c b/uip/sortm.c
index 0230495e316a3037e7da3cc06c844166e7783568..734b63b9ecb9e8cacf37269aa72aba5a59d4999a 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -9,6 +9,14 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 
 static struct swit switches[] = {
 #define DATESW  0

diff --git a/uip/spost.c b/uip/spost.c
index bfa8f4bed99e92a9743d02a0bc015e73340f47bf..449d1a713dcaa87d9bdd72a21e8c9d602ac6978f 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -16,6 +16,8 @@
 #include <h/dropsbr.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
 
 #define MAX_SM_FIELD 1476  /* < largest hdr field sendmail will accept */
 

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 29693973946b2e509f4baa29c6603325da6cb178..cd72e446483564434de42f6951bad5e7e3c3f1bd 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -11,6 +11,13 @@
 #include <signal.h>
 #include <h/mime.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 
 static struct swit switches[] = {
 #define EDITRSW  0

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index e20df6827b6a4635f4da249f62583ea7cc9f46ee..1ccd2096fb13c522117c4d62bb4bb4ff82d4d02f 100644 (file)
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -7,6 +7,7 @@
 */
 
 #include <h/mh.h>
+#include <unistd.h>
 
 
 /*

diff --git a/uip/whom.c b/uip/whom.c
index fb77ab374aba764cd25ddafa5685976b47fd9c4f..3d3eb8464ebb937aca6a84ebd15bf03e6efb28ad 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -10,6 +10,7 @@
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/utils.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define VERSIONSW 0