Removed duplicate include statements.

diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c
index 9c2469df03b834044bbd0b5245fa2d8415b3cc1d..900fafb55a3fcd8bcd929b1bbc063b2b3708ad92 100644 (file)
--- a/src/alert-fastlog.c
+++ b/src/alert-fastlog.c
@@ -41,7 +41,6 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 
-#include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index 30179d803ed1021475ff83b7fcfb3d2bf65ebff0..5450024680dceaca26e4bee5803e755282d89e08 100644 (file)
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -42,8 +42,6 @@
 #include "alert-unified2-alert.h"
 #include "decode-ipv4.h"
 
-#include "flow.h"
-
 #include "host.h"
 #include "util-profiling.h"
 #include "decode.h"
@@ -61,7 +59,6 @@
 #include "app-layer-htp-xff.h"
 
 #include "output.h"
-#include "alert-unified2-alert.h"
 #include "util-privs.h"
 
 #include "stream.h"

diff --git a/src/app-layer-htp-body.c b/src/app-layer-htp-body.c
index 863b8ae37451536824622b055a7d7d2fa964f8be..d3720f8d39bb87f190df9a9cf908b11fac960085 100644 (file)
--- a/src/app-layer-htp-body.c
+++ b/src/app-layer-htp-body.c
@@ -47,7 +47,6 @@
 
 #include "util-spm.h"
 #include "util-debug.h"
-#include "app-layer-htp.h"
 #include "app-layer-htp-file.h"
 #include "util-time.h"
 

diff --git a/src/app-layer-htp-file.c b/src/app-layer-htp-file.c
index effc4fe08afa23b685fa30abf4da2549b832c3b6..9e68f097085cbf360611af248e76a6229f9be4a2 100644 (file)
--- a/src/app-layer-htp-file.c
+++ b/src/app-layer-htp-file.c
@@ -46,7 +46,6 @@
 
 #include "util-spm.h"
 #include "util-debug.h"
-#include "app-layer-htp.h"
 #include "util-time.h"
 
 #include "util-unittest.h"

diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c
index 3402edfd27e4541dce846e97473caf5b9e956160..701b97dcf07dbe4a496ad216ba341725fc8833d9 100644 (file)
--- a/src/app-layer-smtp.c
+++ b/src/app-layer-smtp.c
@@ -42,7 +42,6 @@
 #include "util-debug.h"
 #include "util-byte.h"
 #include "util-unittest.h"
-#include "util-byte.h"
 #include "util-unittest-helper.h"
 #include "util-memcmp.h"
 #include "flow-util.h"

diff --git a/src/app-layer.c b/src/app-layer.c
index 5d29f127474b510eecc072bf9060f5fc4353a8b6..9c058800ae59d89d31f2a3e7c2accf1dca3fd59f 100644 (file)
--- a/src/app-layer.c
+++ b/src/app-layer.c
@@ -654,11 +654,7 @@ void AppLayerRegisterGlobalCounters(void)
 /***** Unittests *****/
 
 #ifdef UNITTESTS
-
 #include "stream-tcp.h"
-#include "stream-tcp-private.h"
-#include "stream-tcp-reassemble.h"
-#include "stream-tcp-inline.h"
 #include "stream-tcp-util.h"
 #include "stream.h"
 #include "util-unittest.h"

diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c
index 0c9e0d949da6ac11db4a51d652ce6a978e8a2b43..173313aa1491289a445d434227e2eabcaf977766 100644 (file)
--- a/src/detect-app-layer-event.c
+++ b/src/detect-app-layer-event.c
@@ -316,11 +316,9 @@ int DetectAppLayerEventPrepare(Signature *s)
 /**********************************Unittests***********************************/
 
 #ifdef UNITTESTS /* UNITTESTS */
-
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
 #include "stream-tcp.h"
-#include "app-layer.h"
 
 #define APP_LAYER_EVENT_TEST_MAP_EVENT1 0
 #define APP_LAYER_EVENT_TEST_MAP_EVENT2 1

