From aa8ca3b0af3efdabd8559b886efb3164319bdce1 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 12 Aug 2005 21:53:32 +0000
Subject: [PATCH] * All OS-level includes are now included from webcit.h
 instead of from   each individual .c file.  This will keep the build cleaner.

---
 webcit/ChangeLog           |  5 ++++-
 webcit/auth.c              | 19 -------------------
 webcit/availability.c      | 19 -------------------
 webcit/calendar.c          | 19 -------------------
 webcit/calendar_tools.c    | 19 -------------------
 webcit/calendar_view.c     | 19 -------------------
 webcit/context_loop.c      | 26 --------------------------
 webcit/cookie_conversion.c | 19 -------------------
 webcit/crypto.c            |  8 --------
 webcit/event.c             | 19 -------------------
 webcit/floors.c            | 19 -------------------
 webcit/fmt_date.c          | 20 --------------------
 webcit/graphics.c          | 19 -------------------
 webcit/groupdav_delete.c   | 16 ----------------
 webcit/groupdav_get.c      | 16 ----------------
 webcit/groupdav_main.c     | 16 ----------------
 webcit/groupdav_options.c  | 16 ----------------
 webcit/groupdav_propfind.c | 16 ----------------
 webcit/groupdav_put.c      | 16 ----------------
 webcit/html2html.c         | 23 -----------------------
 webcit/http_datestring.c   |  6 +-----
 webcit/ical_dezonify.c     | 28 ----------------------------
 webcit/iconbar.c           | 20 --------------------
 webcit/inetconf.c          | 19 -------------------
 webcit/listsub.c           | 19 -------------------
 webcit/locate_host.c       | 19 -------------------
 webcit/mainmenu.c          | 21 ---------------------
 webcit/messages.c          | 28 ++++------------------------
 webcit/mime_parser.c       | 12 ------------
 webcit/netconf.c           | 21 ---------------------
 webcit/notes.c             | 28 ----------------------------
 webcit/paging.c            | 21 ---------------------
 webcit/preferences.c       | 19 -------------------
 webcit/roomops.c           | 19 -------------------
 webcit/serv_func.c         | 19 -------------------
 webcit/setup.c             | 29 -----------------------------
 webcit/setup_wizard.c      | 19 -------------------
 webcit/siteconfig.c        | 22 ----------------------
 webcit/snprintf.c          |  5 +----
 webcit/subst.c             | 20 --------------------
 webcit/summary.c           | 20 --------------------
 webcit/sysmsgs.c           | 19 -------------------
 webcit/tcp_sockets.c       | 22 ----------------------
 webcit/tools.c             | 28 ----------------------------
 webcit/useredit.c          | 22 ----------------------
 webcit/userlist.c          | 19 -------------------
 webcit/vcard.c             | 28 ----------------------------
 webcit/vcard_edit.c        | 19 -------------------
 webcit/webcit.c            | 20 --------------------
 webcit/webcit.h            | 38 ++++++++++++++++++++++++++++++++++++++
 webcit/webserver.c         | 28 ----------------------------
 webcit/who.c               | 19 -------------------
 52 files changed, 48 insertions(+), 977 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index a31b8e6f6..ea66d9f25 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 621.5  2005/08/12 21:53:31  ajc
+* All OS-level includes are now included from webcit.h instead of from
+  each individual .c file.  This will keep the build cleaner.
+
 Revision 621.4  2005/08/12 01:01:27  ajc
 * The iconbar and summary screen now connect to the user's primary
   groupware rooms using the new macros: _CALENDAR_, _TASKS_, _NOTES_,
@@ -2802,4 +2806,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
-
diff --git a/webcit/auth.c b/webcit/auth.c
index 4ed68ff68..adca87133 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -6,25 +6,6 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 char *axdefs[] =
diff --git a/webcit/availability.c b/webcit/availability.c
index 27d992407..009bf9f70 100644
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <time.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/calendar.c b/webcit/calendar.c
index 0864c5875..066542133 100644
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <time.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index 8113a9474..94e9dffdc 100644
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -4,25 +4,6 @@
  * Miscellaneous functions which handle calendar components.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <time.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 5bfe3497d..c43cb5b97 100644
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -4,25 +4,6 @@
  * Handles the HTML display of calendar items.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <time.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 9fd9ba8fe..53129a780 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -8,32 +8,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index 27c4830d2..599e20228 100644
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -6,25 +6,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 #define TRUE  1
diff --git a/webcit/crypto.c b/webcit/crypto.c
index 4d9880c9e..98f145079 100644
--- a/webcit/crypto.c
+++ b/webcit/crypto.c
@@ -6,14 +6,6 @@
 
 #ifdef HAVE_OPENSSL
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <pthread.h>
-
-#include <sys/time.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/event.c b/webcit/event.c
index 87586aaf0..7211a2c7b 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <time.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/floors.c b/webcit/floors.c
index ceb2e5087..b4dceb6a0 100644
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -6,25 +6,6 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/fmt_date.c b/webcit/fmt_date.c
index 55b9897c8..2b6148954 100644
--- a/webcit/fmt_date.c
+++ b/webcit/fmt_date.c
@@ -4,26 +4,6 @@
  * Miscellaneous routines 
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <sys/time.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/graphics.c b/webcit/graphics.c
index 7bf365ab8..6a1fdcab7 100644
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -4,25 +4,6 @@
  * Handles HTTP upload of graphics files into the system.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 void display_graphics_upload(char *description, char *check_cmd, char *uplurl)
