Moved some declarations from imagehlp.h to common include files.

include/imagehlp.h

@@ -6,44 +6,13 @@
 #define __WINE_IMAGEHLP_H
 
 #include "toolhelp.h"
+#include "winnt.h"
 #include "wintypes.h"
 
 /***********************************************************************
  * Types
  */
 
-#define ANYSIZE_ARRAY 1 /* FIXME: Move to wintypes.h */
-
-typedef unsigned char UCHAR; /* FIXME: Move to wintypes.h */
-typedef UCHAR *PUCHAR;  /* FIXME: Move to wintypes.h */
-typedef CHAR *PCHAR;  /* FIXME: Move to wintypes.h */
-typedef unsigned char boolean; /* FIXME: Move to wintypes.h */
-typedef boolean BOOLEAN; /* FIXME: Move to wintypes.h */
-typedef void *PVOID; /* FIXME: Move to wintypes.h */
-typedef DWORD *PDWORD; /* FIXME: Move to wintypes.h */
-typedef BYTE *PBYTE; /* FIXME: Move to wintypes.h */
-typedef ULONG *PULONG; /* FIXME: Move to wintypes.h */
-typedef unsigned short USHORT; /* FIXME: Move to wintypes.h */
-typedef const void *PCVOID; /* FIXME: Move to wintypes.h */
-typedef UINT32 *PUINT32; /* FIXME: Move to wintypes.h */
-
-typedef struct _LIST_ENTRY32 {
-  struct _LIST_ENTRY32 *Flink;
-  struct _LIST_ENTRY32 *Blink;
-} LIST_ENTRY32, *PLIST_ENTRY32; /* FIXME: Move to wintypes.h */
-
-typedef struct _SINGLE_LIST_ENTRY32 {
-  struct _SINGLE_LIST_ENTRY32 *Next;
-} SINGLE_LIST_ENTRY32, *PSINGLE_LIST_ENTRY32; /* FIXME: Move to wintypes.h */
-
-/* FIXME: Move to wintypes.h */
-#define FIELD_OFFSET(type, field) \
-  ((LONG)(INT32)&(((type *)0)->field))
-
-/* FIXME: Move to wintypes.h */
-#define CONTAINING_RECORD(address, type, field) \
-  ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field)))
-
 typedef PVOID DIGEST_HANDLE32; 
 
 /***********************************************************************

include/winnt.h

@@ -7,9 +7,32 @@
 #ifndef __WINE_WINNT_H
 #define __WINE_WINNT_H
 
-#include "wintypes.h"
 #include "windows.h"
 
+/* Defines */
+
+#define ANYSIZE_ARRAY 1
+
+#define FIELD_OFFSET(type, field) \
+  ((LONG)(INT32)&(((type *)0)->field))
+
+#define CONTAINING_RECORD(address, type, field) \
+  ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field)))
+
+/* Types */
+
+typedef BYTE     BOOLEAN;
+typedef BOOLEAN *PBOOLEAN;
+
+typedef struct _LIST_ENTRY32 {
+  struct _LIST_ENTRY32 *Flink;
+  struct _LIST_ENTRY32 *Blink;
+} LIST_ENTRY32, *PLIST_ENTRY32;
+
+typedef struct _SINGLE_LIST_ENTRY32 {
+  struct _SINGLE_LIST_ENTRY32 *Next;
+} SINGLE_LIST_ENTRY32, *PSINGLE_LIST_ENTRY32;
+
 /* Heap flags */
 
 #define HEAP_NO_SERIALIZE               0x00000001

include/wintypes.h

@@ -80,7 +80,9 @@ typedef unsigned long   DWORD;
 typedef unsigned long   ULONG;
 typedef unsigned char   BYTE;
 typedef long            LONG;
+typedef unsigned short  USHORT;
 typedef char            CHAR;
+typedef unsigned char   UCHAR;
 /* Some systems might have wchar_t, but we really need 16 bit characters */
 typedef unsigned short  WCHAR;
 typedef unsigned short  BOOL16;
@@ -109,7 +111,17 @@ typedef DWORD           LCTYPE;
 typedef float           FLOAT;
 
 /* Pointers types. These are the same for emulator and library. */
-
+/* winnt types */
+typedef void           *PVOID;
+typedef const void     *PCVOID;
+typedef CHAR           *PCHAR;
+typedef UCHAR          *PUCHAR;
+typedef BYTE           *PBYTE;
+typedef ULONG          *PULONG;
+typedef LONG           *PLONG;
+typedef DWORD          *PDWORD;
+typedef UINT32         *PUINT32;
+/* common win32 types */
 typedef CHAR           *LPSTR;
 typedef const CHAR     *LPCSTR;
 typedef WCHAR          *LPWSTR;