Use correct tag names for compatability with fwd decls.

include/commdlg.h

@@ -245,7 +245,7 @@ DECL_WINELIB_TYPE_AW(LPFINDREPLACE)
 
 typedef UINT (CALLBACK *LPCFHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
 
-typedef struct
+typedef struct tagCHOOSEFONTA
 {
 	UINT  	lStructSize;
 	HWND 		hwndOwner;
@@ -265,7 +265,7 @@ typedef struct
 	INT		nSizeMax;
 } CHOOSEFONTA, *LPCHOOSEFONTA;
 
-typedef struct
+typedef struct tagCHOOSEFONTW
 {
 	UINT  	lStructSize;
 	HWND 		hwndOwner;

include/winbase.h

@@ -673,7 +673,7 @@ typedef struct _SYSTEM_POWER_STATUS
 } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;
 
 
-typedef struct tagSYSTEM_INFO
+typedef struct _SYSTEM_INFO
 {
     union {
 	DWORD	dwOemId; /* Obsolete field - do not use */

include/windef.h

@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __WINE_WINDEF_H
-#define __WINE_WINDEF_H
+#ifndef _WINDEF_
+#define _WINDEF_
 
 #ifndef WINVER
 #define WINVER 0x0500
@@ -343,4 +343,4 @@ typedef const RECTL *LPCRECTL;
 }
 #endif
 
-#endif /* __WINE_WINDEF_H */
+#endif /* _WINDEF_ */

include/wingdi.h

@@ -516,7 +516,7 @@ typedef LOGBRUSH PATTERN, *PPATTERN, *LPPATTERN;
 #define DEVICE_FONTTYPE     0x0002
 #define TRUETYPE_FONTTYPE   0x0004
 
-typedef struct
+typedef struct tagLOGFONTA
 {
     LONG   lfHeight;
     LONG   lfWidth;
@@ -534,7 +534,7 @@ typedef struct
     CHAR   lfFaceName[LF_FACESIZE];
 } LOGFONTA, *PLOGFONTA, *LPLOGFONTA;
 
-typedef struct
+typedef struct tagLOGFONTW
 {
     LONG   lfHeight;
     LONG   lfWidth;
@@ -653,7 +653,7 @@ typedef struct
 #define OBJ_ENHMETAFILE     13
 #define OBJ_COLORSPACE      14
 
-typedef struct
+typedef struct tagXFORM
 {
     FLOAT  eM11;
     FLOAT  eM12;
@@ -773,7 +773,7 @@ typedef struct
 #ifndef _TEXTMETRIC_DEFINED
 #define _TEXTMETRIC_DEFINED
 
-typedef struct
+typedef struct tagTEXTMETRICA
 {
     LONG      tmHeight;
     LONG      tmAscent;
@@ -797,7 +797,7 @@ typedef struct
     BYTE      tmCharSet;
 } TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
 
-typedef struct
+typedef struct tagTEXTMETRICW
 {
     LONG      tmHeight;
     LONG      tmAscent;

include/winuser.h

@@ -1834,7 +1834,7 @@ typedef struct
 #define CURSOR_SHOWING 0x00000001
 
 /* this is the 6 byte accel struct used in Win32 when presented to the user */
-typedef struct
+typedef struct tagACCEL
 {
     BYTE   fVirt;
     WORD   key;

include/wtypes.h

@@ -219,7 +219,7 @@ typedef struct _FILETIME {
 #endif
 #ifndef _TEXTMETRIC_DEFINED
 #define _TEXTMETRIC_DEFINED
-typedef struct {
+typedef struct tagTEXTMETRICA {
     LONG tmHeight;
     LONG tmAscent;
     LONG tmDescent;
@@ -242,7 +242,7 @@ typedef struct {
     BYTE tmCharSet;
 } TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
 
-typedef struct {
+typedef struct tagTEXTMETRICW {
     LONG tmHeight;
     LONG tmAscent;
     LONG tmDescent;

include/wtypes.idl

@@ -220,7 +220,7 @@ cpp_quote("#endif")
 
 cpp_quote("#ifndef _TEXTMETRIC_DEFINED")
 cpp_quote("#define _TEXTMETRIC_DEFINED")
-typedef struct
+typedef struct tagTEXTMETRICA
 {
     LONG      tmHeight;
     LONG      tmAscent;
@@ -244,7 +244,7 @@ typedef struct
     BYTE      tmCharSet;
 } TEXTMETRICA, *LPTEXTMETRICA, *PTEXTMETRICA;
 
-typedef struct
+typedef struct tagTEXTMETRICW
 {
     LONG      tmHeight;
     LONG      tmAscent;