diff --git a/dtls.c b/dtls.c
index d99c55de585299adc2a4c696551d4cf900a36fc4..ed3dca137aed29e5aeb326aa0e2073c1542f7cb2 100644
--- a/dtls.c
+++ b/dtls.c
@@ -26,7 +26,6 @@
 #include <pthread.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "list.h"
 #include "hash.h"
 #include "radsecproxy.h"
 
diff --git a/fticks.c b/fticks.c
index 89081ff3eed2787d7249385186b7fb989c415897..0147f1b904b3f4fa3e941e7eba5159988c52dafb 100644
--- a/fticks.c
+++ b/fticks.c
@@ -10,7 +10,6 @@
 #include <regex.h>
 #include <pthread.h>
 #include <sys/time.h>
-#include "list.h"
 #include "radsecproxy.h"
 #include "debug.h"
 
diff --git a/radsecproxy.c b/radsecproxy.c
index fdf3d8158b94ae2107add2a4f820fa80937641de..93cd4a2556cc57d86d67332942ab2601238c6222 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -69,7 +69,6 @@
 #include <openssl/err.h>
 #include <openssl/md5.h>
 #include "debug.h"
-#include "list.h"
 #include "hash.h"
 #include "util.h"
 #include "hostport.h"
diff --git a/radsecproxy.h b/radsecproxy.h
index 3c80ee61c0d4888a6099a41902fe66e942283c16..03ae54c0d05b0cfa4bf360eddfd214bb019d5bf3 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -7,6 +7,11 @@
  * copyright notice and this permission notice appear in all copies.
  */
 
+#include <sys/time.h>
+#include <stdint.h>
+#include <pthread.h>
+#include <regex.h>
+#include "list.h"
 #include "tlv11.h"
 #include "radmsg.h"
 #include "gconfig.h"
diff --git a/tcp.c b/tcp.c
index 8d559414e591a40f5a87d47140e45e82fbd622c7..797ec9e075a532e60866b676c1f9286e2810d60b 100644
--- a/tcp.c
+++ b/tcp.c
@@ -24,9 +24,8 @@
 #include <arpa/inet.h>
 #include <regex.h>
 #include <pthread.h>
-#include "list.h"
-#include "hostport.h"
 #include "radsecproxy.h"
+#include "hostport.h"
 
 #ifdef RADPROT_TCP
 #include "debug.h"
diff --git a/tls.c b/tls.c
index f79529ff99c3fe5b4316adcf17ebffd375f065f1..ce06a6e7a3c0f332b967a9936bc55f21631413ba 100644
--- a/tls.c
+++ b/tls.c
@@ -26,9 +26,8 @@
 #include <pthread.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "list.h"
-#include "hostport.h"
 #include "radsecproxy.h"
+#include "hostport.h"
 
 #ifdef RADPROT_TLS
 #include "debug.h"
diff --git a/tlscommon.c b/tlscommon.c
index 203bc4bf11151c67c2cd8c7b1fea9ab2f9037d23..eb2af8c1e9eda14c3ca57419c878d07f0973c186 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -33,7 +33,6 @@
 #include <openssl/md5.h>
 #include <openssl/x509v3.h>
 #include "debug.h"
-#include "list.h"
 #include "hash.h"
 #include "util.h"
 #include "hostport.h"
diff --git a/udp.c b/udp.c
index 4740fd0830f785fecdb5c864cc264de885329b89..2724a1d62f22173d4876644ddc0c79d5b95d32a4 100644
--- a/udp.c
+++ b/udp.c
@@ -24,9 +24,8 @@
 #include <arpa/inet.h>
 #include <regex.h>
 #include <pthread.h>
-#include "list.h"
-#include "hostport.h"
 #include "radsecproxy.h"
+#include "hostport.h"
 
 #ifdef RADPROT_UDP
 #include "debug.h"