diff --git a/src/detect-base64-decode.c b/src/detect-base64-decode.c
index 781f3d3ef0ed8a3f1ef2e86151e562c1693bb3fe..25010e43644aaceff2364e545731a39b49279cbc 100644 (file)
--- a/src/detect-base64-decode.c
+++ b/src/detect-base64-decode.c
@@ -331,10 +331,7 @@ static void DetectBase64DecodeFree(void *ptr)
 
 
 #ifdef UNITTESTS
-
-#include "detect.h"
 #include "detect-engine.h"
-#include "detect-parse.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "app-layer-parser.h"

diff --git a/src/detect-depth.c b/src/detect-depth.c
index 9e323f6bf829d4e051381f4cbd37a76225290b1a..90661e61aa6dd86b33d9ab3e7902d36ba23aecfa 100644 (file)
--- a/src/detect-depth.c
+++ b/src/detect-depth.c
@@ -33,7 +33,6 @@
 #include "detect-content.h"
 #include "detect-uricontent.h"
 #include "detect-byte-extract.h"
-#include "detect-parse.h"
 
 #include "flow-var.h"
 #include "app-layer.h"

diff --git a/src/detect-detection-filter.c b/src/detect-detection-filter.c
index 6ffca0e315ef97bc863d801562d2804a8178f576..32e39393f473f325fe35f9a3920d86db92c57cc6 100644 (file)
--- a/src/detect-detection-filter.c
+++ b/src/detect-detection-filter.c
@@ -264,8 +264,6 @@ void DetectDetectionFilterFree(void *df_ptr)
  * ONLY TESTS BELOW THIS COMMENT
  */
 #ifdef UNITTESTS
-
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "detect-engine-threshold.h"

diff --git a/src/detect-distance.c b/src/detect-distance.c
index fe5d36599a375d12450307f5eb43cb229f1dc79a..6f1c492052d00be838b021343be0d10e701d31b3 100644 (file)
--- a/src/detect-distance.c
+++ b/src/detect-distance.c
@@ -32,7 +32,6 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "app-layer.h"
-#include "detect-parse.h"
 
 #include "detect-content.h"
 #include "detect-uricontent.h"

diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index 3bf708f3babe7ecf30ccc551e380d861263f249c..33ffa31a96b9f51e92d76c58558e01b43294650b 100644 (file)
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -55,7 +55,6 @@
 #include "app-layer-dns-common.h"
 #include "detect-dns-query.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 static int DetectDnsQuerySetup (DetectEngineCtx *, Signature *, char *);

diff --git a/src/detect-dsize.c b/src/detect-dsize.c
index a331f6f4d213c1719049dc7430cc0bfaa408e693..00da7727e6975583093253afd255270f15abc767 100644 (file)
--- a/src/detect-dsize.c
+++ b/src/detect-dsize.c
@@ -301,8 +301,8 @@ void DetectDsizeFree(void *de_ptr)
  */
 
 #ifdef UNITTESTS
-#include "detect.h"
 #include "detect-engine.h"
