From 655de5af64c89584fbdd0110a27053a9f3bfd138 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 15 Sep 2013 19:03:00 +0200
Subject: [PATCH] cleanup includes

---
 citadel/citserver.c       | 39 ++++---------------------
 citadel/clientsocket.c    | 21 +-------------
 citadel/config.c          |  8 -----
 citadel/context.c         | 61 ++++-----------------------------------
 citadel/control.c         | 35 ++--------------------
 citadel/database.c        | 19 ++----------
 citadel/domain.c          |  6 ----
 citadel/euidindex.c       | 35 +---------------------
 citadel/event_client.c    | 49 +++----------------------------
 citadel/housekeeping.c    | 38 ++----------------------
 citadel/journaling.c      | 41 +++-----------------------
 citadel/ldap.c            | 42 ++-------------------------
 citadel/locate_host.c     | 27 ++++++-----------
 citadel/msgbase.c         | 48 +++++-------------------------
 citadel/room_ops.c        | 36 +++--------------------
 citadel/serv_extensions.c | 17 ++---------
 citadel/server_main.c     | 59 ++++---------------------------------
 citadel/support.c         |  8 ++---
 citadel/sysdep.c          | 59 +++++++++----------------------------
 citadel/threads.c         | 41 +++-----------------------
 citadel/user_ops.c        | 42 ++-------------------------
 21 files changed, 78 insertions(+), 653 deletions(-)

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 266adcdd8..e5029fe51 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -12,15 +12,8 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
+#include "sysdep.h"
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
@@ -35,35 +28,15 @@
 #if HAVE_BACKTRACE
 #include <execinfo.h>
 #endif
-
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "sysdep_decls.h"
-#include "threads.h"
-#include "citserver.h"
-#include "config.h"
-#include "database.h"
+
+#include "ctdl_module.h"
 #include "housekeeping.h"
-#include "user_ops.h"
-#include "msgbase.h"
-#include "support.h"
 #include "locate_host.h"
-#include "room_ops.h"
+#include "citserver.h"
+#include "user_ops.h"
 #include "control.h"
-#include "euidindex.h"
-#include "context.h"
-#include "svn_revision.h"
-#include "ctdl_module.h"
+#include "config.h"
 
 char *unique_session_numbers;
 int ScheduledShutdown = 0;
diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index ef20ac7b6..91485bedc 100644
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -15,29 +15,10 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <syslog.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "sysdep_decls.h"
-#include "config.h"
-#include "clientsocket.h"
 #include "ctdl_module.h"
