diff --git a/include/imagehlp.h b/include/imagehlp.h
index 8db86b62a6e7dcdee21cc91d28e771f779528df6..5d75b37af098c2428d1c3803c4bba70bbce50f43 100644
--- a/include/imagehlp.h
+++ b/include/imagehlp.h
@@ -90,7 +90,7 @@ typedef enum _ADRESS_MODE {
 #define SYMF_OMAP_GENERATED   0x00000001
 #define SYMF_OMAP_MODIFIED    0x00000002
 
-typedef enum _SYM_TYPE {
+typedef enum {
   SymNone,
   SymCoff,
   SymCv,
@@ -98,7 +98,7 @@ typedef enum _SYM_TYPE {
   SymExport,
   SymDeferred,
   SymSym        /* .sym file */
-} SYM_TYPE32;
+} SYM_TYPE;
 
 #define UNDNAME_COMPLETE               0x0000
 #define UNDNAME_NO_LEADING_UNDERSCORES 0x0001
@@ -245,7 +245,7 @@ typedef struct _IMAGEHLP_MODULE {
   DWORD      TimeDateStamp;
   DWORD      CheckSum;
   DWORD      NumSyms;
-  SYM_TYPE32 SymType;
+  SYM_TYPE   SymType;
   CHAR       ModuleName[32];
   CHAR       ImageName[256];
   CHAR       LoadedImageName[256];
diff --git a/include/winbase.h b/include/winbase.h
index 9b8ac1c60b9c67308730c4b75fbe9b28740d01bb..fdf8c80d059ed2c61a9752a868d2e9001edaec03 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1828,7 +1828,7 @@ BOOL        WINAPI WriteProcessMemory(HANDLE, LPVOID, LPVOID, DWORD, LPDWORD);
 BOOL        WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR);
 BOOL        WINAPI WriteProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR);
 #define     WriteProfileString WINELIB_NAME_AW(WriteProfileString)
-#define     Yield32()
+#define     Yield()
 LPSTR       WINAPI lstrcatA(LPSTR,LPCSTR);
 LPWSTR      WINAPI lstrcatW(LPWSTR,LPCWSTR);
 #define     lstrcat WINELIB_NAME_AW(lstrcat)