Rearrange syslog.h including so we won't fail to build on win32.

src/suricata-common.h

@@ -67,7 +67,7 @@
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
-#else
+#elif OS_WIN32
 #include "win32-syslog.h"
 #endif /* HAVE_SYSLOG_H */
 

src/util-debug.h

@@ -21,22 +21,17 @@
  * \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
+#ifndef __UTIL_DEBUG_H__
+#define __UTIL_DEBUG_H__
+
 #include <stdio.h>
-#include "threads.h"
 #include <stdint.h>
+#include <pcre.h>
 
+#include "threads.h"
 #include "util-enum.h"
 #include "util-error.h"
-#include "pcre.h"
 #include "util-debug-filters.h"
-#if defined __OpenBSD__
-//#include <sys/syslog.h>
-#else
-#include "syslog.h"
-#endif
-
-#ifndef __UTIL_DEBUG_H__
-#define __UTIL_DEBUG_H__
 
 /**
  * \brief ENV vars that can be used to set the properties for the logging module