+#include "clientsocket.h"
 
 int sock_connect(char *host, char *service)
 {
diff --git a/citadel/config.c b/citadel/config.c
index 8f3ec9db6..7ac1a748b 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -13,17 +13,9 @@
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <limits.h>
 #include <sys/utsname.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
 #include "config.h"
 #include "ctdl_module.h"
 
diff --git a/citadel/context.c b/citadel/context.c
index 8c6c51a1c..38e0d03f5 100644
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -13,65 +13,14 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <syslog.h>
-#include <sys/syslog.h>
-/*
-#include <sys/syscall.h>
-*/
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <limits.h>
-#include <sys/resource.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <grp.h>
-#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "sysdep_decls.h"
-#include "citserver.h"
-#include "support.h"
-#include "config.h"
-#include "database.h"
-#include "housekeeping.h"
-#include "modules/crypto/serv_crypto.h"	/* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */
+#include "ctdl_module.h"
+#include "serv_extensions.h"
 #include "ecrash.h"
 
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#include "ctdl_module.h"
-#include "threads.h"
+#include "citserver.h"
 #include "user_ops.h"
+#include "locate_host.h"
+#include "context.h"
 #include "control.h"
 
 int DebugSession = 0;
diff --git a/citadel/control.c b/citadel/control.c
index b19438bde..cc3165531 100644
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -12,45 +12,14 @@
  *  GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
 #include <sys/file.h>
-#include <sys/stat.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "control.h"
-#include "sysdep_decls.h"
-#include "support.h"
+
+#include "ctdl_module.h"
 #include "config.h"
-#include "msgbase.h"
 #include "citserver.h"
-#include "room_ops.h"
 #include "user_ops.h"
-#include "database.h"
-#include "threads.h"
-#include "ctdl_module.h"
 
 struct CitControl CitControl;
 extern struct config config;
diff --git a/citadel/database.c b/citadel/database.c
index 98ed9680e..23e713351 100644
--- a/citadel/database.c
+++ b/citadel/database.c
@@ -27,16 +27,8 @@
 /*****************************************************************************/
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
-#include <syslog.h>
 #include <zlib.h>
 
 #ifdef HAVE_DB_H
@@ -54,17 +46,10 @@
 
 
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "citserver.h"
-#include "database.h"
-#include "msgbase.h"
-#include "sysdep_decls.h"
-#include "threads.h"
-#include "config.h"
-#include "control.h"
 
 #include "ctdl_module.h"
+#include "control.h"
+#include "citserver.h"
 
 
 static DB *dbp[MAXCDB];		/* One DB handle for each Citadel database */
diff --git a/citadel/domain.c b/citadel/domain.c
index 0e6bb7dab..3d055c671 100644
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -13,13 +13,8 @@
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <netinet/in.h>
 #include <stdio.h>
 #include <syslog.h>
-
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
 #ifdef HAVE_ARPA_NAMESER_COMPAT_H
@@ -31,7 +26,6 @@
 #include "sysdep_decls.h"
 #include "citadel.h"
 #include "domain.h"
-#include "server.h"
 #include "internet_addressing.h"
 
 
diff --git a/citadel/euidindex.c b/citadel/euidindex.c
index 85d9ccbf5..7e5c735d0 100644
--- a/citadel/euidindex.c
+++ b/citadel/euidindex.c
@@ -3,44 +3,11 @@
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "msgbase.h"
-#include "support.h"
-#include "sysdep_decls.h"
+
 #include "citserver.h"
 #include "room_ops.h"
-#include "user_ops.h"
-#include "config.h"
-#include "control.h"
-#include "euidindex.h"
-
-#include "ctdl_module.h"
 
 /*
  * The structure of an euidindex record *key* is:
diff --git a/citadel/event_client.c b/citadel/event_client.c
index e75f114ed..7903563c5 100644
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -9,61 +9,20 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <termios.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pwd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <syslog.h>
 
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-#include <sys/wait.h>
-#include <ctype.h>
+#include <stdio.h>
 #include <string.h>
-#include <limits.h>
+#include <syslog.h>
+#include <assert.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <assert.h>
-#if HAVE_BACKTRACE
-#include <execinfo.h>
-#endif
 
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "citserver.h"
-#include "support.h"
-#include "config.h"
-#include "control.h"
-#include "user_ops.h"
-#include "database.h"
-#include "msgbase.h"
-#include "internet_addressing.h"
-#include "genstamp.h"
-#include "domain.h"
-#include "clientsocket.h"
-#include "locate_host.h"
-#include "citadel_dirs.h"
 
-#include "event_client.h"
 #include "ctdl_module.h"
-
+#include "event_client.h"
 
 ConstStr IOStates[] = {
 	{HKEY("DB Queue")},
diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 077b50930..11be04e00 100644
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -12,49 +12,15 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#include <syslog.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
+
+#include "ctdl_module.h"
 #include "serv_extensions.h"
-#include "citserver.h"
-#include "config.h"
-#include "housekeeping.h"
-#include "sysdep_decls.h"
 #include "room_ops.h"
-#include "database.h"
-#include "msgbase.h"
 #include "internet_addressing.h"
 #include "journaling.h"
 
-#include "ctdl_module.h"
-#include "threads.h"
-
 void check_sched_shutdown(void) {
 	if ((ScheduledShutdown == 1) && (ContextList == NULL)) {
 		syslog(LOG_NOTICE, "Scheduled shutdown initiating.\n");
diff --git a/citadel/journaling.c b/citadel/journaling.c
index 4ebb11884..3dae10749 100644
--- a/citadel/journaling.c
+++ b/citadel/journaling.c
@@ -2,50 +2,17 @@
  * Message journaling functions.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "msgbase.h"
-#include "support.h"
-#include "sysdep_decls.h"
+
+#include "ctdl_module.h"
+
 #include "citserver.h"
-#include "room_ops.h"
 #include "user_ops.h"
-#include "config.h"
-#include "control.h"
-#include "genstamp.h"
-#include "internet_addressing.h"
 #include "serv_vcard.h"			/* Needed for vcard_getuser and extract_inet_email_addrs */
+#include "internet_addressing.h"
 #include "journaling.h"
 
-#include "ctdl_module.h"
-#include "threads.h"
-
 struct jnlq *jnlq = NULL;	/* journal queue */
 
 /*
diff --git a/citadel/ldap.c b/citadel/ldap.c
index 9035ec813..a6f3db3c2 100644
--- a/citadel/ldap.c
+++ b/citadel/ldap.c
@@ -15,51 +15,13 @@
 
 int ctdl_require_ldap_version = 3;
 
-#include "sysdep.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <string.h>
-#include <limits.h>
 #include <libcitadel.h>
-#include "auth.h"
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "sysdep_decls.h"
-#include "support.h"
-#include "room_ops.h"
-#include "control.h"
-#include "msgbase.h"
-#include "config.h"
+
 #include "citserver.h"
-#include "citadel_dirs.h"
-#include "genstamp.h"
-#include "threads.h"
 #include "citadel_ldap.h"
 #include "ctdl_module.h"
+
 #include "user_ops.h"
 
 #ifdef HAVE_LDAP
diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index d964bc72e..e2dcdec8d 100644
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -13,30 +13,18 @@
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
+#include <string.h>
 #include <stdio.h>
+#include <syslog.h>
 #include <ctype.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <limits.h>
-#include <netdb.h>
-#include <string.h>
-#include <errno.h>
-#include <syslog.h>
+
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "locate_host.h"
-#include "sysdep_decls.h"
-#include "config.h"
-#include "domain.h"
-#include "context.h"
-#include "ctdl_module.h"
 
+
+#include "context.h"
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
 #ifdef HAVE_ARPA_NAMESER_COMPAT_H
@@ -45,6 +33,9 @@
 #include <resolv.h>
 #endif
 
+#include "domain.h"
+#include "locate_host.h"
+
 /** START:some missing macros on OpenBSD 3.9 */
 #ifndef NS_CMPRSFLGS
 #define NS_CMPRSFLGS   0xc0
diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 1539992d8..d4a933e76 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -12,57 +12,25 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
 
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <stdio.h>
 #include <regex.h>
+#include <libcitadel.h>
 
 #include "md5.h"
 
-#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "database.h"
-#include "msgbase.h"
-#include "support.h"
-#include "sysdep_decls.h"
+#include "ctdl_module.h"
 #include "citserver.h"
-#include "room_ops.h"
-#include "user_ops.h"
-#include "config.h"
 #include "control.h"
+#include "clientsocket.h"
 #include "genstamp.h"
+#include "room_ops.h"
+#include "user_ops.h"
+
 #include "internet_addressing.h"
 #include "euidindex.h"
+#include "msgbase.h"
 #include "journaling.h"
-#include "citadel_dirs.h"
-#include "clientsocket.h"
-#include "threads.h"
-
-#include "ctdl_module.h"
 
 struct addresses_to_be_filed *atbf = NULL;
 
diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 0d90bc3b3..98c2acc20 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -12,44 +12,16 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <string.h>
-#include <dirent.h>	/* for cmd_rdir to read contents of the directory */
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <limits.h>
-#include <errno.h>
-#include "citadel.h"
 #include <libcitadel.h>
-#include "server.h"
-#include "database.h"
-#include "config.h"
-#include "room_ops.h"
-#include "sysdep_decls.h"
-#include "support.h"
-#include "msgbase.h"
+
 #include "citserver.h"
-#include "control.h"
-#include "citadel_dirs.h"
-#include "threads.h"
 
 #include "ctdl_module.h"
+#include "config.h"
+#include "control.h"
 #include "user_ops.h"
+#include "room_ops.h"
 
 struct floor *floorcache[MAXFLOORS];
 
diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 425564f19..387b8754d 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -13,26 +13,13 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include <syslog.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "sysdep_decls.h"
-#include "msgbase.h"
-#include "config.h"
 
+#include "sysdep_decls.h"
 #include "modules/crypto/serv_crypto.h"	/* Needed until a universal crypto startup hook is implimented for CtdlStartTLS */
 
+#include "serv_extensions.h"
 #include "ctdl_module.h"
 
 
diff --git a/citadel/server_main.c b/citadel/server_main.c
index e15ea5d80..9c5d2fe56 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -11,68 +11,19 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <signal.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
 #include <grp.h>
-#include <pwd.h>
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "sysdep_decls.h"
-#include "threads.h"
+
 #include "citserver.h"
-#include "support.h"
+#include "svn_revision.h"
+#include "modules_init.h"
 #include "config.h"
 #include "control.h"
-#include "database.h"
-#include "user_ops.h"
-#include "housekeeping.h"
-#include "svn_revision.h"
+#include "serv_extensions.h"
 #include "citadel_dirs.h"
-
-#include "context.h"
-
-#include "modules_init.h"
-#include "ecrash.h"
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
+#include "user_ops.h"
 
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
diff --git a/citadel/support.c b/citadel/support.c
index d3ffa929e..16e10e6f8 100644
--- a/citadel/support.c
+++ b/citadel/support.c
@@ -3,16 +3,12 @@
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <libcitadel.h>
+
 #include "citadel.h"
-#include "server.h"
 #include "support.h"
 
 /*
diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index f8ff6df46..42323b163 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -19,66 +19,33 @@
  */
 
 #include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
+
+#include <errno.h>
 #include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
+#include <stdio.h>
 #include <syslog.h>
 #include <sys/syslog.h>
 
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
 
-#include <limits.h>
-#include <sys/resource.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <grp.h>
+
 #define SHOW_ME_VAPPEND_PRINTF
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "sysdep_decls.h"
-#include "citserver.h"
-#include "support.h"
-#include "config.h"
-#include "database.h"
-#include "housekeeping.h"
-#include "modules/crypto/serv_crypto.h"	/* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */
-#include "ecrash.h"
-#include "context.h"
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
 
+#include "citserver.h"
 #include "ctdl_module.h"
-#include "threads.h"
-#include "user_ops.h"
-#include "control.h"
 
+#include "sysdep_decls.h"
+#include "modules/crypto/serv_crypto.h"	/* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */
 
+#include "housekeeping.h"
+#include "context.h"
 /*
  * Signal handler to shut down the server.
  */
diff --git a/citadel/threads.c b/citadel/threads.c
index bea9665c3..2f5f8d682 100644
--- a/citadel/threads.c
+++ b/citadel/threads.c
@@ -12,48 +12,15 @@
  * GNU General Public License for more details.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/types.h>
 #include <errno.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
+#include <stdio.h>
 #include <syslog.h>
-
-#include "sysdep.h"
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifdef HAVE_SYSCALL_H
-# include <syscall.h>
-#else 
-# if HAVE_SYS_SYSCALL_H
-#  include <sys/syscall.h>
-# endif
-#endif
-
 #include <libcitadel.h>
-
-#include "threads.h"
-#include "ctdl_module.h"
 #include "modules_init.h"
-#include "housekeeping.h"
-#include "config.h"
-#include "citserver.h"
-#include "sysdep_decls.h"
+#include "serv_extensions.h"
+#include "ctdl_module.h"
 #include "context.h"
-#include "event_client.h"
+#include "threads.h"
 
 
 int num_workers = 0;				/* Current number of worker threads */
diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 71c0af3d3..0b50d129b 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -13,51 +13,13 @@
  */
 
 #include "sysdep.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <pwd.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <syslog.h>
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#include <string.h>
-#include <limits.h>
 #include <libcitadel.h>
-#include "auth.h"
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "sysdep_decls.h"
-#include "support.h"
-#include "room_ops.h"
+
 #include "control.h"
-#include "msgbase.h"
-#include "config.h"
+#include "support.h"
 #include "citserver.h"
-#include "citadel_dirs.h"
-#include "genstamp.h"
-#include "threads.h"
 #include "citadel_ldap.h"
-#include "context.h"
 #include "ctdl_module.h"
 #include "user_ops.h"
 #include "internet_addressing.h"
-- 
2.30.2