+
 /**
  * \test this is a test for a valid dsize value 1
  *

diff --git a/src/detect-engine-address-ipv4.c b/src/detect-engine-address-ipv4.c
index 8950f5800706a32344f9ef242bbbddb67eb17cd0..7de2af6a899a2c88f97548a6ff4c20d987b11ea5 100644 (file)
--- a/src/detect-engine-address-ipv4.c
+++ b/src/detect-engine-address-ipv4.c
@@ -38,7 +38,6 @@
 
 #include "util-error.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 
 /**
  * \brief Compares 2 addresses(address ranges) and returns the relationship

diff --git a/src/detect-engine-filedata-smtp.c b/src/detect-engine-filedata-smtp.c
index c55450beedc40c2805fd441cbe58d22b48df7e1e..64c3ba661ba5d3a2be328474810836aa67d1a6ce 100644 (file)
--- a/src/detect-engine-filedata-smtp.c
+++ b/src/detect-engine-filedata-smtp.c
@@ -47,7 +47,6 @@
 #include "app-layer.h"
 #include "app-layer-smtp.h"
 #include "app-layer-protos.h"
-#include "app-layer-parser.h"
 
 #include "util-validate.h"
 

diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c
index 39393e2bcbd959876833cf6d7f407b746a096a8b..75232c50345fade81352fb91bf7d04abf05b79e9 100644 (file)
--- a/src/detect-engine-mpm.c
+++ b/src/detect-engine-mpm.c
@@ -54,7 +54,6 @@
 #include "util-enum.h"
 #include "util-debug.h"
 #include "util-print.h"
-#include "util-memcmp.h"
 #include "util-validate.h"
 
 const char *builtin_mpms[] = {

diff --git a/src/detect-engine-state.c b/src/detect-engine-state.c
index b465917a18af956f3aee59e7fb4400cd3cab9288..30c40737e482e6c723c6d56cca5ea7db38123ede 100644 (file)
--- a/src/detect-engine-state.c
+++ b/src/detect-engine-state.c
@@ -1170,7 +1170,6 @@ void DetectEngineStateResetTxs(Flow *f)
 /*********Unittests*********/
 
 #ifdef UNITTESTS
-#include "flow-util.h"
 
 static int DeStateTest01(void)
 {

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 37dc6245d1ed4708f316d404d7393c2b5eab62bb..c19afc2f331828541b22373260ceed5388e36771 100644 (file)
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -45,7 +45,6 @@
 #include "detect-engine-tag.h"
 
 #include "detect-engine-uri.h"
-#include "detect-engine-hcbd.h"
 #include "detect-engine-hsbd.h"
 #include "detect-engine-hhd.h"
 #include "detect-engine-hrhd.h"

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index c854005a1675495f199c3798ec3f3b09f62ff398..0ffabe741d8d3a5aca251f02b3d9949c723daf03 100644 (file)
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@@ -53,7 +53,6 @@
 #include "detect-filemagic.h"
 
 #include "conf.h"
-#include "util-magic.h"
 
 static int DetectFilemagicMatch (ThreadVars *, DetectEngineThreadCtx *, Flow *,
         uint8_t, File *, Signature *, SigMatch *);

diff --git a/src/detect-filesize.c b/src/detect-filesize.c
index 709097f542115ccd51eb9df465e7c4bb6d71c41b..b9a1177af4315d70b5be61e02b4625fbebb4ec4a 100644 (file)
--- a/src/detect-filesize.c
+++ b/src/detect-filesize.c
@@ -319,11 +319,9 @@ static void DetectFilesizeFree(void *ptr)
 }
 
 #ifdef UNITTESTS
-
 #include "stream.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "app-layer-parser.h"

diff --git a/src/detect-flowbits.c b/src/detect-flowbits.c
index 70056f02dd97ba353741cd652c469d20a522ad26..238eb91b4ccfd4dae03e1457d5836b7c02c7c70f 100644 (file)
--- a/src/detect-flowbits.c
+++ b/src/detect-flowbits.c
@@ -41,7 +41,6 @@
 #include "detect-engine-mpm.h"
 #include "detect-engine-state.h"
 
-#include "flow-bit.h"
 #include "util-var-name.h"
 #include "util-unittest.h"
 #include "util-debug.h"

diff --git a/src/detect-fragoffset.c b/src/detect-fragoffset.c
index 6e6049fb44c0166fa15f4d7262e593178aed9210..28d66e9bf848ccf5581a6343928d9a8dea5d869a 100644 (file)
--- a/src/detect-fragoffset.c
+++ b/src/detect-fragoffset.c
@@ -238,8 +238,6 @@ void DetectFragOffsetFree (void *ptr)
 }
 
 #ifdef UNITTESTS
-
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 

diff --git a/src/detect-icmp-id.c b/src/detect-icmp-id.c
index 675e03e4103864d417aec9f6ec4d01a663e1d19e..34be0d7bb421cd8075bb1abe8aa3163e224e5f91 100644 (file)
--- a/src/detect-icmp-id.c
+++ b/src/detect-icmp-id.c
@@ -248,8 +248,6 @@ void DetectIcmpIdFree (void *ptr)
 }
 
 #ifdef UNITTESTS
