From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Fri, 7 Oct 2016 18:33:18 +0000 (-0400)
Subject: Merge pull request #665 in SNORT/snort3 from version to master
X-Git-Tag: 3.0.0-233~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82439d48922124a2f1b8808ce91045409844fd2f;p=thirdparty%2Fsnort3.git

Merge pull request #665 in SNORT/snort3 from version to master

Squashed commit of the following:

commit 21e605f778e6716318853656f4d60ca2a45d2e7e
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Oct 4 19:39:32 2016 -0400

    utils: Add LibDAQ version to snort -V output

commit c5f46884c20d855c7d045a3d1025dc59124facc1
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Oct 5 15:50:35 2016 -0400

    appid: (Re-)Fix printf format specifier warnings for peg counts

commit 17e27d89cdb4da7b88f176c1d7f3aee7430fb4b2
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Oct 4 19:22:49 2016 -0400

    utils: Minimize utils.h includes and handle the fallout
---

diff --git a/extra/src/inspectors/http_server/hi_main.cc b/extra/src/inspectors/http_server/hi_main.cc
index ad4e97f80..a97335d83 100644
--- a/extra/src/inspectors/http_server/hi_main.cc
+++ b/extra/src/inspectors/http_server/hi_main.cc
@@ -64,6 +64,7 @@
 #include "file_api/file_api.h"
 #include "file_api/file_flows.h"
 #include "framework/data_bus.h"
+#include "log/messages.h"
 #include "log/unified2.h"
 #include "main/snort_debug.h"
 #include "mime/decode_base.h"
diff --git a/extra/src/inspectors/http_server/http_inspect.cc b/extra/src/inspectors/http_server/http_inspect.cc
index 9f65a356f..59dffd126 100644
--- a/extra/src/inspectors/http_server/http_inspect.cc
+++ b/extra/src/inspectors/http_server/http_inspect.cc
@@ -41,6 +41,7 @@
 #include <sys/types.h>
 
 // FIXIT-L all snort includes should use <form> instead of "form"
+#include "log/messages.h"
 #include "protocols/packet.h"
 #include "main/snort_debug.h"
 #include "decompress/file_decomp.h"
diff --git a/extra/src/loggers/alert_unixsock/alert_unixsock.cc b/extra/src/loggers/alert_unixsock/alert_unixsock.cc
index 4dea4db77..58517f143 100644
--- a/extra/src/loggers/alert_unixsock/alert_unixsock.cc
+++ b/extra/src/loggers/alert_unixsock/alert_unixsock.cc
@@ -31,6 +31,7 @@
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "framework/logger.h"
diff --git a/src/actions/act_react.cc b/src/actions/act_react.cc
index c3a3c6c30..dd3f3e8f3 100644
--- a/src/actions/act_react.cc
+++ b/src/actions/act_react.cc
@@ -51,6 +51,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
diff --git a/src/codecs/ip/cd_dst_opts.cc b/src/codecs/ip/cd_dst_opts.cc
index b462c2322..4029343f5 100644
--- a/src/codecs/ip/cd_dst_opts.cc
+++ b/src/codecs/ip/cd_dst_opts.cc
@@ -22,6 +22,7 @@
 #endif
 
 #include "framework/codec.h"
+#include "log/messages.h"
 #include "protocols/protocol_ids.h"
 #include "protocols/packet.h"
 #include "codecs/codec_module.h"
diff --git a/src/codecs/ip/cd_ipv4.cc b/src/codecs/ip/cd_ipv4.cc
index 4b7849e5d..0f7e5b17d 100644
--- a/src/codecs/ip/cd_ipv4.cc
+++ b/src/codecs/ip/cd_ipv4.cc
@@ -39,6 +39,7 @@
 #include "codecs/codec_module.h"
 #include "protocols/ip.h"
 #include "protocols/ipv4_options.h"
+#include "log/messages.h"
 #include "log/text_log.h"
 #include "log/log_text.h"
 #include "sfip/sf_ipvar.h"
diff --git a/src/detection/detection_options.cc b/src/detection/detection_options.cc
index 65c2c851e..e3163be5b 100644
--- a/src/detection/detection_options.cc
+++ b/src/detection/detection_options.cc
@@ -50,6 +50,7 @@
 #include "ips_options/ips_pcre.h"
 #include "filters/detection_filter.h"
 #include "latency/packet_latency.h"
+#include "log/messages.h"
 #include "main/thread_config.h"
 #include "framework/ips_option.h"
 #include "framework/cursor.h"
diff --git a/src/detection/fp_create.cc b/src/detection/fp_create.cc
index 56500daf4..aff64df26 100644
--- a/src/detection/fp_create.cc
+++ b/src/detection/fp_create.cc
@@ -52,6 +52,7 @@
 #include "ports/rule_port_tables.h"
 #include "framework/mpse.h"
 #include "framework/ips_option.h"
+#include "log/messages.h"
 #include "managers/mpse_manager.h"
 #include "target_based/snort_protocols.h"
 
diff --git a/src/detection/fp_detect.cc b/src/detection/fp_detect.cc
index 871fcb25a..a70c4cd9b 100644
--- a/src/detection/fp_detect.cc
+++ b/src/detection/fp_detect.cc
@@ -56,6 +56,7 @@
 
 #include "latency/packet_latency.h"
 #include "latency/rule_latency.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
 #include "framework/cursor.h"
diff --git a/src/detection/pcrm.cc b/src/detection/pcrm.cc
index 6719612e5..3e043d98a 100644
--- a/src/detection/pcrm.cc
+++ b/src/detection/pcrm.cc
@@ -40,6 +40,7 @@
 
 #include "fp_config.h"
 #include "fp_create.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "utils/util.h"
 
diff --git a/src/detection/service_map.cc b/src/detection/service_map.cc
index 5adf5d902..cab80f44f 100644
--- a/src/detection/service_map.cc
+++ b/src/detection/service_map.cc
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "hash/sfghash.h"
 #include "utils/sflsq.h"
