src: move windows-specific includes out of suricata-common.h

Ticket: 945

src/output-filestore.c

@@ -30,6 +30,10 @@
 #include "util-path.h"
 #include "util-print.h"
 
+#ifdef OS_WIN32
+#include "win32-misc.h"
+#endif /* OS_WIN32 */
+
 #define MODULE_NAME "OutputFilestore"
 
 /* Create a filestore specific PATH_MAX that is less than the system

src/suricata-common.h

@@ -180,17 +180,8 @@ typedef unsigned char u_char;
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
-#else
-#ifdef OS_WIN32
-#include "win32-syslog.h"
-#endif /* OS_WIN32 */
 #endif /* HAVE_SYSLOG_H */
 
-#ifdef OS_WIN32
-#include "win32-misc.h"
-#include "win32-service.h"
-#endif /* OS_WIN32 */
-
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

src/suricata.c

@@ -30,7 +30,9 @@
 #if HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-#ifndef OS_WIN32
+#ifdef OS_WIN32
+#include "win32-service.h"
+#else
 #ifdef HAVE_SYS_RESOURCE_H
 // setrlimit
 #include <sys/resource.h>

src/util-pidfile.c

@@ -29,6 +29,9 @@
 #include "suricata-common.h"
 #include "util-pidfile.h"
 #include "util-debug.h"
+#ifdef OS_WIN32
+#include "win32-misc.h"
+#endif /* OS_WIN32 */
 
 /**
  * \brief Write a pid file (used at the startup)

src/util-syslog.h

@@ -27,6 +27,10 @@
 
 #include "util-enum.h"
 
+#ifdef OS_WIN32
+#include "win32-syslog.h"
+#endif /* OS_WIN32 */
+
 SCEnumCharMap *SCSyslogGetFacilityMap(void);
 SCEnumCharMap *SCSyslogGetLogLevelMap(void);