-
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 

diff --git a/src/detect-icmp-seq.c b/src/detect-icmp-seq.c
index 1fbefb7c29cdbfddc9418275f86b6a208f63e411..4026b375612886c86e690ef1b1fffc84dff67696 100644 (file)
--- a/src/detect-icmp-seq.c
+++ b/src/detect-icmp-seq.c
@@ -249,8 +249,6 @@ void DetectIcmpSeqFree (void *ptr)
 }
 
 #ifdef UNITTESTS
-
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 

diff --git a/src/detect-icode.c b/src/detect-icode.c
index fc5c572d1a6d3403708100904aa768abc94f4faa..cc91bce1fabcd653c848de2fb90a47c172758ab9 100644 (file)
--- a/src/detect-icode.c
+++ b/src/detect-icode.c
@@ -264,8 +264,6 @@ void DetectICodeFree(void *ptr)
 }
 
 #ifdef UNITTESTS
-
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 

diff --git a/src/detect-ipproto.c b/src/detect-ipproto.c
index e0c2635a0eea5feceaf2ccb08db288a622d00a1c..dec6ad3ab5f4f8dc2422d79196e63729dbc85ee2 100644 (file)
--- a/src/detect-ipproto.c
+++ b/src/detect-ipproto.c
@@ -560,9 +560,6 @@ static void DetectIPProtoFree(void *ptr)
 /* UNITTESTS */
 #ifdef UNITTESTS
 
-#include "detect-engine.h"
-#include "detect-parse.h"
-
 /**
  * \test DetectIPProtoTestParse01 is a test for an invalid proto number
  */

diff --git a/src/detect-itype.c b/src/detect-itype.c
index 45e3a6ddf165a39f051bb3b2702dd2003c285e1a..00ad80288612813f9e60887f260657df44f5242a 100644 (file)
--- a/src/detect-itype.c
+++ b/src/detect-itype.c
@@ -265,7 +265,6 @@ void DetectITypeFree(void *ptr)
 
 #ifdef UNITTESTS
 
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 

diff --git a/src/detect-l3proto.c b/src/detect-l3proto.c
index b04057a92fe4d07c237b273a6a08154c2c2ec713..fb94a9a0f65f975f28f051abdc7e6837e041dd56 100644 (file)
--- a/src/detect-l3proto.c
+++ b/src/detect-l3proto.c
@@ -122,10 +122,6 @@ error:
 
 #ifdef UNITTESTS
 
-#include "detect-parse.h"
-#include "detect-engine.h"
-#include "detect-engine-mpm.h"
-
 /**
  * \test DetectL3protoTestSig01 is a test for checking the working of ttl keyword
  *       by setting up the signature and later testing its working by matching

diff --git a/src/detect-parse.c b/src/detect-parse.c
index e28154ad7fbce4f0edefc6a580db4448e95664b7..d86826cdf1ae4194ad0fda53e57a95e33b98b866 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -68,7 +68,6 @@
 #include "detect-parse.h"
 #include "detect-engine-iponly.h"
 #include "app-layer-detect-proto.h"
-#include "app-layer.h"
 
 extern int sc_set_caps;
 

diff --git a/src/detect-pcre.c b/src/detect-pcre.c
index 0f19154955601401b2fe83fba331dfb0904af85b..b4303744f4a7f327f7a1af669f356555effc812c 100644 (file)
--- a/src/detect-pcre.c
+++ b/src/detect-pcre.c
@@ -57,10 +57,6 @@
 #include "stream-tcp-reassemble.h"
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"
-#include "app-layer-htp.h"
-
-#include "stream.h"
-
 
 #define PARSE_CAPTURE_REGEX "\\(\\?P\\<([A-z]+)\\_([A-z0-9_]+)\\>"
 #define PARSE_REGEX         "(?<!\\\\)/(.*(?<!(?<!\\\\)\\\\))/([^\"]*)"

diff --git a/src/detect-threshold.c b/src/detect-threshold.c
index 28edd6e5c21f05a51f6d196e7032a47032ad2912..2cc211c209c26503082be94a00293d0d152b6fc8 100644 (file)
--- a/src/detect-threshold.c
+++ b/src/detect-threshold.c
@@ -48,7 +48,6 @@
 
 #include "detect-threshold.h"
 #include "detect-engine-threshold.h"
-#include "detect-parse.h"
 #include "detect-engine-address.h"
 
 #include "util-unittest.h"
@@ -275,11 +274,8 @@ static void DetectThresholdFree(void *de_ptr)
  * ONLY TESTS BELOW THIS COMMENT
  */
 #ifdef UNITTESTS
