Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a

capital letter are reserved for the system, those starting with _ are
reserved at the file level.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25822 b3059339-0415-0410-9bf9-f77b7e298cf2

13 files changed, 223 insertions, 223 deletions

diff --git a/loader/wine/debugtools.h b/loader/wine/debugtools.h
index d9ab591412..3afee5c3eb 100644
--- a/loader/wine/debugtools.h
+++ b/loader/wine/debugtools.h
@@ -6,39 +6,40 @@
 #include "config.h"
 #include "windef.h"
 
-struct _GUID;
+struct GUID;
 
 /* Internal definitions (do not use these directly) */
 
-enum __DEBUG_CLASS { __DBCL_FIXME, __DBCL_ERR, __DBCL_WARN, __DBCL_TRACE, __DBCL_COUNT };
+enum DEBUG_CLASS { DBCL_FIXME, DBCL_ERR, DBCL_WARN, DBCL_TRACE, DBCL_COUNT };
 
 #ifndef NO_TRACE_MSGS
-# define __GET_DEBUGGING_trace(dbch) ((dbch)[0] & (1 << __DBCL_TRACE))
+# define GET_DEBUGGING_trace(dbch) ((dbch)[0] & (1 << DBCL_TRACE))
 #else
-# define __GET_DEBUGGING_trace(dbch) 0
+# define GET_DEBUGGING_trace(dbch) 0
 #endif
 
 #ifndef NO_DEBUG_MSGS
-# define __GET_DEBUGGING_warn(dbch)  ((dbch)[0] & (1 << __DBCL_WARN))
-# define __GET_DEBUGGING_fixme(dbch) ((dbch)[0] & (1 << __DBCL_FIXME))
+# define GET_DEBUGGING_warn(dbch)  ((dbch)[0] & (1 << DBCL_WARN))
+# define GET_DEBUGGING_fixme(dbch) ((dbch)[0] & (1 << DBCL_FIXME))
 #else
-# define __GET_DEBUGGING_warn(dbch)  0
-# define __GET_DEBUGGING_fixme(dbch) 0
+# define GET_DEBUGGING_warn(dbch)  0
+# define GET_DEBUGGING_fixme(dbch) 0
 #endif
 
 /* define error macro regardless of what is configured */
-#define __GET_DEBUGGING_err(dbch)  ((dbch)[0] & (1 << __DBCL_ERR))
+#define GET_DEBUGGING_err(dbch)  ((dbch)[0] & (1 << DBCL_ERR))
 
-#define __GET_DEBUGGING(dbcl,dbch)  __GET_DEBUGGING_##dbcl(dbch)
-#define __SET_DEBUGGING(dbcl,dbch,on) \
+#define GET_DEBUGGING(dbcl,dbch)  GET_DEBUGGING_##dbcl(dbch)
+#define SET_DEBUGGING(dbcl,dbch,on) \
     ((on) ? ((dbch)[0] |= 1 << (dbcl)) : ((dbch)[0] &= ~(1 << (dbcl))))
 
 #ifndef __GNUC__
 #define __FUNCTION__ ""
 #endif
 
