src: do not include "util-unittest.h" directly

It is included in suricata-common.h

Ticket: 945

src/app-layer-detect-proto.c

@@ -2184,7 +2184,6 @@ void AppLayerRegisterExpectationProto(uint8_t proto, AppProto alproto)
 #include "detect-engine-build.h"
 #include "detect-parse.h"
 #include "detect-engine.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 static AppLayerProtoDetectCtx alpd_ctx_ut;

src/app-layer-dnp3.c

@@ -1695,7 +1695,6 @@ void RegisterDNP3Parsers(void)
 
 #include "flow-util.h"
 #include "stream-tcp.h"
-#include "util-unittest.h"
 #include "threads.h"
 
 /**

src/app-layer-htp-xff.c

@@ -30,7 +30,6 @@
 #include "app-layer-htp-xff.h"
 
 #include "util-misc.h"
-#include "util-unittest.h"
 #include "app-layer-protos.h"
 #include "htp/htp_rs.h"
 #include "util-debug.h"

src/app-layer-htp.c

@@ -2699,7 +2699,6 @@ void RegisterHTPParsers(void)
 #include "flow-util.h"
 #include "stream-tcp.h"
 #include "util-print.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 static HTPCfgRec cfglist_backup;

src/app-layer-http2.c

@@ -25,7 +25,6 @@
 
 #include "suricata-common.h"
 
-#include "util-unittest.h"
 
 #include "app-layer-detect-proto.h"
 

src/app-layer-ike.c

@@ -34,7 +34,6 @@
 #include "app-layer-parser.h"
 #include "app-layer-protos.h"
 #include "flow.h"
-#include "util-unittest.h"
 #include "stream-tcp.h"
 #include "util-unittest-helper.h"
 #include "flow-util.h"

src/app-layer-modbus.c

@@ -57,7 +57,6 @@
 
 #include "flow-util.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #include "stream-tcp.h"

src/app-layer-nfs-tcp.c

@@ -28,7 +28,6 @@
 
 #include "suricata-common.h"
 
-#include "util-unittest.h"
 
 #include "app-layer-detect-proto.h"
 

src/app-layer-nfs-udp.c

@@ -25,7 +25,6 @@
 
 #include "suricata-common.h"
 
-#include "util-unittest.h"
 
 
 #include "app-layer-nfs-udp.h"

src/app-layer-smb.c

@@ -31,7 +31,6 @@
 
 #ifdef UNITTESTS
 #include "stream-tcp.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "app-layer-protos.h"
 #include "app-layer-parser.h"

src/app-layer-smtp.c

@@ -34,7 +34,6 @@
 #include "util-mpm.h"
 #include "util-debug.h"
 #include "util-byte.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-memcmp.h"
 

src/app-layer-ssh.c

@@ -37,7 +37,6 @@
 
 #include "conf.h"
 
-#include "util-unittest.h"
 #include "util-debug.h"
 
 #include "util-memcmp.h"

src/app-layer.c

@@ -1399,7 +1399,6 @@ void AppLayerDeSetupCounters(void)
 /***** Unittests *****/
 
 #ifdef UNITTESTS
-#include "util-unittest.h"
 
 #define TEST_START                                                                                 \
     Packet *p = PacketGetFromAlloc();                                                              \

src/conf-yaml-loader.c

@@ -29,7 +29,6 @@
 #include <yaml.h>
 #include "util-path.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 
 #define YAML_VERSION_MAJOR 1
 #define YAML_VERSION_MINOR 1

src/conf.c

@@ -38,7 +38,6 @@
 
 #include "suricata-common.h"
 #include "conf.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "util-path.h"
 #include "util-conf.h"

src/decode-chdlc.c

@@ -36,7 +36,6 @@
 #include "decode-events.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 int DecodeCHDLC(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,

src/decode-erspan.c

@@ -37,7 +37,6 @@
 #include "decode-erspan.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "conf.h"
 

src/decode-esp.c

