diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index bddcca0fa6..68b4b1abbc 100644
--- a/src/alert-debuglog.c
+++ b/src/alert-debuglog.c
@@ -22,7 +22,6 @@
  */
 
 #include "suricata-common.h"
-#include "suricata.h"
 
 #include "action-globals.h"
 #include "detect.h"
@@ -30,16 +29,14 @@
 #include "conf.h"
 #include "stream.h"
 #include "app-layer-protos.h"
+#include "decode-tcp.h"
+#include "detect-engine-register.h"
 
-#include "threads.h"
 #include "threadvars.h"
-#include "tm-threads.h"
+#include "tm-modules.h"
 
 #include "util-print.h"
-
-#include "pkt-var.h"
-
-#include "util-unittest.h"
+#include "util-var.h"
 
 #include "util-debug.h"
 #include "util-validate.h"
@@ -47,7 +44,6 @@
 
 #include "output.h"
 #include "alert-debuglog.h"
-#include "util-privs.h"
 #include "flow-var.h"
 #include "flow-bit.h"
 #include "util-var-name.h"
diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c
index 489003ff51..73296643e8 100644
--- a/src/alert-fastlog.c
+++ b/src/alert-fastlog.c
@@ -29,30 +29,19 @@
 #include "flow.h"
 #include "conf.h"
 
-#include "threads.h"
-#include "tm-threads.h"
+#include "tm-modules.h"
 #include "threadvars.h"
 #include "util-debug.h"
 
-#include "util-unittest.h"
-#include "util-unittest-helper.h"
-
-#include "detect-parse.h"
-#include "detect-engine.h"
-#include "detect-engine-build.h"
-#include "detect-engine-mpm.h"
-#include "detect-reference.h"
-#include "util-classification-config.h"
-
 #include "output.h"
 #include "alert-fastlog.h"
 
-#include "util-privs.h"
 #include "util-print.h"
 #include "util-proto-name.h"
 #include "util-optimize.h"
 #include "util-logopenfile.h"
 #include "util-time.h"
+#include "suricata.h"
 
 #include "action-globals.h"
 
@@ -272,6 +261,12 @@ static void AlertFastLogDeInitCtx(OutputCtx *output_ctx)
 
 #ifdef UNITTESTS
 
+#include "util-unittest-helper.h"
+#include "detect-engine.h"
+#include "detect-engine-build.h"
+#include "detect-parse.h"
+#include "util-classification-config.h"
+
 static int AlertFastLogTest01(void)
 {
     uint8_t *buf = (uint8_t *) "GET /one/ HTTP/1.1\r\n"
diff --git a/src/alert-fastlog.h b/src/alert-fastlog.h
index c997395826..e22174b877 100644
--- a/src/alert-fastlog.h
+++ b/src/alert-fastlog.h
@@ -24,6 +24,9 @@
 #ifndef SURICATA_ALERT_FASTLOG_H
 #define SURICATA_ALERT_FASTLOG_H
 
+#include "output.h"
+#include "conf.h"
+
 void AlertFastLogRegister(void);
 OutputInitResult AlertFastLogInitCtx(SCConfNode *);
 
diff --git a/src/alert-syslog.c b/src/alert-syslog.c
index 1c64b5e98c..b6732d0058 100644
--- a/src/alert-syslog.c
+++ b/src/alert-syslog.c
@@ -25,29 +25,28 @@
  */
 
 #include "suricata-common.h"
+#include "suricata.h"
 #include "flow.h"
 #include "conf.h"
 
 #include "threads.h"
-#include "tm-threads.h"
+#include "tm-modules.h"
 #include "threadvars.h"
 
 #include "detect.h"
-#include "detect-parse.h"
-#include "detect-engine.h"
-#include "detect-engine-mpm.h"
-#include "detect-reference.h"
+#include "decode-ipv4.h"
+#include "decode-ipv6.h"
 
 #include "output.h"
 #include "alert-syslog.h"
 
-#include "util-classification-config.h"
 #include "util-debug.h"
 #include "util-print.h"
 #include "util-proto-name.h"
 #include "util-syslog.h"
 #include "util-optimize.h"
 #include "util-logopenfile.h"
+#include "util-enum.h"
 #include "action-globals.h"
 
 #ifndef OS_WIN32