diff --git a/src/detection/signature.cc b/src/detection/signature.cc
index 8418f90d3..71512f941 100644
--- a/src/detection/signature.cc
+++ b/src/detection/signature.cc
@@ -27,6 +27,7 @@
 #include "detection/rules.h"
 #include "detection/treenodes.h"
 #include "hash/sfghash.h"
+#include "log/messages.h"
 #include "parser/parser.h"
 #include "main/snort_config.h"
 
diff --git a/src/detection/tag.cc b/src/detection/tag.cc
index e7217c795..569ddff48 100644
--- a/src/detection/tag.cc
+++ b/src/detection/tag.cc
@@ -29,6 +29,7 @@
 
 #include "rules.h"
 #include "treenodes.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "protocols/packet.h"
diff --git a/src/events/event_queue.cc b/src/events/event_queue.cc
index 82fd27931..e85b5a2b2 100644
--- a/src/events/event_queue.cc
+++ b/src/events/event_queue.cc
@@ -59,6 +59,7 @@
 #include "utils/util.h"
 #include "utils/stats.h"
 #include "filters/sfthreshold.h"
+#include "log/messages.h"
 #include "parser/parser.h"
 
 typedef struct s_SNORT_EVENTQ_USER
diff --git a/src/file_api/file_cache.cc b/src/file_api/file_cache.cc
index 2ccd06fcc..ef83fc242 100644
--- a/src/file_api/file_cache.cc
+++ b/src/file_api/file_cache.cc
@@ -20,12 +20,13 @@
 #include "file_cache.h"
 #include "file_service.h"
 
+#include "log/messages.h"
+#include "main/snort_config.h"
 #include "sfip/sfip_t.h"
 #include "sfip/sf_ip.h"
 #include "time/packet_time.h"
 #include "utils/util.h"
 #include "utils/snort_bounds.h"
-#include "main/snort_config.h"
 
 uint64_t FileCache::num_add_fails = 0;
 
diff --git a/src/file_api/file_capture.cc b/src/file_api/file_capture.cc
index 7b2f0e9c9..09712db3b 100644
--- a/src/file_api/file_capture.cc
+++ b/src/file_api/file_capture.cc
@@ -37,14 +37,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "file_config.h"
-#include "file_stats.h"
-
-#include "main/snort_config.h"
 #include "hash/hashes.h"
+#include "log/messages.h"
+#include "main/snort_config.h"
 #include "utils/util.h"
 #include "utils/stats.h"
 
+#include "file_config.h"
+#include "file_stats.h"
+
 FileMemPool* FileCapture::file_mempool = nullptr;
 File_Capture_Stats file_capture_stats;
 
diff --git a/src/file_api/file_enforcer.cc b/src/file_api/file_enforcer.cc
index 9e949d0b6..049a3f96f 100644
--- a/src/file_api/file_enforcer.cc
+++ b/src/file_api/file_enforcer.cc
@@ -31,6 +31,7 @@
 #include "framework/data_bus.h"
 #include "hash/hashes.h"
 #include "hash/sfxhash.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "managers/action_manager.h"
 #include "packet_io/active.h"
diff --git a/src/file_api/file_identifier.cc b/src/file_api/file_identifier.cc
index b8966ab08..388a72df2 100644
--- a/src/file_api/file_identifier.cc
+++ b/src/file_api/file_identifier.cc
@@ -33,6 +33,7 @@
 
 #include <algorithm>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "parser/parser.h"
diff --git a/src/file_api/file_mempool.cc b/src/file_api/file_mempool.cc
index 73e2d1e4c..d75577f0b 100644
--- a/src/file_api/file_mempool.cc
+++ b/src/file_api/file_mempool.cc
@@ -25,11 +25,13 @@
  **
  */
 
+#include "file_mempool.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 
-#include "file_mempool.h"
+#include "log/messages.h"
 #include "utils/util.h"
 
 /*This magic is used for double free detection*/
diff --git a/src/filters/detection_filter.cc b/src/filters/detection_filter.cc
index e629ed736..eee22542b 100644
--- a/src/filters/detection_filter.cc
+++ b/src/filters/detection_filter.cc
@@ -23,10 +23,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils/util.h"
-#include "parser/parser.h"
 #include "filters/sfthd.h"
+#include "log/messages.h"
 #include "main/thread.h"
+#include "parser/parser.h"
+#include "utils/util.h"
 
 static THREAD_LOCAL SFXHASH* detection_filter_hash = NULL;
 
diff --git a/src/helpers/process.cc b/src/helpers/process.cc
index 14598deac..b1be9778c 100644
--- a/src/helpers/process.cc
+++ b/src/helpers/process.cc
@@ -37,6 +37,7 @@
 
 #include <iostream>
 
+#include "log/messages.h"
 #include "main.h"
 #include "main/thread.h"
 #include "main/snort.h"
diff --git a/src/ips_options/ips_base64.cc b/src/ips_options/ips_base64.cc
index 597eaf17c..248af400d 100644
--- a/src/ips_options/ips_base64.cc
+++ b/src/ips_options/ips_base64.cc
@@ -28,6 +28,7 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
diff --git a/src/ips_options/ips_byte_extract.cc b/src/ips_options/ips_byte_extract.cc
index a22b89cde..516dac845 100644
--- a/src/ips_options/ips_byte_extract.cc
+++ b/src/ips_options/ips_byte_extract.cc
@@ -25,6 +25,7 @@
 #endif
 
 #include "extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "parser/parser.h"
 #include "detection/detection_defines.h"