-
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
-#include "detect-engine-threshold.h"
 #include "util-time.h"
 #include "util-hashlist.h"
 

diff --git a/src/detect-ttl.c b/src/detect-ttl.c
index dbd8e21cc958223a0988ad4fb02c589bac7ded3a..051131f950164daeb170fb4057b2e9af24cc7f88 100644 (file)
--- a/src/detect-ttl.c
+++ b/src/detect-ttl.c
@@ -294,8 +294,6 @@ void DetectTtlFree(void *ptr)
 }
 
 #ifdef UNITTESTS
-
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 

diff --git a/src/detect-urilen.c b/src/detect-urilen.c
index 44de1f51432691dfb000b2c180d937bd680f2c20..8d69e34f154c9bca973b8e06eb090a87155442df 100644 (file)
--- a/src/detect-urilen.c
+++ b/src/detect-urilen.c
@@ -293,7 +293,6 @@ void DetectUrilenFree(void *ptr)
 #include "stream.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
-#include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"
 #include "app-layer-parser.h"

diff --git a/src/detect-within.c b/src/detect-within.c
index 14cd60af2fa7cf5b3e16f1cdacc1fff4a6c1cae4..3057858e74f0b87b0c2d8c0783fdadeecd2a551e 100644 (file)
--- a/src/detect-within.c
+++ b/src/detect-within.c
@@ -36,7 +36,6 @@
 #include "detect-bytejump.h"
 #include "detect-byte-extract.h"
 #include "app-layer.h"
-#include "detect-parse.h"
 
 #include "flow-var.h"
 

diff --git a/src/detect.c b/src/detect.c
index 8e8b2597a7f45f8e1539bc23bdea8b0ea865ca14..385a5414601e19fc6014f3aa51ad2d6e9ce298ee 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -156,7 +156,6 @@
 #include "detect-lua.h"
 #include "detect-iprep.h"
 #include "detect-geoip.h"
-#include "detect-dns-query.h"
 #include "detect-app-layer-protocol.h"
 #include "detect-template.h"
 #include "detect-template-buffer.h"
@@ -4439,7 +4438,6 @@ void SigTableRegisterTests(void)
 #ifdef UNITTESTS
 #include "flow-util.h"
 #include "stream-tcp-reassemble.h"
-#include "util-var-name.h"
 
 static const char *dummy_conf_string =
     "%YAML 1.1\n"

diff --git a/src/flow.c b/src/flow.c
index 4cedf2685db9ad042e05f5081c6315046ad0f6eb..2ce66d6f5782095bf40c76e1061ae2c7369396a6 100644 (file)
--- a/src/flow.c
+++ b/src/flow.c
@@ -901,7 +901,6 @@ uint8_t FlowGetDisruptionFlags(const Flow *f, uint8_t flags)
 /************************************Unittests*******************************/
 
 #ifdef UNITTESTS
