From: maxtors <moe.andreas@gmail.com>
Date: Sun, 24 Apr 2016 14:19:39 +0000 (+0200)
Subject: Removed duplicate include statements.
X-Git-Tag: suricata-3.1RC1~237
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d3fd828490a3f116947bb8f35ff745d1ebe8578;p=thirdparty%2Fsuricata.git

Removed duplicate include statements.
---

diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c
index 9c2469df03..900fafb55a 100644
--- 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 30179d803e..5450024680 100644
--- 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 863b8ae374..d3720f8d39 100644
--- 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 effc4fe08a..9e68f09708 100644
--- 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 3402edfd27..701b97dcf0 100644
--- 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 5d29f12747..9c058800ae 100644
--- 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 0c9e0d949d..173313aa14 100644
--- 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 781f3d3ef0..25010e4364 100644
--- 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 9e323f6bf8..90661e61aa 100644
--- 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 6ffca0e315..32e39393f4 100644
--- 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 fe5d36599a..6f1c492052 100644
--- 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 3bf708f3ba..33ffa31a96 100644
--- 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 a331f6f4d2..00da7727e6 100644
--- 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 8950f58007..7de2af6a89 100644
--- 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 c55450beed..64c3ba661b 100644
--- 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 39393e2bcb..75232c5034 100644
--- 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 b465917a18..30c40737e4 100644
--- 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 37dc6245d1..c19afc2f33 100644
--- 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 c854005a16..0ffabe741d 100644
--- 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 709097f542..b9a1177af4 100644
--- 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 70056f02dd..238eb91b4c 100644
--- 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 6e6049fb44..28d66e9bf8 100644
--- 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 675e03e410..34be0d7bb4 100644
--- 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 1fbefb7c29..4026b37561 100644
--- 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 fc5c572d1a..cc91bce1fa 100644
--- 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 e0c2635a0e..dec6ad3ab5 100644
--- 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 45e3a6ddf1..00ad802886 100644
--- 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 b04057a92f..fb94a9a0f6 100644
--- 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 e28154ad7f..d86826cdf1 100644
--- 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 0f19154955..b4303744f4 100644
--- 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 28edd6e5c2..2cc211c209 100644
--- 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 dbd8e21cc9..051131f950 100644
--- 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 44de1f5143..8d69e34f15 100644
--- 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 14cd60af2f..3057858e74 100644
--- 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 8e8b2597a7..385a541460 100644
--- 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 4cedf2685d..2ce66d6f57 100644
--- 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 bc092af0c1..724d65840c 100644
--- 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 f6133de8e9..7476fbd2bd 100644
--- 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 f795824b1d..5c866809b8 100644
--- 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 b3e6f7b033..3d14d70a07 100644
--- 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 31fe821de3..b0aee7cbf5 100644
--- 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 962e7c1dbb..14df0c49e6 100644
--- 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 3ccf89b98d..7b45928a13 100644
--- 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 fa9d14ce38..9f9c9a3b0a 100644
--- 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 d0bc235f97..a47e79dfca 100644
--- 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