diff --git a/src/ips_options/ips_byte_jump.cc b/src/ips_options/ips_byte_jump.cc
index 30fd50e1e..7fa6762b5 100644
--- a/src/ips_options/ips_byte_jump.cc
+++ b/src/ips_options/ips_byte_jump.cc
@@ -75,6 +75,7 @@
 
 #include "extract.h"
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
diff --git a/src/ips_options/ips_byte_test.cc b/src/ips_options/ips_byte_test.cc
index 508e3f147..7f0235f51 100644
--- a/src/ips_options/ips_byte_test.cc
+++ b/src/ips_options/ips_byte_test.cc
@@ -95,6 +95,7 @@
 
 #include "extract.h"
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
diff --git a/src/ips_options/ips_content.cc b/src/ips_options/ips_content.cc
index f620c3064..d0875ec31 100644
--- a/src/ips_options/ips_content.cc
+++ b/src/ips_options/ips_content.cc
@@ -28,6 +28,7 @@
 #endif
 
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "utils/boyer_moore.h"
diff --git a/src/ips_options/ips_flags.cc b/src/ips_options/ips_flags.cc
index 4ac3ac3cc..3df71e4dd 100644
--- a/src/ips_options/ips_flags.cc
+++ b/src/ips_options/ips_flags.cc
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
diff --git a/src/ips_options/ips_flow.cc b/src/ips_options/ips_flow.cc
index 988268b06..144027c42 100644
--- a/src/ips_options/ips_flow.cc
+++ b/src/ips_options/ips_flow.cc
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "detection/treenodes.h"
diff --git a/src/ips_options/ips_flowbits.cc b/src/ips_options/ips_flowbits.cc
index 45fff5098..89f774fb9 100644
--- a/src/ips_options/ips_flowbits.cc
+++ b/src/ips_options/ips_flowbits.cc
@@ -49,6 +49,7 @@
 #include <string>
 #include <forward_list>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "detection/treenodes.h"
diff --git a/src/ips_options/ips_fragbits.cc b/src/ips_options/ips_fragbits.cc
index 19d350b35..30b1de75b 100644
--- a/src/ips_options/ips_fragbits.cc
+++ b/src/ips_options/ips_fragbits.cc
@@ -53,6 +53,7 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
diff --git a/src/ips_options/ips_hash.cc b/src/ips_options/ips_hash.cc
index ca7659890..8145b24c9 100644
--- a/src/ips_options/ips_hash.cc
+++ b/src/ips_options/ips_hash.cc
@@ -25,6 +25,7 @@
 #include <string>
 
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "parser/parser.h"
 #include "parser/parse_utils.h"
diff --git a/src/ips_options/ips_ip_proto.cc b/src/ips_options/ips_ip_proto.cc
index f40fa7587..9a5c2168c 100644
--- a/src/ips_options/ips_ip_proto.cc
+++ b/src/ips_options/ips_ip_proto.cc
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <netdb.h>
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "protocols/packet.h"
 #include "parser/parser.h"
diff --git a/src/ips_options/ips_isdataat.cc b/src/ips_options/ips_isdataat.cc
index 5e35028df..b07442f5f 100644
--- a/src/ips_options/ips_isdataat.cc
+++ b/src/ips_options/ips_isdataat.cc
@@ -43,6 +43,7 @@
 #include <errno.h>
 
 #include "ips_byte_extract.h"
+#include "log/messages.h"
 #include "protocols/packet.h"
 #include "parser/parser.h"
 #include "parser/mstring.h"
diff --git a/src/ips_options/ips_metadata.cc b/src/ips_options/ips_metadata.cc
index a66f5253f..9524101f4 100644
--- a/src/ips_options/ips_metadata.cc
+++ b/src/ips_options/ips_metadata.cc
@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
diff --git a/src/ips_options/ips_pcre.cc b/src/ips_options/ips_pcre.cc
index 5cbf22c63..5ca3b2ac7 100644
--- a/src/ips_options/ips_pcre.cc
+++ b/src/ips_options/ips_pcre.cc
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <pcre.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
diff --git a/src/ips_options/ips_regex.cc b/src/ips_options/ips_regex.cc
index c5f765a69..cacc7383f 100644
--- a/src/ips_options/ips_regex.cc
+++ b/src/ips_options/ips_regex.cc
@@ -34,6 +34,7 @@
 #include "detection/detection_defines.h"
 #include "detection/pattern_match_data.h"
 #include "hash/sfhashfcn.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/thread.h"
 #include "parser/parser.h"
diff --git a/src/ips_options/ips_replace.cc b/src/ips_options/ips_replace.cc
index 54f7c7ba5..affce34dc 100644
--- a/src/ips_options/ips_replace.cc
+++ b/src/ips_options/ips_replace.cc
@@ -25,6 +25,7 @@
 #include <assert.h>
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
diff --git a/src/ips_options/ips_sd_pattern.cc b/src/ips_options/ips_sd_pattern.cc
index e1d889bc6..33575598e 100644
--- a/src/ips_options/ips_sd_pattern.cc
+++ b/src/ips_options/ips_sd_pattern.cc
@@ -33,12 +33,13 @@
 #include "detection/detection_defines.h"
 #include "detection/pattern_match_data.h"
 #include "hash/sfhashfcn.h"
+#include "log/messages.h"
+#include "log/obfuscator.h"
 #include "main/snort_config.h"
 #include "main/thread.h"
 #include "parser/parser.h"
 #include "profiler/profiler.h"
 #include "sd_credit_card.h"
-#include "log/obfuscator.h"
 
 #define s_name "sd_pattern"
 #define s_help "rule option for detecting sensitive data"
diff --git a/src/ips_options/ips_session.cc b/src/ips_options/ips_session.cc
index 0bbabfd00..97ad6878e 100644
--- a/src/ips_options/ips_session.cc
+++ b/src/ips_options/ips_session.cc
@@ -54,6 +54,7 @@
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "protocols/packet.h"
 #include "main/snort_debug.h"
diff --git a/src/latency/packet_latency.cc b/src/latency/packet_latency.cc
index 671ce55fb..f8d8bfbec 100644
--- a/src/latency/packet_latency.cc
+++ b/src/latency/packet_latency.cc
@@ -24,6 +24,7 @@
 #include <sstream>
 #include <vector>
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/thread.h"
 #include "protocols/packet.h"
diff --git a/src/log/log.cc b/src/log/log.cc
index 166241514..0fce4c62e 100644
--- a/src/log/log.cc
+++ b/src/log/log.cc
@@ -33,11 +33,13 @@
 #include <string>
 #include <mutex>
 
-#include "log_text.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "protocols/tcp.h"
 
