* All OS-level includes are now included from webcit.h instead of from

  each individual .c file.  This will keep the build cleaner.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index a31b8e6f6f46545af3dc84e2fad24c0ff78bcc3a..ea66d9f25cafc823d1d572f6aee363c8e0bb8887 100644 (file)
--- 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 4ed68ff68efa7e21bf3899b2af6b617248f0c276..adca87133440688c09d6b1765974b2db17b3204f 100644 (file)
--- 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 27d99240787803f2d60e53c652567bb7c3548805..009bf9f70f3e616a3c36171cd5ca97960de83196 100644 (file)
--- 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 0864c5875421e14a62e6aa267bb0b41cac43cb04..06654213315d2a8d8e40e3e5000f0e8392980b54 100644 (file)
--- 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 8113a9474aece591a4b30964b53347fe82036d42..94e9dffdc00deb411aa67d704c0b123cf94b7402 100644 (file)
--- 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 5bfe3497d45faefa9ae8bdae9c0acd17f3065939..c43cb5b979f92abc36022bd9292cbba077657f47 100644 (file)
--- 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 9fd9ba8fe4f9b003457879b5ff7bb21ef72eb33a..53129a78061a1812c3f355c7671baea2498ae44f 100644 (file)
--- 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 27c4830d214cc2d5b24ac70d3920abd32db3f003..599e20228c0317e8c8a1c3c01ef1d542c14a788c 100644 (file)
--- 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 4d9880c9e4df13715d7db633047d8dc3e8ad4b02..98f1450795b351fb7af7a0f05d5df8ab79dcfe2d 100644 (file)
--- 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 87586aaf00810a0e492653e801ab4a9438545f32..7211a2c7b9e012c8e962849884b477d909fa4b7f 100644 (file)
--- 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 ceb2e5087521123e20a4f3df7eea518625b6e82d..b4dceb6a0a2d4cb093908bb081e1d75b1207e913 100644 (file)
--- 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 55b9897c8262aaf0625c2bc3a83c799d97c5d50c..2b6148954905a90be9d344980a14275a1ffb98a9 100644 (file)
--- 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 7bf365ab8f4d4961bc4046f3a777e1e93ddc7183..6a1fdcab79b20dd357aac9023272815fa8d10cdc 100644 (file)
--- 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 6d0225786796f5c8b403c83df4f8cc06a40a436d..2d44b8fc1cce551e46ce49752b7d7cdac227e91f 100644 (file)
--- 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 4283a32d0612e55021cb54cd011ae3722d789fae..70f75bbd5ef04bf8d8079b734f8000fe13dc7174 100644 (file)
--- 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 fc4bfb595345d9340817726f95e1019b0ed0599b..ba5817d0f7b97c67bd2513776fe149154d090b8e 100644 (file)
--- 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 6e7323c50f10a0c8ffe526c8b30cb7fb54503130..929a9c843ef0064d6fa49f68970f4a3e48a82630 100644 (file)
--- 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 3e069609b4a8839a1fef316fe43585b61184dcda..382b5a411335b6280eb6c599367f116422012be2 100644 (file)
--- 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 a6ba5ef59ffc64d81e392f73a5d3c54de30bb4f6..a968ccd57e626986d417f3c89af4b162cd525238 100644 (file)
--- 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 110d9682e31d937ffa35a47ee621b75f860431eb..8a2b5c9bd6db1623e2c57f4f7d5ba5c1761d6329 100644 (file)
--- 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 da79733ce4eea98389e5e72a4cff2f22f6cae957..aa0aa6ebfb306d9ba304546e564cbce8cead66bb 100644 (file)
--- 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 0748bc91766b73786170d0bc44c22af50db96c40..54e927436005bc746025acab62e21b71cf588bc1 100644 (file)
--- 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 f9ffe1598d1c8a0d9926aae3b8d5421bca228aad..45a3d214fe318ff97b36d19c917aec3e1ea3a074 100644 (file)
--- 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 5bfc232c2ba0ef29a9ffc1db03a42348c721f2f6..6bb3272ac002395edc7ea9dc3cec391c9a3d9900 100644 (file)
--- 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 c37a4836e8db631f56dd326354873775d34d0d4c..0d70d08f9148d6a2f90884bbe38f8ef575b2b486 100644 (file)
--- 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 923a68165ad003c1e600ace51e6c9e2b29090220..ba7026216393a772538d2361df8cbb7c1a50b32e 100644 (file)
--- 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 5eea557eb2fa7be5ca359ce1709d081938f5b192..c7e15823fa14d8967247a6bfe268d0684f1707be 100644 (file)
--- 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 9fe0cb5f6d3f4ec98e7648b72dcf5efa855ca2ed..b79ae635e8813e72694dc1d1a8da88bc23d7282d 100644 (file)
--- 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 ed6719cefa903ed1a2f21a8684e27963b01507f7..e85d306974165458e2dcbf470aa11a9978fd3c82 100644 (file)
--- 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 8ea2aee7e7083deccefee406106b45a8417de381..359e07f660cc59374f451247133fcd976f85afcc 100644 (file)
--- 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 10dfcff6aa49c931b34a6fee7ee07b627197f68a..9cea7d21aa127dc4164a4935964df5221c966f5e 100644 (file)
--- 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 611b38d45bf8503baeafa89f177d272966b4f3de..c202b3e7b6e3704315908190683b3d64263219f7 100644 (file)
--- 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 1c51b9844c164f55d8641496777be39cf7f621ef..0fa13b5020c0d62cff46a89c9d916b55284ce4b8 100644 (file)
--- 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 bee25dd2a7fa38ab6df96e11eac25d88f55063a8..c587381df3d28ea2697fc00d697c5f6b72d279fa 100644 (file)
--- 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 93a8465eb63f93c3a603dd765a480f0d077b2191..3eb0375eb105ddbbc89caa157cd2c8202cdef21d 100644 (file)
--- 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 f392011122142b9e2e29a90ad90bcf19f1848a82..5c83f9cfbc435c4f4626dd9cf819e3d56e4bc665 100644 (file)
--- 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 464576c532b6914503b7dfae4f94bbc966ea6801..ce7878b4fd52a7470316ae08fb68ce9065acb7fd 100644 (file)
--- 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 f5f56b4a18f07a9146000be569eb8e007be78e65..104915f62d3d27de338091e7e5327c4dba1bc873 100644 (file)
--- 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 950851f06c07a46b47b7fa5b30b81d5023332e24..d98178b48b86edfb0bdbcfbb9e201fd3a0a3e602 100644 (file)
--- 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 9e93b0a8e7dc670b1111311544ccb16e1d6997d4..562ae254e1badbeb533be6742e7ee4d0ada0f7e2 100644 (file)
--- 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 8d32297e51a57d0b32401ff28f70d4d8c3239ebe..ed5bb61e81b7aacb3fe4f6a055c08a8cb59bb01f 100644 (file)
--- 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 ddf38ad9f80d4e62bef7cf2bd6265ac788a5a442..fa1fcf45ad9f500cda65d99e5675ddfacee45b83 100644 (file)
--- 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 1d3604d5d12052fbf6485ae04d2bc18c5a142655..2b613712afb30f9db771d61a42569ec59e9b1a54 100644 (file)
--- 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 041fe027e853c0fb28d78807867f62acc5cfe43b..fc554d5e881642692f1b3eaff6042b05f981d634 100644 (file)
--- 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 cc3c5bd198308bebfa165ec8a2ffee819c2a2dc4..64f4b428e4284727b3a8c7ee05713c5999c40af8 100644 (file)
--- 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 e8876e2b396100e4d46bba3a7de9bacdf69ec9a2..362e5a318d6a2b098daaca0cd358d9f941aace11 100644 (file)
--- 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 2198486a3edd1b5454e6ee34e25e95640c22b68a..dbe995298c31a93d2141e43d5c025f1497d8026a 100644 (file)
--- 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 079cbcddaafacaf6f33e8f10db4264b8ebad1106..736eb806f7fa0d3d57a18664cb6d2a8f5b629666 100644 (file)
--- 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 f8f90085e489b647c8f9c2c00b8303284f77bca5..fd74ae10e1cf6851dfbbd520a9714fc9ce0ad57a 100644 (file)
--- 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 03041f2f01892b2feac72b64f00f5dfd201920bc..7274f78940e7b2bc24ffa8135bbd8af7193eb029 100644 (file)
--- 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 16dbef92438aa9eae7c8d3d3ebf4f6a0d3275edb..68e3bb17c8d8a013c254d91e960965b8b66a05aa 100644 (file)
--- 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 97310aa634b9d1528da1915fd9b46cddb3c29dc8..62b84388db34a02c07981f5dbc796cfbc7a31198 100644 (file)
--- 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"