From c1723f2db5dc4d90314df799ac98f6ad05e36d60 Mon Sep 17 00:00:00 2001
From: Joris Vink <joris@coders.se>
Date: Sat, 6 Jul 2013 20:55:22 +0200
Subject: [PATCH] Clean up header includes, based on a diff from Ewan Higgs via
 github. And while we're messing in it, make sure bsd.c compiles again.

---
 Makefile         |  6 +++---
 includes/kore.h  | 15 +++++++++++++++
 includes/spdy.h  |  3 +++
 src/accesslog.c  | 19 -------------------
 src/buf.c        | 21 ---------------------
 src/config.c     | 19 -------------------
 src/connection.c | 24 ------------------------
 src/domain.c     | 25 -------------------------
 src/http.c       | 19 -------------------
 src/kore.c       | 24 ------------------------
 src/linux.c      | 24 ------------------------
 src/mem.c        | 23 -----------------------
 src/module.c     | 21 ---------------------
 src/net.c        | 21 ---------------------
 src/spdy.c       | 20 --------------------
 src/utils.c      | 23 -----------------------
 src/worker.c     | 24 +-----------------------
 17 files changed, 22 insertions(+), 309 deletions(-)

diff --git a/Makefile b/Makefile
index feccad4..c868078 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,9 @@
 CC=gcc
 BIN=kore
 
-S_SRC+=	src/kore.c src/buf.c src/config.c src/net.c src/spdy.c src/http.c \
-	src/accesslog.c src/domain.c src/module.c src/utils.c \
-	src/worker.c src/connection.c src/mem.c src/zlib_dict.c
+S_SRC+=	src/kore.c src/accesslog.c src/buf.c src/config.c src/connection.c \
+	src/domain.c src/http.c src/mem.c src/module.c src/net.c src/spdy.c \
+	src/utils.c src/worker.c src/zlib_dict.c
 S_OBJS=	$(S_SRC:.c=.o)
 
 CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes
diff --git a/includes/kore.h b/includes/kore.h
index 6d69e11..260fa8e 100644
--- a/includes/kore.h
+++ b/includes/kore.h
@@ -17,6 +17,21 @@
 #ifndef __H_KORE_H
 #define __H_KORE_H
 
+#include <sys/queue.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+
+#include <errno.h>
+#include <regex.h>
+#include <syslog.h>
+#include <zlib.h>
+
+#include "spdy.h"
+
 #define KORE_RESULT_ERROR	0
 #define KORE_RESULT_OK		1
 #define KORE_RESULT_RETRY	2
diff --git a/includes/spdy.h b/includes/spdy.h
index e82bca5..78134e3 100644
--- a/includes/spdy.h
+++ b/includes/spdy.h
@@ -17,6 +17,9 @@
 #ifndef __H_SPDY_H
 #define __H_SPDY_H
 
