util/mem: reduce scope of win32 specific include

src/decode.h

@@ -29,6 +29,7 @@
 
 #include "suricata-common.h"
 #include "threadvars.h"
+#include "util-debug.h"
 #include "decode-events.h"
 #include "flow-worker.h"
 

src/util-mem.c

@@ -19,6 +19,10 @@
 #include "suricata.h"
 #include "util-atomic.h"
 
+#if defined(_WIN32) || defined(__WIN32)
+#include <mm_malloc.h>
+#endif
+
 SC_ATOMIC_EXTERN(unsigned int, engine_stage);
 
 void *SCMallocFunc(const size_t sz)

src/util-mem.h

@@ -43,10 +43,6 @@
 #else /* CPPCHECK */
 
 
-#if defined(_WIN32) || defined(__WIN32)
-#include "mm_malloc.h"
-#endif
-
 void *SCMallocFunc(const size_t sz);
 #define SCMalloc(sz) SCMallocFunc((sz))
 

src/win32-service.c

@@ -28,6 +28,7 @@
 #include "suricata-common.h"
 #include "suricata.h"
 #include "win32-service.h"
+#include "util-debug.h"
 
 static SERVICE_STATUS_HANDLE service_status_handle = 0;
 

src/win32-syscall.c

@@ -51,6 +51,7 @@
 #undef _snprintf
 #define _snprintf StringCbPrintfA
 
+#include "suricata-common.h"
 #include "util-debug.h"
 #include "util-device.h"
 #include "util-mem.h"