diff --git a/webcit/groupdav_delete.c b/webcit/groupdav_delete.c
index 6d0225786..2d44b8fc1 100644
--- a/webcit/groupdav_delete.c
+++ b/webcit/groupdav_delete.c
@@ -5,22 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <time.h>
-#include <pthread.h>
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
diff --git a/webcit/groupdav_get.c b/webcit/groupdav_get.c
index 4283a32d0..70f75bbd5 100644
--- a/webcit/groupdav_get.c
+++ b/webcit/groupdav_get.c
@@ -5,22 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <time.h>
-#include <pthread.h>
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c
index fc4bfb595..ba5817d0f 100644
--- a/webcit/groupdav_main.c
+++ b/webcit/groupdav_main.c
@@ -5,22 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <time.h>
-#include <pthread.h>
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
diff --git a/webcit/groupdav_options.c b/webcit/groupdav_options.c
index 6e7323c50..929a9c843 100644
--- a/webcit/groupdav_options.c
+++ b/webcit/groupdav_options.c
@@ -5,22 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <time.h>
-#include <pthread.h>
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c
index 3e069609b..382b5a411 100644
--- a/webcit/groupdav_propfind.c
+++ b/webcit/groupdav_propfind.c
@@ -15,22 +15,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <time.h>
-#include <pthread.h>
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c
index a6ba5ef59..a968ccd57 100644
--- a/webcit/groupdav_put.c
+++ b/webcit/groupdav_put.c
@@ -5,22 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <time.h>
-#include <pthread.h>
 #include "webcit.h"
 #include "webserver.h"
 #include "groupdav.h"
diff --git a/webcit/html2html.c b/webcit/html2html.c
index 110d9682e..8a2b5c9bd 100644
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -6,29 +6,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#endif
-
 #include "webcit.h"
 #include "vcard.h"
 #include "webserver.h"
diff --git a/webcit/http_datestring.c b/webcit/http_datestring.c
index da79733ce..aa0aa6ebf 100644
--- a/webcit/http_datestring.c
+++ b/webcit/http_datestring.c
@@ -6,11 +6,7 @@
  *
  */
 
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-# include <time.h>
+#include "webcit.h"
 
 static char *httpdate_months[] = {
 	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 0748bc917..54e927436 100644
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -11,34 +11,6 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index f9ffe1598..45a3d214f 100644
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -4,26 +4,6 @@
  * Displays and customizes the iconbar.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <time.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 5bfc232c2..6bb3272ac 100644
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
diff --git a/webcit/listsub.c b/webcit/listsub.c
index c37a4836e..0d70d08f9 100644
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
diff --git a/webcit/locate_host.c b/webcit/locate_host.c
index 923a68165..ba7026216 100644
--- a/webcit/locate_host.c
+++ b/webcit/locate_host.c
@@ -5,25 +5,6 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 void locate_host(char *tbuf, int client_socket)
diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 5eea557eb..c7e15823f 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -5,29 +5,8 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
-
-
 /*
  * The Main Menu
  */
diff --git a/webcit/messages.c b/webcit/messages.c
index 9fe0cb5f6..b79ae635e 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -5,29 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#endif
-
 #include "webcit.h"
 #include "vcard.h"
 #include "webserver.h"
@@ -1993,7 +1970,10 @@ void display_enter(void)
 	}
 #endif
 
-	/* Otherwise proceed normally.  Do a custom room banner with no navbar... */
+	/*
+	 * Otherwise proceed normally.
+`	 * Do a custom room banner with no navbar...
+	 */
 	output_headers(1, 1, 2, 0, 0, 0, 0);
 	wprintf("<div id=\"banner\">\n");
 	embed_room_banner(NULL, navbar_none);
diff --git a/webcit/mime_parser.c b/webcit/mime_parser.c
index ed6719cef..e85d30697 100644
--- a/webcit/mime_parser.c
+++ b/webcit/mime_parser.c
@@ -8,20 +8,8 @@
  *
  */
 
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <errno.h>
-
 #include "webcit.h"
 #include "webserver.h"