-#include "stream-tcp-private.h"
 #include "threads.h"
 
 /**

diff --git a/src/log-droplog.c b/src/log-droplog.c
index bc092af0c1b8ed6278047536f5656123a2aedd19..724d65840ce13aa9f733b964c84fce1e6de0a2e6 100644 (file)
--- a/src/log-droplog.c
+++ b/src/log-droplog.c
@@ -37,7 +37,6 @@
 #include "util-debug.h"
 
 #include "decode-ipv4.h"
-#include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index f6133de8e96d7350d350c74ad7ade6fc916ed8f7..7476fbd2bd6c29174d7ec4dc967f94654660a102 100644 (file)
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -39,7 +39,6 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 
-#include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index f795824b1dfe88994d590241adf25d19acf58893..5c866809b8b42ca43f6bec9aa8a28fae6b244396 100644 (file)
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -36,7 +36,6 @@
 #include "util-debug.h"
 
 #include "decode-ipv4.h"
-#include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

diff --git a/src/output-json.c b/src/output-json.c
index b3e6f7b033b31ee3a2e28b80bc924c36afd3addf..3d14d70a070a20397c1e73bda32c95a26369dd0a 100644 (file)
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -38,7 +38,6 @@
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
 
-#include "detect.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-engine-mpm.h"

diff --git a/src/reputation.c b/src/reputation.c
index 31fe821de3eb4b45ab94d4eb792068c6b2c298cf..b0aee7cbf54197b749c8f30463400999962e266d 100644 (file)
--- a/src/reputation.c
+++ b/src/reputation.c
@@ -691,13 +691,11 @@ void SRepDestroy(DetectEngineCtx *de_ctx) {
 }
 
 #ifdef UNITTESTS
-
 #include "conf-yaml-loader.h"
 #include "detect-engine.h"
 #include "stream-tcp-private.h"
 #include "stream-tcp-reassemble.h"
 #include "stream-tcp.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 static int SRepTest01(void)

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index 962e7c1dbb1a85695ef048b92e9ccea4454fb9bd..14df0c49e604b0d2285bb92c50c375344ed31d68 100644 (file)
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -109,7 +109,6 @@
 
 #include "util-mpm-ac.h"
 #include "util-mpm-hs.h"
-#include "detect-engine-mpm.h"
 
 #include "util-decode-asn1.h"
 

diff --git a/src/runmode-unix-socket.c b/src/runmode-unix-socket.c
index 3ccf89b98d39813d0c62c777decd3ae2d6ea9dd5..7b45928a13778f2a172859e71259317f8dfec04e 100644 (file)
--- a/src/runmode-unix-socket.c
+++ b/src/runmode-unix-socket.c
@@ -33,7 +33,6 @@
 #include "flow-manager.h"
 #include "flow-timeout.h"
 #include "stream-tcp.h"
-#include "output.h"
 #include "host.h"
 #include "defrag.h"
 #include "ippair.h"
@@ -43,8 +42,6 @@
 
 #include "conf-yaml-loader.h"
 
-#include "detect-engine.h"
-
 static const char *default_mode = NULL;
 
 int unix_socket_mode_is_running = 0;

diff --git a/src/source-mpipe.c b/src/source-mpipe.c
index fa9d14ce387bcf84399bbca3e1529207172c182a..9f9c9a3b0a1d85587ed3b61593f6145303560142 100644 (file)
--- a/src/source-mpipe.c
+++ b/src/source-mpipe.c
@@ -60,7 +60,6 @@
 #include <tmc/sync.h>
 #include <tmc/task.h>
 #include <tmc/perf.h>
-#include <arch/sim.h>
 
 /* Align "p" mod "align", assuming "p" is a "void*". */
 #define ALIGN(p, align) do { (p) += -(long)(p) & ((align) - 1); } while(0)

diff --git a/src/util-action.c b/src/util-action.c
index d0bc235f9739b0f8c137192d9c813b6c533ef37e..a47e79dfcad636acae4833ef1da6ca76f52a9096 100644 (file)
--- a/src/util-action.c
+++ b/src/util-action.c
@@ -163,7 +163,6 @@ int ActionInitConfig()
 }
 
 #ifdef UNITTESTS
-#include "util-unittest.h"
 
 /**
  * \test Check that we invalidate duplicated actions