+#include "log_text.h"
+#include "messages.h"
+
 #define DEFAULT_DAEMON_ALERT_FILE  "alert"
 
 /* Input is packet and an nine-byte (including NULL) character array.  Results
diff --git a/src/log/log_text.cc b/src/log/log_text.cc
index 69755e396..db28829fc 100644
--- a/src/log/log_text.cc
+++ b/src/log/log_text.cc
@@ -44,6 +44,7 @@ extern "C" {
 #include "detection/treenodes.h"
 #include "detection/signature.h"
 #include "detection/detection_util.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "packet_io/sfdaq.h"
diff --git a/src/loggers/alert_sf_socket.cc b/src/loggers/alert_sf_socket.cc
index b07d1180b..549302722 100644
--- a/src/loggers/alert_sf_socket.cc
+++ b/src/loggers/alert_sf_socket.cc
@@ -38,6 +38,7 @@
 #include "main/snort_debug.h"
 #include "framework/logger.h"
 #include "framework/module.h"
+#include "log/messages.h"
 #include "managers/event_manager.h"
 #include "detection/rules.h"
 #include "detection/treenodes.h"
diff --git a/src/loggers/alert_syslog.cc b/src/loggers/alert_syslog.cc
index 99430be05..24a43e543 100644
--- a/src/loggers/alert_syslog.cc
+++ b/src/loggers/alert_syslog.cc
@@ -28,6 +28,7 @@
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "framework/logger.h"
diff --git a/src/loggers/log_pcap.cc b/src/loggers/log_pcap.cc
index 7165d63d3..e6fd0e09d 100644
--- a/src/loggers/log_pcap.cc
+++ b/src/loggers/log_pcap.cc
@@ -37,6 +37,7 @@ extern "C" {
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "framework/logger.h"
diff --git a/src/loggers/unified2.cc b/src/loggers/unified2.cc
index 680e70d09..ed2a16908 100644
--- a/src/loggers/unified2.cc
+++ b/src/loggers/unified2.cc
@@ -52,6 +52,7 @@
 #include "detection/detect.h"
 #include "parser/parser.h"
 #include "events/event.h"
+#include "log/messages.h"
 #include "log/obfuscator.h"
 #include "packet_io/active.h"
 #include "packet_io/sfdaq.h"
diff --git a/src/main.cc b/src/main.cc
index 1564debe4..96d2eaf4a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -40,6 +40,7 @@
 #include <string>
 #include <thread>
 
+#include "log/messages.h"
 #include "main/analyzer.h"
 #include "main/shell.h"
 #include "main/snort.h"
diff --git a/src/main/modules.cc b/src/main/modules.cc
index ab31db77b..e35ef0e87 100644
--- a/src/main/modules.cc
+++ b/src/main/modules.cc
@@ -41,6 +41,7 @@
 #include "host_tracker/host_tracker_module.h"
 #include "host_tracker/host_cache_module.h"
 #include "latency/latency_module.h"
+#include "log/messages.h"
 #include "managers/module_manager.h"
 #include "managers/plugin_manager.h"
 #include "memory/memory_module.h"
diff --git a/src/main/snort.cc b/src/main/snort.cc
index 85910103d..896d48763 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -52,6 +52,7 @@
 #include "ips_options/ips_flowbits.h"
 #include "latency/packet_latency.h"
 #include "latency/rule_latency.h"
+#include "log/messages.h"
 #include "managers/action_manager.h"
 #include "managers/codec_manager.h"
 #include "managers/inspector_manager.h"
diff --git a/src/main/snort_config.cc b/src/main/snort_config.cc
index ab8a51d35..0d81edf8e 100644
--- a/src/main/snort_config.cc
+++ b/src/main/snort_config.cc
@@ -32,6 +32,7 @@
 #include "helpers/process.h"
 #include "ips_options/ips_pcre.h"
 #include "latency/latency_config.h"
+#include "log/messages.h"
 #include "managers/inspector_manager.h"
 #include "managers/ips_manager.h"
 #include "managers/module_manager.h"
diff --git a/src/main/snort_debug.cc b/src/main/snort_debug.cc
index 962984faa..b0e6ba6ce 100644
--- a/src/main/snort_debug.cc
+++ b/src/main/snort_debug.cc
@@ -25,6 +25,8 @@
 #include <syslog.h>
 #include <stdlib.h>
 
+#include "log/messages.h"
+
 #include "snort_types.h"
 #include "snort_config.h"
 
diff --git a/src/main/snort_module.cc b/src/main/snort_module.cc
index baad5c562..05361f7b5 100644
--- a/src/main/snort_module.cc
+++ b/src/main/snort_module.cc
@@ -38,6 +38,7 @@
 #include "framework/base_api.h"
 #include "framework/module.h"
 #include "framework/parameter.h"
+#include "log/messages.h"
 #include "managers/module_manager.h"
 #include "managers/plugin_manager.h"
 #include "packet_io/sfdaq_config.h"
diff --git a/src/main/thread_config.cc b/src/main/thread_config.cc
index 96a396ac9..01861b0fc 100644
--- a/src/main/thread_config.cc
+++ b/src/main/thread_config.cc
@@ -21,6 +21,7 @@
 
 #include <hwloc.h>
 
+#include "log/messages.h"
 #include "utils/util.h"
 
 #ifdef UNIT_TEST
diff --git a/src/managers/connector_manager.cc b/src/managers/connector_manager.cc
index 0a5c1b7d8..79794fc0e 100644
--- a/src/managers/connector_manager.cc
+++ b/src/managers/connector_manager.cc
@@ -25,6 +25,7 @@
 #include <utility>
 
 #include "framework/connector.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
 #include "module_manager.h"
diff --git a/src/managers/module_manager.cc b/src/managers/module_manager.cc
index 547ad8eb4..df9b4c988 100644
--- a/src/managers/module_manager.cc
+++ b/src/managers/module_manager.cc
@@ -29,6 +29,7 @@
 #include <lua.hpp>
 
 #include "plugin_manager.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/modules.h"
 #include "main/shell.h"
diff --git a/src/mime/file_mime_process.cc b/src/mime/file_mime_process.cc
index 3cb267fc2..80fed9a43 100644
--- a/src/mime/file_mime_process.cc
+++ b/src/mime/file_mime_process.cc
@@ -31,6 +31,7 @@
 #include "file_api/file_api.h"
 #include "file_api/file_flows.h"
 #include "framework/data_bus.h"
+#include "log/messages.h"
 #include "protocols/packet.h"
 #include "search_engines/search_tool.h"
 #include "utils/util.h"
diff --git a/src/network_inspectors/appid/appid_inspector.cc b/src/network_inspectors/appid/appid_inspector.cc
index 5027af236..84eaf8ad1 100644
--- a/src/network_inspectors/appid/appid_inspector.cc
+++ b/src/network_inspectors/appid/appid_inspector.cc
@@ -25,6 +25,7 @@
 #include "config.h"
 #endif
 
+#include "log/messages.h"
 #include "main/thread.h"
 #include "profiler/profiler.h"
 #include "appid_stats.h"
@@ -48,11 +49,11 @@ THREAD_LOCAL LuaDetectorManager* lua_detector_mgr;
 static void dump_appid_stats()
 {
     LogMessage("Application Identification Preprocessor:\n");
-    LogMessage("   Total packets received : %lu\n", appid_stats.packets);
-    LogMessage("  Total packets processed : %lu\n", appid_stats.processed_packets);
+    LogMessage("   Total packets received : %" PRIu64 "\n", appid_stats.packets);
+    LogMessage("  Total packets processed : %" PRIu64 "\n", appid_stats.processed_packets);
     if (thirdparty_appid_module)
         thirdparty_appid_module->print_stats();
-    LogMessage("    Total packets ignored : %lu\n", appid_stats.ignored_packets);
+    LogMessage("    Total packets ignored : %" PRIu64 "\n", appid_stats.ignored_packets);
     AppIdServiceStateDumpStats();
 }
 
diff --git a/src/network_inspectors/arp_spoof/arp_spoof.cc b/src/network_inspectors/arp_spoof/arp_spoof.cc
index 4981a5f05..eabee8863 100644
--- a/src/network_inspectors/arp_spoof/arp_spoof.cc
+++ b/src/network_inspectors/arp_spoof/arp_spoof.cc
@@ -78,6 +78,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "detection/detect.h"
diff --git a/src/network_inspectors/binder/bind_module.cc b/src/network_inspectors/binder/bind_module.cc
index 591b44e6f..8da71ddc5 100644
--- a/src/network_inspectors/binder/bind_module.cc
+++ b/src/network_inspectors/binder/bind_module.cc
@@ -28,6 +28,7 @@
 #include "binding.h"
 #include "protocols/packet.h"
 #include "parser/parse_ip.h"
+#include "log/messages.h"
 #include "main/policy.h"
 #include "main/snort_config.h"
 #include "main/shell.h"
diff --git a/src/network_inspectors/normalize/normalize.cc b/src/network_inspectors/normalize/normalize.cc
index 748f9de25..097f85639 100644
--- a/src/network_inspectors/normalize/normalize.cc
+++ b/src/network_inspectors/normalize/normalize.cc
@@ -25,6 +25,7 @@
 #include "packet_io/sfdaq.h"
 #include "parser/parser.h"
 #include "profiler/profiler.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "framework/inspector.h"
diff --git a/src/network_inspectors/perf_monitor/flow_ip_tracker.cc b/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
index b42724728..91e6e9410 100644
--- a/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
+++ b/src/network_inspectors/perf_monitor/flow_ip_tracker.cc
@@ -21,6 +21,7 @@
 #include "flow_ip_tracker.h"
 #include "perf_module.h"
 
+#include "log/messages.h"
 #include "sfip/sf_ip.h"
 #include "utils/util.h"
 
diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index 93918f4a2..6d1bcda23 100644
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -38,6 +38,7 @@
 #include "perf_monitor.h"
 #include "perf_module.h"
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
diff --git a/src/network_inspectors/port_scan/port_scan.cc b/src/network_inspectors/port_scan/port_scan.cc
index 28e0b793d..862f5c7cc 100644
--- a/src/network_inspectors/port_scan/port_scan.cc
+++ b/src/network_inspectors/port_scan/port_scan.cc
@@ -53,6 +53,7 @@
 #include "ps_module.h"
 
 #include "ipobj.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "managers/inspector_manager.h"
 #include "protocols/packet_manager.h"
diff --git a/src/network_inspectors/port_scan/ps_detect.cc b/src/network_inspectors/port_scan/ps_detect.cc
index 1f20ece73..367ea9cbb 100644
--- a/src/network_inspectors/port_scan/ps_detect.cc
+++ b/src/network_inspectors/port_scan/ps_detect.cc
@@ -43,6 +43,7 @@
 #include <sys/types.h>
 
 #include "ipobj.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "protocols/packet.h"
 #include "time/packet_time.h"
diff --git a/src/network_inspectors/reputation/reputation_inspect.cc b/src/network_inspectors/reputation/reputation_inspect.cc
index 621491143..228b87701 100644
--- a/src/network_inspectors/reputation/reputation_inspect.cc
+++ b/src/network_inspectors/reputation/reputation_inspect.cc
@@ -36,6 +36,7 @@
 #include "protocols/packet.h"
 #include "sfip/sf_ip.h"
 #include "events/event_queue.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "profiler/profiler.h"
diff --git a/src/network_inspectors/reputation/reputation_module.cc b/src/network_inspectors/reputation/reputation_module.cc
index 7077d1799..403f2c6bf 100644
--- a/src/network_inspectors/reputation/reputation_module.cc
+++ b/src/network_inspectors/reputation/reputation_module.cc
@@ -20,10 +20,12 @@
 
 #include "reputation_module.h"
 
-#include "utils/util.h"
 #include <assert.h>
 #include <sstream>
 
+#include "log/messages.h"
+#include "utils/util.h"
+
 #include "reputation_parse.h"
 
 using namespace std;
diff --git a/src/network_inspectors/reputation/reputation_parse.cc b/src/network_inspectors/reputation/reputation_parse.cc
index b52a313c2..bfca10cf9 100644
--- a/src/network_inspectors/reputation/reputation_parse.cc
+++ b/src/network_inspectors/reputation/reputation_parse.cc
@@ -22,9 +22,11 @@
 
 #include <assert.h>
 #include <limits>
+
+#include "log/messages.h"
+#include "main/snort_debug.h"
 #include "parser/config_file.h"
 #include "utils/util.h"
-#include "main/snort_debug.h"
 
 using namespace std;
 
diff --git a/src/packet_io/active.cc b/src/packet_io/active.cc
index 43011ee29..e2ac7537b 100644
--- a/src/packet_io/active.cc
+++ b/src/packet_io/active.cc
@@ -25,6 +25,7 @@
 
 #include "active.h"
 
+#include "log/messages.h"
 #include "managers/action_manager.h"
 #include "packet_io/sfdaq.h"
 #include "protocols/tcp.h"
diff --git a/src/packet_io/intf.cc b/src/packet_io/intf.cc
index eb255b608..11ed388a3 100644
--- a/src/packet_io/intf.cc
+++ b/src/packet_io/intf.cc
@@ -22,6 +22,7 @@
 #include <pcap.h>
 #include <stdio.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "utils/util.h"
diff --git a/src/packet_io/sfdaq.cc b/src/packet_io/sfdaq.cc
index 55b12bdb3..5d257475b 100644
--- a/src/packet_io/sfdaq.cc
+++ b/src/packet_io/sfdaq.cc
@@ -35,12 +35,14 @@ extern "C" {
 #include <sfbpf_dlt.h>
 }
 
-#include "sfdaq_config.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "parser/parser.h"
 #include "protocols/vlan.h"
 #include "utils/util.h"
 
+#include "sfdaq_config.h"
+
 using namespace std;
 
 #ifdef DEFAULT_DAQ
diff --git a/src/packet_io/sfdaq_module.cc b/src/packet_io/sfdaq_module.cc
index fe1e57d8b..c49c89943 100644
--- a/src/packet_io/sfdaq_module.cc
+++ b/src/packet_io/sfdaq_module.cc
@@ -24,9 +24,11 @@
 
 #include "sfdaq_module.h"
 
-#include "sfdaq_config.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 
+#include "sfdaq_config.h"
+
 #ifdef UNIT_TEST
 #include "catch/catch.hpp"
 #endif
diff --git a/src/packet_io/trough.cc b/src/packet_io/trough.cc
index 46b5ad6cb..f81bd54b1 100644
--- a/src/packet_io/trough.cc
+++ b/src/packet_io/trough.cc
@@ -25,8 +25,9 @@
 #include <algorithm>
 #include <fstream>
 
-#include "main/snort_config.h"
 #include "helpers/directory.h"
+#include "log/messages.h"
+#include "main/snort_config.h"
 
 std::vector<struct Trough::PcapReadObject> Trough::pcap_object_list;
 std::vector<std::string> Trough::pcap_queue;
diff --git a/src/parser/cmd_line.cc b/src/parser/cmd_line.cc
index b0a8f11e5..802e1f3fc 100644
--- a/src/parser/cmd_line.cc
+++ b/src/parser/cmd_line.cc
@@ -25,6 +25,7 @@
 
 #include <string>
 
+#include "log/messages.h"
 #include "main/help.h"
 #include "main/snort_module.h"
 #include "main/snort_config.h"
diff --git a/src/parser/config_file.cc b/src/parser/config_file.cc
index 6a22883b8..aa92bdf19 100644
--- a/src/parser/config_file.cc
+++ b/src/parser/config_file.cc
@@ -42,6 +42,7 @@
 #include "mstring.h"
 
 #include "detection/detect.h"
+#include "log/messages.h"
 #include "main/snort.h"
 #include "main/snort_config.h"
 #include "main/snort_types.h"
diff --git a/src/parser/parse_conf.cc b/src/parser/parse_conf.cc
index df585b588..451e12256 100644
--- a/src/parser/parse_conf.cc
+++ b/src/parser/parse_conf.cc
@@ -64,6 +64,7 @@
 #include "packet_io/active.h"
 #include "file_api/file_config.h"
 #include "framework/ips_option.h"
+#include "log/messages.h"
 #include "managers/action_manager.h"
 #include "actions/actions.h"
 #include "target_based/snort_protocols.h"
diff --git a/src/parser/parse_ip.cc b/src/parser/parse_ip.cc
index 124d7bc3e..cdf31a027 100644
--- a/src/parser/parse_ip.cc
+++ b/src/parser/parse_ip.cc
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 
 #include "parser.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "sfip/sf_vartable.h"
 #include "sfip/sf_ipvar.h"
diff --git a/src/parser/parse_rule.cc b/src/parser/parse_rule.cc
index c93c5e00e..5db2c8106 100644
--- a/src/parser/parse_rule.cc
+++ b/src/parser/parse_rule.cc
@@ -71,6 +71,7 @@
 #include "packet_io/active.h"
 #include "file_api/file_config.h"
 #include "framework/ips_option.h"
+#include "log/messages.h"
 #include "managers/ips_manager.h"
 #include "managers/so_manager.h"
 #include "target_based/snort_protocols.h"
diff --git a/src/parser/parse_utils.cc b/src/parser/parse_utils.cc
index 865dd1394..dc171c682 100644
--- a/src/parser/parse_utils.cc
+++ b/src/parser/parse_utils.cc
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "parser.h"
+#include "log/messages.h"
 #include "utils/util.h"
 
 using namespace std;
diff --git a/src/parser/parser.cc b/src/parser/parser.cc
index 23db40803..ac8cd6cdf 100644
--- a/src/parser/parser.cc
+++ b/src/parser/parser.cc
@@ -76,6 +76,7 @@
 #include "packet_io/active.h"
 #include "file_api/file_config.h"
 #include "actions/actions.h"
+#include "log/messages.h"
 #include "managers/event_manager.h"
 #include "managers/module_manager.h"
 #include "target_based/snort_protocols.h"
diff --git a/src/parser/vars.cc b/src/parser/vars.cc
index c10d162d9..4b25dab0b 100644
--- a/src/parser/vars.cc
+++ b/src/parser/vars.cc
@@ -42,6 +42,7 @@
 #include "cmd_line.h"
 #include "parse_ports.h"
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
 #include "detection/rules.h"
diff --git a/src/ports/port_object.cc b/src/ports/port_object.cc
index a7fb2d9dd..feeb82113 100644
--- a/src/ports/port_object.cc
+++ b/src/ports/port_object.cc
@@ -28,6 +28,7 @@
 
 #include "port_item.h"
 #include "port_utils.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
diff --git a/src/ports/port_object2.cc b/src/ports/port_object2.cc
index 4c0921d77..979169754 100644
--- a/src/ports/port_object2.cc
+++ b/src/ports/port_object2.cc
@@ -35,6 +35,7 @@
 #include "port_table.h"
 #include "port_utils.h"
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
diff --git a/src/ports/port_table.cc b/src/ports/port_table.cc
index 2d088895f..170e619fe 100644
--- a/src/ports/port_table.cc
+++ b/src/ports/port_table.cc
@@ -35,6 +35,7 @@
 #include "port_object2.h"
 #include "port_utils.h"
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
diff --git a/src/ports/rule_port_tables.cc b/src/ports/rule_port_tables.cc
index 65893b9cf..9eda7a30f 100644
--- a/src/ports/rule_port_tables.cc
+++ b/src/ports/rule_port_tables.cc
@@ -21,6 +21,7 @@
 
 #include "port_object.h"
 #include "port_table.h"
+#include "log/messages.h"
 #include "parser/parser.h"
 #include "utils/util.h"
 
diff --git a/src/search_engines/acsmx2.cc b/src/search_engines/acsmx2.cc
index 88e4a9d63..ba300003b 100644
--- a/src/search_engines/acsmx2.cc
+++ b/src/search_engines/acsmx2.cc
@@ -130,6 +130,7 @@
 #include "main/snort_config.h"
 #endif
 
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "main/snort_types.h"
 #include "utils/stats.h"
diff --git a/src/search_engines/bnfa_search.cc b/src/search_engines/bnfa_search.cc
index 763283b9b..0cdac331c 100644
--- a/src/search_engines/bnfa_search.cc
+++ b/src/search_engines/bnfa_search.cc
@@ -154,6 +154,7 @@
 #include <list>
 
 #include "search_common.h"
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "utils/stats.h"
diff --git a/src/service_inspectors/back_orifice/back_orifice.cc b/src/service_inspectors/back_orifice/back_orifice.cc
index e3eaf93ce..4b25f7a9f 100644
--- a/src/service_inspectors/back_orifice/back_orifice.cc
+++ b/src/service_inspectors/back_orifice/back_orifice.cc
@@ -115,6 +115,7 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
diff --git a/src/service_inspectors/dce_rpc/dce_smb_module.cc b/src/service_inspectors/dce_rpc/dce_smb_module.cc
index cb37b4970..e15d41f4b 100644
--- a/src/service_inspectors/dce_rpc/dce_smb_module.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_module.cc
@@ -20,6 +20,7 @@
 
 #include "dce_smb_module.h"
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 #include "dce_smb.h"
diff --git a/src/service_inspectors/dnp3/dnp3_module.cc b/src/service_inspectors/dnp3/dnp3_module.cc
index e11362e75..b49643b87 100644
--- a/src/service_inspectors/dnp3/dnp3_module.cc
+++ b/src/service_inspectors/dnp3/dnp3_module.cc
@@ -20,6 +20,7 @@
 
 #include "dnp3_module.h"
 #include "dnp3.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 using namespace std;
diff --git a/src/service_inspectors/ftp_telnet/ftp_parse.cc b/src/service_inspectors/ftp_telnet/ftp_parse.cc
index 402ae2ea9..8fa9519e2 100644
--- a/src/service_inspectors/ftp_telnet/ftp_parse.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_parse.cc
@@ -33,6 +33,7 @@
 #include "ftp_cmd_lookup.h"
 #include "ftpp_return_codes.h"
 
+#include "log/messages.h"
 #include "sfip/sf_ip.h"
 #include "utils/util.h"
 
diff --git a/src/service_inspectors/imap/imap_module.cc b/src/service_inspectors/imap/imap_module.cc
index f30aa984a..5c5a3d86b 100644
--- a/src/service_inspectors/imap/imap_module.cc
+++ b/src/service_inspectors/imap/imap_module.cc
@@ -19,8 +19,11 @@
 // imap_module.cc author Bhagyashree Bantwal <bbantwal@cisco.com>
 
 #include "imap_module.h"
+
 #include <assert.h>
 #include <sstream>
+
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 using namespace std;
diff --git a/src/service_inspectors/pop/pop_module.cc b/src/service_inspectors/pop/pop_module.cc
index f180b7156..9cc434dbf 100644
--- a/src/service_inspectors/pop/pop_module.cc
+++ b/src/service_inspectors/pop/pop_module.cc
@@ -19,8 +19,11 @@
 // pop_module.cc author Bhagyashree Bantwal <bbantwal@cisco.com>
 
 #include "pop_module.h"
+
 #include <assert.h>
 #include <sstream>
+
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 using namespace std;
diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index 0d03ed638..bb65d15c4 100644
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -44,6 +44,7 @@
 #include <ctype.h>
 
 #include "parser/parser.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "detection/detect.h"
 #include "log/log.h"
diff --git a/src/service_inspectors/sip/sip.cc b/src/service_inspectors/sip/sip.cc
index f181b6c90..3a9c09ece 100644
--- a/src/service_inspectors/sip/sip.cc
+++ b/src/service_inspectors/sip/sip.cc
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "main/snort_config.h"
diff --git a/src/service_inspectors/sip/sip_config.cc b/src/service_inspectors/sip/sip_config.cc
index f18494432..f42be8e3d 100644
--- a/src/service_inspectors/sip/sip_config.cc
+++ b/src/service_inspectors/sip/sip_config.cc
@@ -21,9 +21,10 @@
 
 #include "sip_config.h"
 
-#include "utils/util.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
 #include "parser/parser.h"
+#include "utils/util.h"
 
 #define SIP_SEPERATORS       "()<>@,;:\\/[]?={}\" "
 
diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index f0d132480..902260ec6 100644
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+#include "log/messages.h"
 #include "main/snort_types.h"
 #include "main/snort_debug.h"
 #include "profiler/profiler.h"
diff --git a/src/service_inspectors/smtp/smtp_module.cc b/src/service_inspectors/smtp/smtp_module.cc
index 4d4bd5448..898e930c1 100644
--- a/src/service_inspectors/smtp/smtp_module.cc
+++ b/src/service_inspectors/smtp/smtp_module.cc
@@ -19,8 +19,11 @@
 // smtp_module.cc author Bhagyashree Bantwal <bbantwal@cisco.com>
 
 #include "smtp_module.h"
+
 #include <assert.h>
 #include <sstream>
+
+#include "log/messages.h"
 #include "main/snort_config.h"
 
 using namespace std;
diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index e19b52eeb..cc7cdc285 100644
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -87,6 +87,7 @@
 #include "protocols/layer.h"
 #include "protocols/ipv4_options.h"
 #include "protocols/packet_manager.h"
+#include "log/messages.h"
 #include "main/snort.h"
 #include "main/snort_debug.h"
 #include "profiler/profiler.h"
diff --git a/src/stream/tcp/tcp_stream_config.cc b/src/stream/tcp/tcp_stream_config.cc
index b76b4ef62..7c77b854a 100644
--- a/src/stream/tcp/tcp_stream_config.cc
+++ b/src/stream/tcp/tcp_stream_config.cc
@@ -19,6 +19,7 @@
 // tcp_stream_config.cc author davis mcpherson <davmcphe@@cisco.com>
 // Created on: Oct 22, 2015
 
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "tcp_stream_config.h"
 
diff --git a/src/target_based/sftarget_reader.cc b/src/target_based/sftarget_reader.cc
index 368c13164..c42334d99 100644
--- a/src/target_based/sftarget_reader.cc
+++ b/src/target_based/sftarget_reader.cc
@@ -41,13 +41,14 @@
 #include "sftarget_hostentry.h"
 #include "sftarget_data.h"
 
+#include "hash/sfxhash.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
 #include "parser/parser.h"
-#include "hash/sfxhash.h"
+#include "utils/stats.h"
 #include "utils/util.h"
 #include "utils/util_net.h"
-#include "utils/stats.h"
 #include "sfip/sf_ip.h"
 #include "sfrt/sfrt.h"
 
diff --git a/src/target_based/snort_protocols.cc b/src/target_based/snort_protocols.cc
index 1a7b1cb04..03171e89f 100644
--- a/src/target_based/snort_protocols.cc
+++ b/src/target_based/snort_protocols.cc
@@ -26,9 +26,10 @@
 #include <vector>
 
 #include "hash/sfghash.h"
+#include "log/messages.h"
 #include "main/snort_debug.h"
-#include "utils/util.h"
 #include "stream/stream.h"
+#include "utils/util.h"
 
 #include "sftarget_reader.h"
 #include "sftarget_hostentry.h"
diff --git a/src/utils/stats.cc b/src/utils/stats.cc
index 32e43df7e..75a1862b5 100644
--- a/src/utils/stats.cc
+++ b/src/utils/stats.cc
@@ -24,6 +24,7 @@
 #endif
 
 #include "util.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "helpers/process.h"
 #include "packet_io/sfdaq.h"
diff --git a/src/utils/util.cc b/src/utils/util.cc
index 9f09a00af..a13361fb7 100644
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -24,28 +24,16 @@
 #include "config.h"
 #endif
 
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fnmatch.h>
 #include <grp.h>
-#include <limits.h>
 #include <luajit.h>
 #include <netdb.h>
 #include <openssl/crypto.h>
 #include <pcap.h>
 #include <pcre.h>
 #include <pwd.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <unistd.h>
+#include <sys/file.h>
 #include <zlib.h>
 
-
 #ifdef HAVE_LZMA
 #include <lzma.h>
 #endif
@@ -54,21 +42,18 @@
 #include <hs_compile.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/resource.h>
+extern "C" {
+#include <daq.h>
+}
+
+#include <fstream>
+#include <sstream>
 
-#include "sflsq.h"
+#include "log/messages.h"
+#include "main/build.h"
 #include "main/snort_config.h"
 #include "main/snort_debug.h"
-#include "main/snort_types.h"
-#include "main/build.h"
-#include "parser/parser.h"
 #include "packet_io/sfdaq.h"
-#include "packet_io/active.h"
-#include "ips_options/ips_pcre.h"
-#include "time/packet_time.h"
-#include "time/timersub.h"
 
 #ifdef PATH_MAX
 #define PATH_MAX_UTIL PATH_MAX
@@ -126,6 +111,7 @@ int DisplayBanner()
     LogMessage("           Copyright (C) 2014-2016 Cisco and/or its affiliates."
                            " All rights reserved.\n");
     LogMessage("           Copyright (C) 1998-2013 Sourcefire, Inc., et al.\n");
+    LogMessage("           Using DAQ version %s\n", daq_version_string());
 #ifdef HAVE_PCAP_LIB_VERSION
     LogMessage("           Using %s\n", pcap_lib_version());
 #endif
diff --git a/src/utils/util.h b/src/utils/util.h
index 10265c471..52bb09b6e 100644
--- a/src/utils/util.h
+++ b/src/utils/util.h
@@ -30,15 +30,10 @@
 #include "config.h"
 #endif
 
-#include <sys/time.h>
-#include <sys/types.h>
-#include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <fstream>
-#include <sstream>
+#include <unistd.h>
 
 #if defined(__linux__)
 #include <sys/syscall.h>
@@ -47,7 +42,6 @@
 #include <string>
 
 #include "main/snort_types.h"
-#include "log/messages.h"
 
 #define SNORT_SNPRINTF_SUCCESS 0
 #define SNORT_SNPRINTF_TRUNCATION 1