Remove some circular dependencies on wireshark.h

wsutil/win32-utils.c

@@ -15,8 +15,6 @@
 #include <tchar.h>
 #include <VersionHelpers.h>
 
-#include <wsutil/wslog.h>
-
 /* Quote the argument element if necessary, so that it will get
  * reconstructed correctly in the C runtime startup code.  Note that
  * the unquoting algorithm in the C runtime is really weird, and

wsutil/win32-utils.h

@@ -11,9 +11,8 @@
 #ifndef __WIN32UTIL_H__
 #define __WIN32UTIL_H__
 
-#include "ws_symbol_export.h"
+#include <wireshark.h>
 
-#include <glib.h>
 #include <windows.h>
 
 /**

wsutil/wmem/wmem_core.h

@@ -15,7 +15,7 @@
 #include <string.h>
 #include <glib.h>
 #include <ws_symbol_export.h>
-#include "ws_attributes.h"
+#include <ws_attributes.h>
 
 #ifdef __cplusplus
 extern "C" {

wsutil/wmem/wmem_strutl.h

@@ -12,7 +12,6 @@
 #ifndef __WMEM_STRUTL_H__
 #define __WMEM_STRUTL_H__
 
-#include <wireshark.h>
 #include <stdarg.h>
 
 #include "wmem_core.h"

wsutil/wslog.h

@@ -12,12 +12,15 @@
 #ifndef __WSLOG_H__
 #define __WSLOG_H__
 
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
-#include <time.h>
 #include <stdarg.h>
+#include <time.h>
 #include <glib.h>
 
-#include <wireshark.h>
+#include <ws_symbol_export.h>
+#include <ws_attributes.h>
 #include <ws_log_defs.h>
 
 #ifdef WS_LOG_DOMAIN