@@ -85,7 +85,6 @@ int DecodeESP(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t *p
 
 #ifdef UNITTESTS
 
-#include "util-unittest.h"
 
 /** \test Successful decoding */
 static int DecodeESPTest01(void)

src/decode-etag.c

@@ -38,7 +38,6 @@
 #include "decode-events.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 int DecodeETag(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t *pkt, uint32_t len)

src/decode-ethernet.c

@@ -36,7 +36,6 @@
 #include "decode-events.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 int DecodeEthernet(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,

src/decode-geneve.c

@@ -37,7 +37,6 @@
 #include "flow.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 #include "pkt-var.h"

src/decode-gre.c

@@ -37,7 +37,6 @@
 #include "decode-gre.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 /**

src/decode-icmpv4.c

@@ -39,7 +39,6 @@
 
 #include "flow.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-debug.h"
 #include "util-print.h"

src/decode-mpls.c

@@ -27,7 +27,6 @@
 #include "decode.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 
 #define MPLS_HEADER_LEN         4
 #define MPLS_PW_LEN             4

src/decode-nsh.c

@@ -36,7 +36,6 @@
 #include "decode-nsh.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 /**

src/decode-null.c

@@ -36,7 +36,6 @@
 #include "decode-events.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 #define HDR_SIZE 4

src/decode-ppp.c

@@ -37,7 +37,6 @@
 #include "flow.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 static int DecodePPPCompressedProto(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,

src/decode-pppoe.c

@@ -40,7 +40,6 @@
 #include "flow.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 /**

src/decode-raw.c

@@ -36,7 +36,6 @@
 #include "decode-events.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 int DecodeRaw(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,

src/decode-sctp.c

@@ -35,7 +35,6 @@
 #include "decode-events.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "flow.h"
 

src/decode-tcp.c

@@ -34,7 +34,6 @@
 #include "decode-tcp.h"
 #include "decode.h"
 #include "decode-events.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "flow.h"
 

src/decode-udp.c

@@ -37,7 +37,6 @@
 #include "decode-teredo.h"
 #include "decode-vxlan.h"
 #include "decode-events.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "flow.h"
 #include "app-layer.h"

src/decode-vlan.c

@@ -36,7 +36,6 @@
 #include "decode-events.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 /**

src/decode-vntag.c

@@ -35,7 +35,6 @@
 #include "decode-events.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 /**

src/decode-vxlan.c

@@ -37,7 +37,6 @@
 #include "flow.h"
 
 #include "util-validate.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 #define VXLAN_HEADER_LEN sizeof(VXLANHeader)

src/defrag.c

@@ -58,7 +58,6 @@
 #include "decode.h"
 
 #ifdef UNITTESTS
-#include "util-unittest.h"
 #endif
 
 #define DEFAULT_DEFRAG_HASH_SIZE 0xffff

src/detect-app-layer-event.c

@@ -46,7 +46,6 @@
 #include "util-debug.h"
 #include "util-enum.h"
 #include "util-profiling.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "stream-tcp-util.h"
 

src/detect-app-layer-protocol.c

@@ -32,7 +32,6 @@
 #include "app-layer-parser.h"
 #include "app-layer-detect-proto.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #ifdef UNITTESTS

src/detect-app-layer-state.c

@@ -45,7 +45,6 @@
 #include "util-debug.h"
 #include "util-enum.h"
 #include "util-profiling.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "stream-tcp-util.h"
 

src/detect-asn1.c

@@ -31,7 +31,6 @@
 #include "flow.h"
 #include "detect-asn1.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-byte.h"
 #include "util-debug.h"

src/detect-base64-data.c

@@ -23,7 +23,6 @@
 #include "detect-base64-data.h"
 #include "detect-engine-build.h"
 
-#include "util-unittest.h"
 
 static int DetectBase64DataSetup(DetectEngineCtx *, Signature *, const char *);
 #ifdef UNITTESTS

src/detect-base64-decode.c

@@ -251,7 +251,6 @@ static void DetectBase64DecodeFree(DetectEngineCtx *de_ctx, void *ptr)
 
 #ifdef UNITTESTS
 #include "detect-engine.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "app-layer-parser.h"
 #include "flow-util.h"

src/detect-bsize.c

@@ -24,7 +24,6 @@
  */
 
 #include "suricata-common.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #include "detect.h"

src/detect-bypass.c

@@ -45,7 +45,6 @@
 
 #include "util-debug.h"
 #include "util-spm-bm.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-device-private.h"
 

src/detect-byte-extract.c

@@ -40,7 +40,6 @@
 
 #include "util-byte.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 /* the base to be used if string mode is specified.  These options would be

src/detect-bytejump.c

@@ -38,7 +38,6 @@
 #include "detect-uricontent.h"
 
 #include "util-byte.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "util-validate.h"
 #include "detect-pcre.h"

src/detect-bytemath.c

@@ -52,7 +52,6 @@
 
 #include "util-byte.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"
 

src/detect-bytetest.c

@@ -41,7 +41,6 @@
 #include "app-layer.h"
 
 #include "util-byte.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "detect-pcre.h"
 

src/detect-classtype.c

@@ -34,7 +34,6 @@
 #include "util-classification-config.h"
 #include "util-error.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 
 #define PARSE_REGEX "^\\s*([a-zA-Z][a-zA-Z0-9-_]*)\\s*$"
 

src/detect-config.c

@@ -40,7 +40,6 @@
 
 #include "util-debug.h"
 #include "util-spm-bm.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #include "app-layer.h"

src/detect-content.c

@@ -41,7 +41,6 @@
 #include "flow-var.h"
 #include "detect-flow.h"
 #include "app-layer.h"
-#include "util-unittest.h"
 #include "util-print.h"
 #include "util-debug.h"
 #include "util-spm.h"

src/detect-csum.c

@@ -31,7 +31,6 @@
 
 #include "detect-csum.h"
 
-#include "util-unittest.h"
 #include "util-debug.h"
 
 #include "pkt-var.h"

src/detect-detection-filter.c

@@ -35,7 +35,6 @@
 #include "detect-parse.h"
 
 #include "util-byte.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-debug.h"
 #include "detect-engine-build.h"

src/detect-distance.c

@@ -44,7 +44,6 @@
 
 #include "util-byte.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "detect-bytejump.h"
 #include "util-unittest-helper.h"
 

src/detect-dnp3.c

@@ -384,7 +384,6 @@ void DetectDNP3Register(void)
 
 #ifdef UNITTESTS
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "app-layer-parser.h"
 #include "flow-util.h"

src/detect-dsize.c

@@ -36,7 +36,6 @@
 #include "detect-content.h"
 #include "detect-dsize.h"
 
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "util-byte.h"
 

src/detect-engine-address-ipv4.c

@@ -30,7 +30,6 @@
 #include "flow-var.h"
 
 #include "util-cidr.h"
-#include "util-unittest.h"
 
 #include "detect-engine-address.h"
 #include "detect-engine-address-ipv4.h"

src/detect-engine-address-ipv6.c

@@ -30,7 +30,6 @@
 #include "flow-var.h"
 
 #include "util-cidr.h"
-#include "util-unittest.h"
 
 #include "detect-engine-address.h"
 #include "detect-engine-address-ipv6.h"

src/detect-engine-address.c

@@ -29,7 +29,6 @@
 #include "flow-var.h"
 
 #include "util-cidr.h"
-#include "util-unittest.h"
 #include "util-rule-vars.h"
 #include "conf.h"
 #include "conf-yaml-loader.h"

src/detect-engine-content-inspection.c

@@ -59,7 +59,6 @@
 #include "util-print.h"
 #include "util-validate.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-profiling.h"
 

src/detect-engine-event.c

@@ -42,7 +42,6 @@
 /* Need to get the DEvents[] array */
 
 #include "detect-engine-event.h"
-#include "util-unittest.h"
 
 #define PARSE_REGEX "\\S[0-9A-z_]+[.][A-z0-9_+.]+$"
 

src/detect-engine-file.c

@@ -43,7 +43,6 @@
 #include "app-layer-htp.h"
 #include "app-layer-smtp.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-profiling.h"
 #include "util-validate.h"

src/detect-engine-iponly.c

@@ -51,7 +51,6 @@
 
 #include "flow-util.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-print.h"
 #include "util-byte.h"

src/detect-engine-payload.c

@@ -44,7 +44,6 @@
 #include "util-debug.h"
 #include "util-print.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-validate.h"
 #include "util-profiling.h"

src/detect-engine-port.c

@@ -32,7 +32,6 @@
 #include "flow-var.h"
 
 #include "util-cidr.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-rule-vars.h"
 

src/detect-engine-proto.c

@@ -40,7 +40,6 @@
 
 #include "util-cidr.h"
 #include "util-byte.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-debug.h"
 

src/detect-engine-register.c

@@ -248,7 +248,6 @@
 #include "util-classification-config.h"
 #include "util-threshold-config.h"
 #include "util-print.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-debug.h"
 #include "util-hashlist.h"

src/detect-engine-siggroup.c

@@ -50,7 +50,6 @@
 #include "util-debug.h"
 #include "util-validate.h"
 #include "util-cidr.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-memcmp.h"
 

src/detect-engine-sigorder.c

@@ -33,7 +33,6 @@
 #include "detect-pcre.h"
 #include "detect-engine-build.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-debug.h"
 #include "util-action.h"

src/detect-engine-state.c

@@ -57,7 +57,6 @@
 #include "app-layer-protos.h"
 #include "app-layer-htp.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-profiling.h"
 

src/detect-engine-tag.c

@@ -36,7 +36,6 @@
 #include "host-storage.h"
 #include "flow-storage.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "flow-util.h"
 #include "stream-tcp-private.h"

src/detect-engine.c

@@ -74,7 +74,6 @@
 #include "util-hash.h"
 #include "util-byte.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-action.h"
 #include "util-magic.h"
 #include "util-signal.h"

src/detect-fast-pattern.c

@@ -36,7 +36,6 @@
 #include "util-error.h"
 #include "util-byte.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #define PARSE_REGEX "^(\\s*only\\s*)|\\s*([0-9]+)\\s*,\\s*([0-9]+)\\s*$"

src/detect-file-data.c

@@ -49,7 +49,6 @@
 
 #include "util-debug.h"
 #include "util-spm-bm.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-file-decompression.h"
 #include "util-profiling.h"

src/detect-filemagic.c

@@ -46,7 +46,6 @@
 #include "util-magic.h"
 #include "util-print.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-profiling.h"
 

src/detect-filemd5.c

@@ -26,7 +26,6 @@
 
 #include "detect-engine.h"
 #include "detect-file-hash-common.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #include "detect-filemd5.h"

src/detect-filename.c

@@ -47,7 +47,6 @@
 
 #include "util-debug.h"
 #include "util-spm-bm.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-profiling.h"
 

src/detect-filesha1.c

@@ -27,7 +27,6 @@
 
 #include "detect-engine.h"
 #include "detect-file-hash-common.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #include "detect-filesha1.h"

src/detect-filesha256.c

@@ -27,7 +27,6 @@
 
 #include "detect-engine.h"
 #include "detect-file-hash-common.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #include "detect-filesha256.h"

src/detect-filesize.c

@@ -26,7 +26,6 @@
 #include "suricata-common.h"
 #include "app-layer-protos.h"
 #include "app-layer-htp.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-misc.h"
 

src/detect-filestore.c

@@ -42,7 +42,6 @@
 
 #include "util-debug.h"
 #include "util-spm-bm.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #include "app-layer.h"

src/detect-flow.c

@@ -37,7 +37,6 @@
 
 #include "detect-flow.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-debug.h"
 

src/detect-flowbits.c

@@ -49,7 +49,6 @@
 
 #include "util-enum.h"
 #include "util-var-name.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 #include "util-conf.h"
 

src/detect-flowint.c

@@ -34,7 +34,6 @@
 #include "util-spm.h"
 #include "util-var-name.h"
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #include "detect-parse.h"

src/detect-fragbits.c

@@ -41,7 +41,6 @@
 #include "app-layer-detect-proto.h"
 
 #include "detect-fragbits.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 #include "pkt-var.h"

src/detect-fragoffset.c

@@ -37,7 +37,6 @@
 #include "detect-fragoffset.h"
 
 #include "util-byte.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 static int DetectFragOffsetMatch(DetectEngineThreadCtx *,

src/detect-frame.c

@@ -45,7 +45,6 @@
 #include "conf-yaml-loader.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-spm.h"
 #include "util-print.h"
 

src/detect-ftpbounce.c

@@ -36,7 +36,6 @@
 #include "app-layer.h"
 #include "app-layer-parser.h"
 #include "app-layer-ftp.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-debug.h"
 #include "flow.h"

src/detect-ftpdata.c

@@ -24,7 +24,6 @@
  */
 
 #include "suricata-common.h"
-#include "util-unittest.h"
 
 #include "detect-parse.h"
 #include "detect-engine.h"

src/detect-geoip.c

@@ -35,7 +35,6 @@
 
 #include "detect-geoip.h"
 
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 
 #ifndef HAVE_GEOIP

src/detect-gid.c

@@ -34,7 +34,6 @@
 
 #include "detect-gid.h"
 #include "util-byte.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 static int DetectGidSetup (DetectEngineCtx *, Signature *, const char *);

src/detect-hostbits.c

@@ -46,7 +46,6 @@
 #include "flow-bit.h"
 #include "host-bit.h"
 #include "util-var-name.h"
-#include "util-unittest.h"
 #include "util-debug.h"
 
 /*

src/detect-http-client-body.c

@@ -52,7 +52,6 @@
 #include "flow-util.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"
 

src/detect-http-cookie.c

@@ -49,7 +49,6 @@
 
 #include "util-debug.h"
 #include "util-error.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"
 #include "util-print.h"

src/detect-http-header-common.c

@@ -41,7 +41,6 @@
 #include "flow-util.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"
 #include "util-print.h"

src/detect-http-header-names.c

@@ -52,7 +52,6 @@
 #include "flow-util.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"
 #include "util-print.h"

src/detect-http-host.c

@@ -48,7 +48,6 @@
 #include "flow-util.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"
 

src/detect-http-method.c

@@ -48,7 +48,6 @@
 #include "flow-util.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"
 

src/detect-http-protocol.c

@@ -52,7 +52,6 @@
 #include "flow-util.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"
 #include "util-print.h"

src/detect-http-request-line.c

@@ -50,7 +50,6 @@
 #include "flow-util.h"
 
 #include "util-debug.h"
-#include "util-unittest.h"
 #include "util-unittest-helper.h"
 #include "util-spm.h"