+#include <sys/types.h>
+#include <sys/queue.h>
+
 struct spdy_ctrl_frame {
 	u_int16_t	version;
 	u_int16_t	type;
diff --git a/src/accesslog.c b/src/accesslog.c
index 9bbddc5..754fb77 100644
--- a/src/accesslog.c
+++ b/src/accesslog.c
@@ -14,29 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/queue.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <errno.h>
-#include <fcntl.h>
 #include <poll.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <regex.h>
-#include <zlib.h>
 
-#include "spdy.h"
 #include "kore.h"
 #include "http.h"
 
diff --git a/src/buf.c b/src/buf.c
index fc763f4..096ccaa 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -14,27 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <regex.h>
-#include <zlib.h>
-
-#include "spdy.h"
 #include "kore.h"
 
 struct kore_buf *
diff --git a/src/config.c b/src/config.c
index d749adf..c11b5ae 100644
--- a/src/config.c
+++ b/src/config.c
@@ -14,29 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
 #include <ctype.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <regex.h>
-#include <zlib.h>
 
-#include "spdy.h"
 #include "kore.h"
 
 static int		configure_bind(char **);
diff --git a/src/connection.c b/src/connection.c
index 95a46d5..8476cec 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -14,34 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/wait.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <pwd.h>
-#include <errno.h>
-#include <grp.h>
 #include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sched.h>
-#include <syslog.h>
-#include <time.h>
-#include <regex.h>
-#include <zlib.h>
-#include <unistd.h>
 
-#include "spdy.h"
 #include "kore.h"
 #include "http.h"
 
diff --git a/src/domain.c b/src/domain.c
index 130e882..cc5b25a 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -14,31 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <ctype.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <regex.h>
-#include <zlib.h>
-
-#include "spdy.h"
 #include "kore.h"
 
 struct kore_domain_h		domains;
diff --git a/src/http.c b/src/http.c
index 5e30de6..a94f997 100644
--- a/src/http.c
+++ b/src/http.c
@@ -15,25 +15,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <regex.h>
-#include <time.h>
-#include <zlib.h>
 
 #include "spdy.h"
 #include "kore.h"
diff --git a/src/kore.c b/src/kore.c
index 2cc8735..2633416 100644
--- a/src/kore.c
+++ b/src/kore.c
@@ -14,35 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/wait.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <pwd.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sched.h>
-#include <syslog.h>
-#include <time.h>
-#include <regex.h>
-#include <zlib.h>
-#include <unistd.h>
 
-#include "spdy.h"
 #include "kore.h"
-#include "http.h"
 
 volatile sig_atomic_t			sig_recv;
 
diff --git a/src/linux.c b/src/linux.c
index 9c3a032..b507508 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -14,36 +14,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
 #include <sys/epoll.h>
 #include <sys/prctl.h>
-#include <sys/wait.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sched.h>
-#include <syslog.h>
-#include <time.h>
-#include <regex.h>
-#include <zlib.h>
-#include <unistd.h>
 
-#include "spdy.h"
 #include "kore.h"
-#include "http.h"
 
 static int			efd = -1;
 static u_int32_t		event_count = 0;
diff --git a/src/mem.c b/src/mem.c
index 942b70d..36fc8f7 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -14,29 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <regex.h>
-#include <zlib.h>
-
-#include "spdy.h"
 #include "kore.h"
 
 #define KORE_MEM_MAGIC		0xd0d0
diff --git a/src/module.c b/src/module.c
index 276f771..10ee3f5 100644
--- a/src/module.c
+++ b/src/module.c
@@ -14,31 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/queue.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <ctype.h>
 #include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <regex.h>
-#include <zlib.h>
 
-#include "spdy.h"
 #include "kore.h"
 
 static void		*mod_handle = NULL;
diff --git a/src/net.c b/src/net.c
index 2387fe3..08666e2 100644
--- a/src/net.c
+++ b/src/net.c
@@ -14,27 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <regex.h>
-#include <zlib.h>
-
-#include "spdy.h"
 #include "kore.h"
 
 void
diff --git a/src/spdy.c b/src/spdy.c
index 0a255d8..90a0ce5 100644
--- a/src/spdy.c
+++ b/src/spdy.c
@@ -14,26 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <regex.h>
-#include <zlib.h>
-
 #include "spdy.h"
 #include "kore.h"
 #include "http.h"
diff --git a/src/utils.c b/src/utils.c
index 8303d69..15d9f43 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -14,29 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <regex.h>
-#include <zlib.h>
-
-#include "spdy.h"
 #include "kore.h"
 
 static struct {
diff --git a/src/worker.c b/src/worker.c
index 68d6d14..57bc57c 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -14,36 +14,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/wait.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
-#include <pwd.h>
-#include <errno.h>
 #include <grp.h>
-#include <fcntl.h>
-#include <regex.h>
+#include <pwd.h>
 #include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <semaphore.h>
-#include <time.h>
-#include <unistd.h>
-#include <zlib.h>
 
-#include "spdy.h"
 #include "kore.h"
 #include "http.h"