includes: minor cleanups

diff --git a/src/source-pcap-file-directory-helper.c b/src/source-pcap-file-directory-helper.c
index 07ad53e10982a16e936a21427ce0ec52e48bc383..43ccadf69772f4456be836c12317f759b592bb38 100644 (file)
--- a/src/source-pcap-file-directory-helper.c
+++ b/src/source-pcap-file-directory-helper.c
@@ -24,11 +24,11 @@
  */
 
 #include "source-pcap-file-directory-helper.h"
+#include "suricata.h"
 #include "runmode-unix-socket.h"
 #include "util-mem.h"
 #include "util-time.h"
 #include "source-pcap-file.h"
-#include "suricata.h"
 
 static void GetTime(struct timespec *tm);
 static void CopyTime(struct timespec *from, struct timespec *to);

diff --git a/src/source-pcap-file-helper.c b/src/source-pcap-file-helper.c
index 1594e77eeb4de1a1f1b7c0cd9bf4b7de6afdccf6..91341facfb2a616d7f2b784d572fcb0ef102e065 100644 (file)
--- a/src/source-pcap-file-helper.c
+++ b/src/source-pcap-file-helper.c
@@ -24,12 +24,12 @@
  */
 
 #include "source-pcap-file-helper.h"
+#include "suricata.h"
 #include "util-datalink.h"
 #include "util-checksum.h"
 #include "util-profiling.h"
 #include "source-pcap-file.h"
 #include "util-exception-policy.h"
-#include "suricata.h"
 
 extern int max_pending_packets;
 extern PcapFileGlobalVars pcap_g;

diff --git a/src/util-ioctl.h b/src/util-ioctl.h
index 7f12b42e2d58e8609577d7674bf61a299e4f3bf5..2d0c74740dd88b941c9ee1c33aa4a9b2f66296e3 100644 (file)
--- a/src/util-ioctl.h
+++ b/src/util-ioctl.h
@@ -24,9 +24,6 @@
 #include "suricata-common.h"
 #include "util-device.h"
 
-#ifdef OS_WIN32
-#endif
-
 int GetIfaceMTU(const char *pcap_dev);
 int GetIfaceMaxPacketSize(const char *pcap_dev);
 int GetIfaceOffloading(const char *dev, int csum, int other);

diff --git a/src/util-logopenfile.c b/src/util-logopenfile.c
index ae042af81c0b906082b0afac3e24ab83a2ad7937..d4616845865622a87688aa52a9b082ba75c56422 100644 (file)
--- a/src/util-logopenfile.c
+++ b/src/util-logopenfile.c
@@ -25,12 +25,12 @@
  */
 
 #include "suricata-common.h" /* errno.h, string.h, etc. */
+#include "util-logopenfile.h"
+#include "suricata.h"
 #include "conf.h"            /* ConfNode, etc. */
 #include "output.h"          /* DEFAULT_LOG_* */
 #include "util-byte.h"
-#include "util-logopenfile.h"
 #include "util-time.h"
-#include "suricata.h"
 
 #if defined(HAVE_SYS_UN_H) && defined(HAVE_SYS_SOCKET_H) && defined(HAVE_SYS_TYPES_H)
 #define BUILD_WITH_UNIXSOCKET