-
 #include "mime_parser.h"
 
 
diff --git a/webcit/netconf.c b/webcit/netconf.c
index 8ea2aee7e..359e07f66 100644
--- a/webcit/netconf.c
+++ b/webcit/netconf.c
@@ -5,29 +5,8 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
-
-
 void edit_node(void) {
 	char buf[SIZ];
 	char node[SIZ];
diff --git a/webcit/notes.c b/webcit/notes.c
index 10dfcff6a..9cea7d21a 100644
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -5,34 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/paging.c b/webcit/paging.c
index 611b38d45..c202b3e7b 100644
--- a/webcit/paging.c
+++ b/webcit/paging.c
@@ -4,29 +4,8 @@
  * Functions which implement the chat and paging facilities.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
-
 /*
  * display the form for paging (x-messaging) another user
  */
diff --git a/webcit/preferences.c b/webcit/preferences.c
index 1c51b9844..0fa13b502 100644
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/roomops.c b/webcit/roomops.c
index bee25dd2a..c587381df 100644
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -4,25 +4,6 @@
  * Lots of different room-related operations.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 struct folder {
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 93a8465eb..3eb0375eb 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/setup.c b/webcit/setup.c
index f39201112..5c83f9cfb 100644
--- a/webcit/setup.c
+++ b/webcit/setup.c
@@ -8,35 +8,6 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
-#include <sys/utsname.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/setup_wizard.c b/webcit/setup_wizard.c
index 464576c53..ce7878b4f 100644
--- a/webcit/setup_wizard.c
+++ b/webcit/setup_wizard.c
@@ -4,25 +4,6 @@
  * First-time setup wizard
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index f5f56b4a1..104915f62 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -6,31 +6,9 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
-
-
-
 void display_siteconfig(void)
 {
 	char buf[SIZ];
diff --git a/webcit/snprintf.c b/webcit/snprintf.c
index 950851f06..d98178b48 100644
--- a/webcit/snprintf.c
+++ b/webcit/snprintf.c
@@ -23,10 +23,7 @@
  * Written July 1997 by Sten Gunterberg (gunterberg@ergon.ch)
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
+#include "webcit.h"
 #include "webserver.h"
 
 static int needed(const char *fmt, va_list argp)
diff --git a/webcit/subst.c b/webcit/subst.c
index 9e93b0a8e..562ae254e 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -7,26 +7,6 @@
 
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
diff --git a/webcit/summary.c b/webcit/summary.c
index 8d32297e5..ed5bb61e8 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -4,26 +4,6 @@
  * Displays the "Summary Page"
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <time.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 /*
diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index ddf38ad9f..fa1fcf45a 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -4,25 +4,6 @@
  * Editing of various text files on the Citadel server.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 1d3604d5d..2b613712a 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -10,31 +10,9 @@
 #define SERV_TRACE 1
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/un.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
-
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
 #endif
diff --git a/webcit/tools.c b/webcit/tools.c
index 041fe027e..fc554d5e8 100644
--- a/webcit/tools.c
+++ b/webcit/tools.c
@@ -4,34 +4,6 @@
  * Miscellaneous routines 
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/useredit.c b/webcit/useredit.c
index cc3c5bd19..64f4b428e 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -6,32 +6,10 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
 
-
-
-
 void select_user_to_edit(char *message, char *preselect)
 {
 	char buf[SIZ];
diff --git a/webcit/userlist.c b/webcit/userlist.c
index e8876e2b3..362e5a318 100644
--- a/webcit/userlist.c
+++ b/webcit/userlist.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 struct namelist {
diff --git a/webcit/vcard.c b/webcit/vcard.c
index 2198486a3..dbe995298 100644
--- a/webcit/vcard.c
+++ b/webcit/vcard.c
@@ -8,34 +8,6 @@
  * Public License.  All other rights reserved.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 #include "vcard.h"
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 079cbcdda..736eb806f 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -5,25 +5,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "vcard.h"
 
diff --git a/webcit/webcit.c b/webcit/webcit.c
index f8f90085e..fd74ae10e 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -7,26 +7,6 @@
  *
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "groupdav.h"
 #include "webserver.h"
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 03041f2f0..7274f7894 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,43 @@
 /* $Id$ */
 
+#include <ctype.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/stat.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <sys/poll.h>
+#include <string.h>
+#include <pwd.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
+#include <sys/utsname.h>
+
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
+
+
 /*
  * Uncomment to dump an HTTP trace to stderr
 #define HTTP_TRACING 1
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 16dbef924..68e3bb17c 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -8,34 +8,6 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
diff --git a/webcit/who.c b/webcit/who.c
index 97310aa63..62b84388d 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -4,25 +4,6 @@
  * Display a list of all users currently logged on to the Citadel server.
  */
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 
 
-- 
2.30.2