From d7dde0c743ae93a7284a0d81245d8915c7e9b0af Mon Sep 17 00:00:00 2001
From: Philippe Antoine <pantoine@oisf.net>
Date: Sun, 4 Oct 2026 21:42:13 +0200
Subject: [PATCH] src: move windows-specific includes out of suricata-common.h

Ticket: 945
---
 src/output-filestore.c | 4 ++++
 src/suricata-common.h  | 9 ---------
 src/suricata.c         | 4 +++-
 src/util-pidfile.c     | 3 +++
 src/util-syslog.h      | 4 ++++
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/output-filestore.c b/src/output-filestore.c
index a5e2a3fa30..fb5759d0b2 100644
--- a/src/output-filestore.c
+++ b/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
diff --git a/src/suricata-common.h b/src/suricata-common.h
index d3080f0061..3bfe6a8f85 100644
--- a/src/suricata-common.h
+++ b/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
diff --git a/src/suricata.c b/src/suricata.c
index 2ab10b3d92..b18064fc80 100644
--- a/src/suricata.c
+++ b/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>
diff --git a/src/util-pidfile.c b/src/util-pidfile.c
index 201ad1c9f5..0238fd68d0 100644
--- a/src/util-pidfile.c
+++ b/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)
diff --git a/src/util-syslog.h b/src/util-syslog.h
index 473057a102..2173d4e859 100644
--- a/src/util-syslog.h
+++ b/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);