-#define __DPRINTF(dbcl,dbch) \
-  (!__GET_DEBUGGING(dbcl,(dbch)) || (dbg_header_##dbcl((dbch),__FUNCTION__),0)) ? \
+// illegal identifier
+#define DPRINTF__(dbcl,dbch) \
+  (!GET_DEBUGGING(dbcl,(dbch)) || (dbg_header_##dbcl((dbch),__FUNCTION__),0)) ? \
      (void)0 : (void)dbg_printf
 
 /* Exported definitions and macros */
@@ -50,7 +51,7 @@ extern LPCSTR debugstr_an (LPCSTR s, int n);
 extern LPCSTR debugstr_wn (LPCWSTR s, int n);
 extern LPCSTR debugres_a (LPCSTR res);
 extern LPCSTR debugres_w (LPCWSTR res);
-extern LPCSTR debugstr_guid( const struct _GUID *id );
+extern LPCSTR debugstr_guid( const struct GUID *id );
 extern LPCSTR debugstr_hex_dump (const void *ptr, int len);
 extern int dbg_header_err( const char *dbg_channel, const char *func );
 extern int dbg_header_warn( const char *dbg_channel, const char *func );
diff --git a/loader/wine/ldt.h b/loader/wine/ldt.h
index 0304ccbf9a..b750302540 100644
--- a/loader/wine/ldt.h
+++ b/loader/wine/ldt.h
@@ -48,11 +48,11 @@ typedef struct
 
 extern ldt_copy_entry ldt_copy[LDT_SIZE];
 
-#define __AHSHIFT  3  /* don't change! */
-#define __AHINCR   (1 << __AHSHIFT)
+#define AHSHIFT  3  /* don't change! */
+#define AHINCR   (1 << AHSHIFT)
 
-#define SELECTOR_TO_ENTRY(sel)  (((int)(sel) & 0xffff) >> __AHSHIFT)
-#define ENTRY_TO_SELECTOR(i)    ((i) ? (((int)(i) << __AHSHIFT) | 7) : 0)
+#define SELECTOR_TO_ENTRY(sel)  (((int)(sel) & 0xffff) >> AHSHIFT)
+#define ENTRY_TO_SELECTOR(i)    ((i) ? (((int)(i) << AHSHIFT) | 7) : 0)
 #define IS_LDT_ENTRY_FREE(i)    (!(ldt_flags_copy[(i)] & LDT_FLAGS_ALLOCATED))
 #define IS_SELECTOR_FREE(sel)   (IS_LDT_ENTRY_FREE(SELECTOR_TO_ENTRY(sel)))
 #define GET_SEL_BASE(sel)       (ldt_copy[SELECTOR_TO_ENTRY(sel)].base)
@@ -67,7 +67,7 @@ extern ldt_copy_entry ldt_copy[LDT_SIZE];
 #define PTR_SEG_OFF_TO_SEGPTR(seg,off) \
    ((SEGPTR)MAKELONG(off,seg))
 #define PTR_SEG_OFF_TO_HUGEPTR(seg,off) \
-   PTR_SEG_OFF_TO_SEGPTR( (seg) + (HIWORD(off) << __AHSHIFT), LOWORD(off) )
+   PTR_SEG_OFF_TO_SEGPTR( (seg) + (HIWORD(off) << AHSHIFT), LOWORD(off) )
 
 #define W32S_APPLICATION() (PROCESS_Current()->flags & PDB32_WIN32S_PROC)
 #define W32S_OFFSET 0x10000
diff --git a/loader/wine/mmreg.h b/loader/wine/mmreg.h
index 95efea5285..1ac50c782c 100644
--- a/loader/wine/mmreg.h
+++ b/loader/wine/mmreg.h
@@ -14,26 +14,26 @@
  * Defines/Enums
  */
 
-#ifndef _ACM_WAVEFILTER
-#define _ACM_WAVEFILTER
+#ifndef ACM_WAVEFILTER
+#define ACM_WAVEFILTER
 
 #include "windef.h"
 
 #define WAVE_FILTER_UNKNOWN     0x0000
 #define WAVE_FILTER_DEVELOPMENT 0xFFFF
 
-typedef struct __attribute__((__packed__)) _WAVEFILTER {
+typedef struct __attribute__((__packed__)) WAVEFILTER {
   DWORD   cbStruct;
   DWORD   dwFilterTag;
   DWORD   fdwFilter;
   DWORD   dwReserved[5];
 } WAVEFILTER, *PWAVEFILTER, *NPWAVEFILTER, *LPWAVEFILTER;
-#endif /* _ACM_WAVEFILTER */
+#endif /* ACM_WAVEFILTER */
 
 #ifndef WAVE_FILTER_VOLUME
 #define WAVE_FILTER_VOLUME      0x0001
 
-typedef struct __attribute__((__packed__)) _WAVEFILTER_VOLUME {
+typedef struct __attribute__((__packed__)) WAVEFILTER_VOLUME {
    WAVEFILTER      wfltr;
    DWORD           dwVolume;
 } VOLUMEWAVEFILTER, *PVOLUMEWAVEFILTER, *NPVOLUMEWAVEFILTER, *LPVOLUMEWAVEFILTER;
@@ -51,7 +51,7 @@ typedef struct __attribute__((__packed__)) WAVEFILTER_ECHO {
     
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
-typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
+typedef struct __attribute__((__packed__)) WAVEFORMATEX {
   WORD   wFormatTag;
   WORD   nChannels;
   DWORD  nSamplesPerSec;
diff --git a/loader/wine/module.h b/loader/wine/module.h
index 0ff8396f8e..6954d9c5ed 100644
--- a/loader/wine/module.h
+++ b/loader/wine/module.h
@@ -82,10 +82,10 @@ typedef enum {
 	MODULE32_ELFDLL
 } MODULE32_TYPE;
 
-typedef struct _wine_modref
+typedef struct wine_modref
 {
-	struct _wine_modref	*next;
-	struct _wine_modref	*prev;
+	struct wine_modref	*next;
+	struct wine_modref	*prev;
 	MODULE32_TYPE		type;
 	union {
 		PE_MODREF	pe;
@@ -95,7 +95,7 @@ typedef struct _wine_modref
 	HMODULE			module;
 
 	int			nDeps;
-	struct _wine_modref	**deps;
+	struct wine_modref	**deps;
 
 	int			flags;
 	int			refCount;
diff --git a/loader/wine/msacm.h b/loader/wine/msacm.h
index 730e4ed9f4..5bc8b079e3 100644
--- a/loader/wine/msacm.h
+++ b/loader/wine/msacm.h
@@ -242,7 +242,7 @@ typedef UINT16 CALLBACK ( *ACMFORMATCHOOSEHOOKPROC16)(
  * Structures
  */
 
-typedef struct _ACMDRIVERDETAILSA
+typedef struct ACMDRIVERDETAILSA
 {
   DWORD    cbStruct;
 
@@ -268,7 +268,7 @@ typedef struct _ACMDRIVERDETAILSA
   CHAR     szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
 } ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA;
 
-typedef struct _ACMDRIVERDETAILSW
+typedef struct ACMDRIVERDETAILSW
 {
   DWORD    cbStruct;
 
@@ -294,7 +294,7 @@ typedef struct _ACMDRIVERDETAILSW
   WCHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
 } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW;
 
-typedef struct _ACMDRIVERDETAILS16
+typedef struct ACMDRIVERDETAILS16
 {
   DWORD   cbStruct;
 
@@ -320,7 +320,7 @@ typedef struct _ACMDRIVERDETAILS16
   CHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
 } ACMDRIVERDETAILS16, *NPACMDRIVERDETAILS16, *LPACMDRIVERDETAILS16;
 
-typedef struct _ACMFILTERCHOOSEA
+typedef struct ACMFILTERCHOOSEA
 {
   DWORD         cbStruct;
   DWORD         fdwStyle;
@@ -346,7 +346,7 @@ typedef struct _ACMFILTERCHOOSEA
   ACMFILTERCHOOSEHOOKPROCA pfnHook;
 } ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA;
 
-typedef struct _ACMFILTERCHOOSEW
+typedef struct ACMFILTERCHOOSEW
 {
   DWORD         cbStruct;
   DWORD         fdwStyle;
@@ -372,7 +372,7 @@ typedef struct _ACMFILTERCHOOSEW
   ACMFILTERCHOOSEHOOKPROCW pfnHook;
 } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW;
 
-typedef struct _ACMFILTERCHOOSE16
+typedef struct ACMFILTERCHOOSE16
 {
   DWORD          cbStruct;
   DWORD          fdwStyle;
@@ -398,7 +398,7 @@ typedef struct _ACMFILTERCHOOSE16
   ACMFILTERCHOOSEHOOKPROC16 pfnHook;
 } ACMFILTERCHOOSE16, *NPACMFILTERCHOOSE16, *LPACMFILTERCHOOSE16;
 
-typedef struct _ACMFILTERDETAILSA
+typedef struct ACMFILTERDETAILSA
 {
   DWORD           cbStruct;
   DWORD           dwFilterIndex;
@@ -409,7 +409,7 @@ typedef struct _ACMFILTERDETAILSA
   CHAR            szFilter[ACMFILTERDETAILS_FILTER_CHARS];
 } ACMFILTERDETAILSA, *PACMFILTERDETAILSA;
 
-typedef struct _ACMFILTERDETAILSW
+typedef struct ACMFILTERDETAILSW
 {
   DWORD          cbStruct;
   DWORD          dwFilterIndex;
@@ -420,7 +420,7 @@ typedef struct _ACMFILTERDETAILSW
   WCHAR          szFilter[ACMFILTERDETAILS_FILTER_CHARS];
 } ACMFILTERDETAILSW, *PACMFILTERDETAILSW;
 
-typedef struct _ACMFILTERDETAILS16
+typedef struct ACMFILTERDETAILS16
 {
   DWORD          cbStruct;
   DWORD          dwFilterIndex;
@@ -431,7 +431,7 @@ typedef struct _ACMFILTERDETAILS16
   CHAR           szFilter[ACMFILTERDETAILS_FILTER_CHARS];
 } ACMFILTERDETAILS16, *NPACMFILTERDETAILS16, *LPACMFILTERDETAILS16;
 
-typedef struct _ACMFILTERTAGDETAILSA
+typedef struct ACMFILTERTAGDETAILSA
 {
   DWORD cbStruct;
   DWORD dwFilterTagIndex;
@@ -442,7 +442,7 @@ typedef struct _ACMFILTERTAGDETAILSA
   CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
 } ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA;
 
-typedef struct _ACMFILTERTAGDETAILSW
+typedef struct ACMFILTERTAGDETAILSW
 {
   DWORD cbStruct;
   DWORD dwFilterTagIndex;
@@ -453,7 +453,7 @@ typedef struct _ACMFILTERTAGDETAILSW
   WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
 } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW;
 
-typedef struct _ACMFILTERTAGDETAILS16
+typedef struct ACMFILTERTAGDETAILS16
 {
   DWORD cbStruct;
   DWORD dwFilterTagIndex;
@@ -464,7 +464,7 @@ typedef struct _ACMFILTERTAGDETAILS16
   CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
 } ACMFILTERTAGDETAILS16, *NPACMFILTERTAGDETAILS16, *LPACMFILTERTAGDETAILS16;
 
-typedef struct _ACMFORMATCHOOSEA
+typedef struct ACMFORMATCHOOSEA
 {
   DWORD           cbStruct;
   DWORD           fdwStyle;
@@ -490,7 +490,7 @@ typedef struct _ACMFORMATCHOOSEA
   ACMFORMATCHOOSEHOOKPROCA pfnHook;
 } ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA;
 
-typedef struct _ACMFORMATCHOOSEW
+typedef struct ACMFORMATCHOOSEW
 {
   DWORD           cbStruct;
   DWORD           fdwStyle;
@@ -516,7 +516,7 @@ typedef struct _ACMFORMATCHOOSEW
   ACMFORMATCHOOSEHOOKPROCW pfnHook;
 } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW;
 
-typedef struct _ACMFORMATCHOOSE16
+typedef struct ACMFORMATCHOOSE16
 {
   DWORD            cbStruct;
   DWORD            fdwStyle;
@@ -542,7 +542,7 @@ typedef struct _ACMFORMATCHOOSE16
   ACMFORMATCHOOSEHOOKPROC16 pfnHook;
 } ACMFORMATCHOOSE16, *NPACMFORMATCHOOSE16, *LPACMFORMATCHOOSE16;
 
-typedef struct _ACMFORMATDETAILSA
+typedef struct ACMFORMATDETAILSA
 {
   DWORD           cbStruct;
   DWORD           dwFormatIndex;
@@ -553,7 +553,7 @@ typedef struct _ACMFORMATDETAILSA
   CHAR            szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILSA, *PACMFORMATDETAILSA;
 
-typedef struct _ACMFORMATDETAILSW
+typedef struct ACMFORMATDETAILSW
 {
     DWORD           cbStruct;
     DWORD           dwFormatIndex;
@@ -564,7 +564,7 @@ typedef struct _ACMFORMATDETAILSW
     WCHAR           szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILSW, *PACMFORMATDETAILSW;
 
-typedef struct _ACMFORMATDETAILS16
+typedef struct ACMFORMATDETAILS16
 {
     DWORD            cbStruct;
     DWORD            dwFormatIndex;
@@ -575,7 +575,7 @@ typedef struct _ACMFORMATDETAILS16
     CHAR             szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILS16, *NPACMFORMATDETAILS16, *LPACMFORMATDETAILS16;
 
-typedef struct _ACMFORMATTAGDETAILSA
+typedef struct ACMFORMATTAGDETAILSA
 {
   DWORD cbStruct;
   DWORD dwFormatTagIndex;
@@ -586,7 +586,7 @@ typedef struct _ACMFORMATTAGDETAILSA
   CHAR  szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
 } ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA;
 
-typedef struct _ACMFORMATTAGDETAILSW
+typedef struct ACMFORMATTAGDETAILSW
 {
   DWORD cbStruct;
   DWORD dwFormatTagIndex;
@@ -597,7 +597,7 @@ typedef struct _ACMFORMATTAGDETAILSW
   WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
 } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW;
 
-typedef struct _ACMFORMATTAGDETAILS16
+typedef struct ACMFORMATTAGDETAILS16
 {
   DWORD cbStruct;
   DWORD dwFormatTagIndex;
@@ -608,7 +608,7 @@ typedef struct _ACMFORMATTAGDETAILS16
   CHAR  szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
 } ACMFORMATTAGDETAILS16, *NPACMFORMATTAGDETAILS16, *LPACMFORMATTAGDETAILS16;
 
-typedef struct _ACMSTREAMHEADER
+typedef struct ACMSTREAMHEADER
 {
   DWORD  cbStruct;
   DWORD  fdwStatus;
diff --git a/loader/wine/msacmdrv.h b/loader/wine/msacmdrv.h
index 7d867ed26b..c9cadef04e 100644
--- a/loader/wine/msacmdrv.h
+++ b/loader/wine/msacmdrv.h
@@ -47,7 +47,7 @@
  * Structures
  */
 
-typedef struct _ACMDRVOPENDESCA
+typedef struct ACMDRVOPENDESCA
 {
   DWORD  cbStruct;
   FOURCC fccType;
@@ -60,7 +60,7 @@ typedef struct _ACMDRVOPENDESCA
   DWORD  dnDevNode;
 } ACMDRVOPENDESCA, *PACMDRVOPENDESCA;
 
-typedef struct _ACMDRVOPENDESCW
+typedef struct ACMDRVOPENDESCW
 {
   DWORD   cbStruct;
   FOURCC  fccType;
@@ -73,7 +73,7 @@ typedef struct _ACMDRVOPENDESCW
   DWORD   dnDevNode;
 } ACMDRVOPENDESCW, *PACMDRVOPENDESCW;
 
-typedef struct _ACMDRVOPENDESC16
+typedef struct ACMDRVOPENDESC16
 {
   DWORD  cbStruct;
   FOURCC fccType;
@@ -86,7 +86,7 @@ typedef struct _ACMDRVOPENDESC16
   DWORD  dnDevNode;
 } ACMDRVOPENDESC16, *NPACMDRVOPENDESC16, *LPACMDRVOPENDESC16;
 
-typedef struct _ACMDRVSTREAMINSTANCE16
+typedef struct ACMDRVSTREAMINSTANCE16
 {
   DWORD            cbStruct;
   LPWAVEFORMATEX   pwfxSrc;
@@ -100,7 +100,7 @@ typedef struct _ACMDRVSTREAMINSTANCE16
   HACMSTREAM16     has;
 } ACMDRVSTREAMINSTANCE16, *NPACMDRVSTREAMINSTANCE16, *LPACMDRVSTREAMINSTANCE16;
 
-typedef struct _ACMDRVSTREAMINSTANCE
+typedef struct ACMDRVSTREAMINSTANCE
 {
   DWORD           cbStruct;
   PWAVEFORMATEX   pwfxSrc;
@@ -115,8 +115,8 @@ typedef struct _ACMDRVSTREAMINSTANCE
 } ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE;
 
 
-typedef struct _ACMDRVSTREAMHEADER16 *LPACMDRVSTREAMHEADER16;
-typedef struct _ACMDRVSTREAMHEADER16 {
+typedef struct ACMDRVSTREAMHEADER16 *LPACMDRVSTREAMHEADER16;
+typedef struct ACMDRVSTREAMHEADER16 {
   DWORD  cbStruct;
   DWORD  fdwStatus;
   DWORD  dwUser;
@@ -143,8 +143,8 @@ typedef struct _ACMDRVSTREAMHEADER16 {
   DWORD  cbPreparedDstLength;
 } ACMDRVSTREAMHEADER16, *NPACMDRVSTREAMHEADER16;
 
-typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER;
-typedef struct _ACMDRVSTREAMHEADER {
+typedef struct ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER;
+typedef struct ACMDRVSTREAMHEADER {
   DWORD  cbStruct;
   DWORD  fdwStatus;
   DWORD  dwUser;
@@ -171,7 +171,7 @@ typedef struct _ACMDRVSTREAMHEADER {
   DWORD  cbPreparedDstLength;
 } ACMDRVSTREAMHEADER;
 
-typedef struct _ACMDRVSTREAMSIZE
+typedef struct ACMDRVSTREAMSIZE
 {
   DWORD cbStruct;
   DWORD fdwSize;
@@ -180,7 +180,7 @@ typedef struct _ACMDRVSTREAMSIZE
 } ACMDRVSTREAMSIZE16, *NPACMDRVSTREAMSIZE16, *LPACMDRVSTREAMSIZE16,
   ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE;
 
-typedef struct _ACMDRVFORMATSUGGEST16
+typedef struct ACMDRVFORMATSUGGEST16
 {
   DWORD            cbStruct;
   DWORD            fdwSuggest;
@@ -190,7 +190,7 @@ typedef struct _ACMDRVFORMATSUGGEST16
   DWORD            cbwfxDst;
 } ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST;
 
-typedef struct _ACMDRVFORMATSUGGEST
+typedef struct ACMDRVFORMATSUGGEST
 {
   DWORD           cbStruct;
   DWORD           fdwSuggest;
diff --git a/loader/wine/ntdef.h b/loader/wine/ntdef.h
index 0ee20f5c59..734fb65b6d 100644
--- a/loader/wine/ntdef.h
+++ b/loader/wine/ntdef.h
@@ -40,19 +40,19 @@ typedef WCHAR * PWCHAR;
  * If they are zero terminated, Length does not include the terminating 0.
  */
 
-typedef struct _STRING {
+typedef struct STRING {
 	USHORT	Length;
 	USHORT	MaximumLength;
 	PSTR	Buffer;
 } STRING,*PSTRING,ANSI_STRING,*PANSI_STRING;
 
-typedef struct _CSTRING {
+typedef struct CSTRING {
 	USHORT	Length;
 	USHORT	MaximumLength;
 	PCSTR	Buffer;
 } CSTRING,*PCSTRING;
 
-typedef struct _UNICODE_STRING {
+typedef struct UNICODE_STRING {
 	USHORT	Length;		/* bytes */
 	USHORT	MaximumLength;	/* bytes */
 	PWSTR	Buffer;
@@ -71,7 +71,7 @@ typedef struct _UNICODE_STRING {
 #define OBJ_KERNEL_HANDLE       0x00000200L
 #define OBJ_VALID_ATTRIBUTES    0x000003F2L
 
-typedef struct _OBJECT_ATTRIBUTES 
+typedef struct OBJECT_ATTRIBUTES
 {   ULONG Length;
     HANDLE RootDirectory;
     PUNICODE_STRING ObjectName;
diff --git a/loader/wine/pe_image.h b/loader/wine/pe_image.h
index e7f924de80..f8d0139d3a 100644
--- a/loader/wine/pe_image.h
+++ b/loader/wine/pe_image.h
@@ -24,22 +24,22 @@ typedef struct {
 	int				tlsindex;
 } PE_MODREF;
 
-struct _wine_modref;
+struct wine_modref;
 extern int PE_unloadImage(HMODULE hModule);
-extern FARPROC PE_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName, WIN_BOOL snoop);
+extern FARPROC PE_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName, WIN_BOOL snoop);
 extern WIN_BOOL PE_EnumResourceTypesA(HMODULE,ENUMRESTYPEPROCA,LONG);
 extern WIN_BOOL PE_EnumResourceTypesW(HMODULE,ENUMRESTYPEPROCW,LONG);
 extern WIN_BOOL PE_EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROCA,LONG);
 extern WIN_BOOL PE_EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROCW,LONG);
 extern WIN_BOOL PE_EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG);
 extern WIN_BOOL PE_EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG);
-extern HRSRC PE_FindResourceExW(struct _wine_modref*,LPCWSTR,LPCWSTR,WORD);
+extern HRSRC PE_FindResourceExW(struct wine_modref*, LPCWSTR, LPCWSTR, WORD);
 extern DWORD PE_SizeofResource(HMODULE,HRSRC);
-extern struct _wine_modref *PE_LoadLibraryExA(LPCSTR, DWORD);
-extern void PE_UnloadLibrary(struct _wine_modref *);
-extern HGLOBAL PE_LoadResource(struct _wine_modref *wm,HRSRC);
+extern struct wine_modref *PE_LoadLibraryExA(LPCSTR, DWORD);
+extern void PE_UnloadLibrary(struct wine_modref *);
+extern HGLOBAL PE_LoadResource(struct wine_modref *wm, HRSRC);
 extern HMODULE PE_LoadImage( int hFile, LPCSTR filename, WORD *version );
-extern struct _wine_modref *PE_CreateModule( HMODULE hModule, LPCSTR filename,
+extern struct wine_modref *PE_CreateModule( HMODULE hModule, LPCSTR filename,
                                              DWORD flags, WIN_BOOL builtin );
 extern WIN_BOOL PE_CreateProcess( HANDLE hFile, LPCSTR filename, LPCSTR cmd_line, LPCSTR env, 
                               LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
@@ -47,7 +47,7 @@ extern WIN_BOOL PE_CreateProcess( HANDLE hFile, LPCSTR filename, LPCSTR cmd_line
                               LPPROCESS_INFORMATION info );
 
 extern void PE_InitTls(void);
-extern WIN_BOOL PE_InitDLL(struct _wine_modref *wm, DWORD type, LPVOID lpReserved);
+extern WIN_BOOL PE_InitDLL(struct wine_modref *wm, DWORD type, LPVOID lpReserved);
 
 extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryA(PIMAGE_RESOURCE_DIRECTORY,LPCSTR,DWORD,WIN_BOOL);
 extern PIMAGE_RESOURCE_DIRECTORY GetResDirEntryW(PIMAGE_RESOURCE_DIRECTORY,LPCWSTR,DWORD,WIN_BOOL);
@@ -74,8 +74,8 @@ typedef struct {
 	ELF_STDCALL_STUB	*stubs;
 } ELF_MODREF;
 
-extern struct _wine_modref *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags);
-extern void ELF_UnloadLibrary(struct _wine_modref *);
-extern FARPROC ELF_FindExportedFunction(struct _wine_modref *wm, LPCSTR funcName);
+extern struct wine_modref *ELF_LoadLibraryExA( LPCSTR libname, DWORD flags);
+extern void ELF_UnloadLibrary(struct wine_modref *);
+extern FARPROC ELF_FindExportedFunction(struct wine_modref *wm, LPCSTR funcName);
 
 #endif /* WINE_PE_IMAGE_H */
diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h
index 489674e622..4b50055798 100644
--- a/loader/wine/vfw.h
+++ b/loader/wine/vfw.h
@@ -502,7 +502,7 @@ long VFWAPIV ICDraw(HIC hic,long dwFlags,void* lpFormat,void* lpData,long cbData
 
 #define	AVIGETFRAMEF_BESTDISPLAYFMT	1
 
-typedef struct _AVISTREAMINFOA {
+typedef struct AVISTREAMINFOA {
     long	fccType;
     long	fccHandler;
     long	dwFlags;        /* AVIIF_* */
@@ -523,7 +523,7 @@ typedef struct _AVISTREAMINFOA {
     char	szName[64];
 } AVISTREAMINFOA, * LPAVISTREAMINFOA, *PAVISTREAMINFOA;
 
-typedef struct _AVISTREAMINFOW {
+typedef struct AVISTREAMINFOW {
     long	fccType;
     long	fccHandler;
     long	dwFlags;
@@ -563,7 +563,7 @@ DECL_WINELIB_TYPE_AW(PAVISTREAMINFO)
 #define AVIFILECAPS_ALLKEYFRAMES	0x00000010
 #define AVIFILECAPS_NOCOMPRESSION	0x00000020
 
-typedef struct _AVIFILEINFOW {
+typedef struct AVIFILEINFOW {
     long               dwMaxBytesPerSec;
     long               dwFlags;
     long               dwCaps;
@@ -578,7 +578,7 @@ typedef struct _AVIFILEINFOW {
     short               szFileType[64];
 } AVIFILEINFOW, * LPAVIFILEINFOW, *PAVIFILEINFOW;
 
-typedef struct _AVIFILEINFOA {
+typedef struct AVIFILEINFOA {
     long               dwMaxBytesPerSec;
     long               dwFlags;
     long               dwCaps;
diff --git a/loader/wine/winbase.h b/loader/wine/winbase.h
index 39517f853f..297aeb5bed 100644
--- a/loader/wine/winbase.h
+++ b/loader/wine/winbase.h
@@ -33,18 +33,18 @@ typedef DWORD CALLBACK (*LPTHREAD_START_ROUTINE)(LPVOID);
 #define OUTPUT_DEBUG_STRING_EVENT   8
 #define RIP_EVENT                   9
 
-typedef struct _EXCEPTION_DEBUG_INFO {
+typedef struct EXCEPTION_DEBUG_INFO {
     EXCEPTION_RECORD ExceptionRecord;
     DWORD dwFirstChance;
 } EXCEPTION_DEBUG_INFO;
 
-typedef struct _CREATE_THREAD_DEBUG_INFO {
+typedef struct CREATE_THREAD_DEBUG_INFO {
     HANDLE hThread;
     LPVOID lpThreadLocalBase;
     LPTHREAD_START_ROUTINE lpStartAddress;
 } CREATE_THREAD_DEBUG_INFO;
 
-typedef struct _CREATE_PROCESS_DEBUG_INFO {
+typedef struct CREATE_PROCESS_DEBUG_INFO {
     HANDLE hFile;
     HANDLE hProcess;
     HANDLE hThread;
@@ -57,15 +57,15 @@ typedef struct _CREATE_PROCESS_DEBUG_INFO {
     WORD fUnicode;
 } CREATE_PROCESS_DEBUG_INFO;
 
-typedef struct _EXIT_THREAD_DEBUG_INFO {
+typedef struct EXIT_THREAD_DEBUG_INFO {
     DWORD dwExitCode;
 } EXIT_THREAD_DEBUG_INFO;
 
-typedef struct _EXIT_PROCESS_DEBUG_INFO {
+typedef struct EXIT_PROCESS_DEBUG_INFO {
     DWORD dwExitCode;
 } EXIT_PROCESS_DEBUG_INFO;
 
-typedef struct _LOAD_DLL_DEBUG_INFO {
+typedef struct LOAD_DLL_DEBUG_INFO {
     HANDLE hFile;
     LPVOID   lpBaseOfDll;
     DWORD    dwDebugInfoFileOffset;
@@ -74,22 +74,22 @@ typedef struct _LOAD_DLL_DEBUG_INFO {
     WORD     fUnicode;
 } LOAD_DLL_DEBUG_INFO;
 
-typedef struct _UNLOAD_DLL_DEBUG_INFO {
+typedef struct UNLOAD_DLL_DEBUG_INFO {
     LPVOID lpBaseOfDll;
 } UNLOAD_DLL_DEBUG_INFO;
 
-typedef struct _OUTPUT_DEBUG_STRING_INFO {
+typedef struct OUTPUT_DEBUG_STRING_INFO {
     LPSTR lpDebugStringData;
     WORD  fUnicode;
     WORD  nDebugStringLength;
 } OUTPUT_DEBUG_STRING_INFO;
 
-typedef struct _RIP_INFO {
+typedef struct RIP_INFO {
     DWORD dwError;
     DWORD dwType;
 } RIP_INFO;
 
-typedef struct _DEBUG_EVENT {
+typedef struct DEBUG_EVENT {
     DWORD dwDebugEventCode;
     DWORD dwProcessId;
     DWORD dwThreadId;
@@ -158,7 +158,7 @@ typedef struct
 #define DRIVE_RAMDISK              6
 
 /* The security attributes structure */
-typedef struct _SECURITY_ATTRIBUTES
+typedef struct SECURITY_ATTRIBUTES
 {
     DWORD   nLength;
     LPVOID  lpSecurityDescriptor;
@@ -754,7 +754,7 @@ typedef struct
 } BY_HANDLE_FILE_INFORMATION ;
 
 
-typedef struct _SYSTEM_POWER_STATUS
+typedef struct SYSTEM_POWER_STATUS
 {
   WIN_BOOL16  ACLineStatus;
   BYTE    BatteryFlag;
@@ -764,7 +764,7 @@ typedef struct _SYSTEM_POWER_STATUS
   DWORD   BatteryFullLifeTime;
 } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS;
 
-typedef struct _MEMORY_BASIC_INFORMATION
+typedef struct MEMORY_BASIC_INFORMATION
 {
     LPVOID   BaseAddress;
     LPVOID   AllocationBase;
@@ -826,7 +826,7 @@ DECL_WINELIB_TYPE_AW(ENUMRESLANGPROC)
 #define	LOAD_WITH_ALTERED_SEARCH_PATH	0x00000008
 
 /* ifdef _x86_ ... */
-typedef struct _LDT_ENTRY {
+typedef struct LDT_ENTRY {
     WORD	LimitLow;
     WORD	BaseLow;
     union {
@@ -852,11 +852,11 @@ typedef struct _LDT_ENTRY {
 } LDT_ENTRY, *LPLDT_ENTRY;
 
 
-typedef enum _GET_FILEEX_INFO_LEVELS {
+typedef enum GET_FILEEX_INFO_LEVELS {
     GetFileExInfoStandard
 } GET_FILEEX_INFO_LEVELS;
 
-typedef struct _WIN32_FILE_ATTRIBUTES_DATA {
+typedef struct WIN32_FILE_ATTRIBUTES_DATA {
     DWORD    dwFileAttributes;
     FILETIME ftCreationTime;
     FILETIME ftLastAccessTime;
@@ -865,7 +865,7 @@ typedef struct _WIN32_FILE_ATTRIBUTES_DATA {
     DWORD    nFileSizeLow;
 } WIN32_FILE_ATTRIBUTE_DATA, *LPWIN32_FILE_ATTRIBUTE_DATA;
 
-typedef struct _DllVersionInfo {
+typedef struct DllVersionInfo {
     DWORD cbSize;
     DWORD dwMajorVersion;
     DWORD dwMinorVersion;
diff --git a/loader/wine/windef.h b/loader/wine/windef.h
index 88783e1928..e0fe82a1b3 100644
--- a/loader/wine/windef.h
+++ b/loader/wine/windef.h
@@ -95,7 +95,7 @@ extern "C" {
 #  ifndef _EGCS_ 
 #define __stdcall __attribute__((__stdcall__))
 #define __cdecl   __attribute__((__cdecl__))
-#  define __RESTORE_ES  __asm__ __volatile__("pushl %ds\n\tpopl %es")
+#  define RESTORE_ES  __asm__ __volatile__("pushl %ds\n\tpopl %es")
 #  endif
 # else
 // #  error You need gcc >= 2.7 to build Wine on a 386
@@ -103,7 +103,7 @@ extern "C" {
 #else 
 # define __stdcall
 # define __cdecl
-# define __RESTORE_ES
+# define RESTORE_ES
 #endif
 
 #define CALLBACK    __stdcall
@@ -581,7 +581,7 @@ typedef struct tagPOINT
     LONG  y;
 } POINT, *PPOINT, *LPPOINT;
 
-typedef struct _POINTL
+typedef struct POINTL
 {
     LONG x;
     LONG y;
diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h
index be7c6db79a..4560c6de1e 100644
--- a/loader/wine/winnt.h
+++ b/loader/wine/winnt.h
@@ -85,25 +85,24 @@
 typedef WCHAR TCHAR, *PTCHAR;
 typedef LPWSTR PTSTR, LPTSTR;
 typedef LPCWSTR PCTSTR, LPCTSTR;
-#define __TEXT(string) L##string /*probably wrong */
+#define TEXT(string) L##string /*probably wrong */
 # else  /* UNICODE */
 typedef char TCHAR, *PTCHAR;
 typedef LPSTR PTSTR, LPTSTR;
 typedef LPCSTR PCTSTR, LPCTSTR;
-#define __TEXT(string) string
+#define TEXT(string) string
 # endif /* UNICODE */
-#define TEXT(quote) __TEXT(quote)
 
 typedef BYTE     BOOLEAN;
 typedef BOOLEAN *PBOOLEAN;
 
-typedef struct _LIST_ENTRY {
-  struct _LIST_ENTRY *Flink;
-  struct _LIST_ENTRY *Blink;
+typedef struct LIST_ENTRY {
+  struct LIST_ENTRY *Flink;
+  struct LIST_ENTRY *Blink;
 } LIST_ENTRY, *PLIST_ENTRY;
 
-typedef struct _SINGLE_LIST_ENTRY {
-  struct _SINGLE_LIST_ENTRY *Next;
+typedef struct SINGLE_LIST_ENTRY {
+  struct SINGLE_LIST_ENTRY *Next;
 } SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY;
 
 /* Heap flags */
@@ -149,7 +148,7 @@ typedef struct _SINGLE_LIST_ENTRY {
 
 #define SIZE_OF_80387_REGISTERS      80
 
-typedef struct _FLOATING_SAVE_AREA
+typedef struct FLOATING_SAVE_AREA
 {
     DWORD   ControlWord;
     DWORD   StatusWord;
@@ -162,7 +161,7 @@ typedef struct _FLOATING_SAVE_AREA
     DWORD   Cr0NpxState;
 } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA;
 
-typedef struct _CONTEXT86
+typedef struct CONTEXT86
 {
     DWORD   ContextFlags;
 
@@ -235,7 +234,7 @@ typedef CONTEXT86 CONTEXT;
 #define CONTEXT_INTEGER		(CONTEXT_ALPHA | 0x00000004L)
 #define CONTEXT_FULL  (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
 
-typedef struct _CONTEXT
+typedef struct CONTEXT
 {
     /* selected by CONTEXT_FLOATING_POINT */
     ULONGLONG FltF0;
@@ -316,8 +315,8 @@ typedef struct _CONTEXT
     DWORD Fill[4];
 } CONTEXT;
 
-#define _QUAD_PSR_OFFSET   HighSoftFpcr
-#define _QUAD_FLAGS_OFFSET HighFir
+#define QUAD_PSR_OFFSET   HighSoftFpcr
+#define QUAD_FLAGS_OFFSET HighFir
 
 #endif  /* _ALPHA_ */
 
@@ -332,7 +331,7 @@ typedef struct _CONTEXT
 
 #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
 
-typedef struct _CONTEXT
+typedef struct CONTEXT
 {
     DWORD Argument[4];
     /* These are selected by CONTEXT_FLOATING_POINT */
@@ -521,7 +520,7 @@ typedef struct
     DWORD Dr7;
 } CONTEXT;
 
-typedef struct _STACK_FRAME_HEADER
+typedef struct STACK_FRAME_HEADER
 {
     DWORD BackChain;
     DWORD GlueSaved1;
@@ -568,7 +567,7 @@ typedef struct _STACK_FRAME_HEADER
 
 #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
 
-typedef struct _CONTEXT
+typedef struct CONTEXT
 {
     DWORD ContextFlags;
 
@@ -679,50 +678,50 @@ typedef HANDLE *PHANDLE;
 #ifdef __i386__
 
 #ifdef NEED_UNDERSCORE_PREFIX
-# define __ASM_NAME(name) "_" name
+# define ASM_NAME(name) "_" name
 #else
-# define __ASM_NAME(name) name
+# define ASM_NAME(name) name
 #endif
 
 #ifdef __GNUC__
-# define __ASM_GLOBAL_FUNC(name,code) \
+# define ASM_GLOBAL_FUNC(name,code) \
       __asm__( ".align 4\n\t" \
-               ".globl " __ASM_NAME(#name) "\n\t" \
-               ".type " __ASM_NAME(#name) ",@function\n" \
-               __ASM_NAME(#name) ":\n\t" \
+               ".globl " ASM_NAME(#name) "\n\t" \
+               ".type " ASM_NAME(#name) ",@function\n" \
+               ASM_NAME(#name) ":\n\t" \
                code );
 #else  /* __GNUC__ */
-# define __ASM_GLOBAL_FUNC(name,code) \
-      void __asm_dummy_##name(void) { \
+# define ASM_GLOBAL_FUNC(name,code) \
+      void asm_dummy_##name(void) { \
           asm( ".align 4\n\t" \
-               ".globl " __ASM_NAME(#name) "\n\t" \
-               ".type " __ASM_NAME(#name) ",@function\n" \
-               __ASM_NAME(#name) ":\n\t" \
+               ".globl " ASM_NAME(#name) "\n\t" \
+               ".type " ASM_NAME(#name) ",@function\n" \
+               ASM_NAME(#name) ":\n\t" \
                code ); \
       }
 #endif  /* __GNUC__ */
 
-#define _DEFINE_REGS_ENTRYPOINT( name, fn, args ) \
-    __ASM_GLOBAL_FUNC( name, \
-                       "call " __ASM_NAME("CALL32_Regs") "\n\t" \
-                       ".long " __ASM_NAME(#fn) "\n\t" \
-                       ".byte " #args ", " #args )
+#define DEFINE_REGS_ENTRYPOINT( name, fn, args ) \
+    ASM_GLOBAL_FUNC( name, \
+                     "call " ASM_NAME("CALL32_Regs") "\n\t" \
+                     ".long " ASM_NAME(#fn) "\n\t" \
+                     ".byte " #args ", " #args )
 #define DEFINE_REGS_ENTRYPOINT_0( name, fn ) \
-  _DEFINE_REGS_ENTRYPOINT( name, fn, 0 )
+  DEFINE_REGS_ENTRYPOINT( name, fn, 0 )
 #define DEFINE_REGS_ENTRYPOINT_1( name, fn, t1 ) \
-  _DEFINE_REGS_ENTRYPOINT( name, fn, 4 )
+  DEFINE_REGS_ENTRYPOINT( name, fn, 4 )
 #define DEFINE_REGS_ENTRYPOINT_2( name, fn, t1, t2 ) \
-  _DEFINE_REGS_ENTRYPOINT( name, fn, 8 )
+  DEFINE_REGS_ENTRYPOINT( n