# HG changeset patch
# User diego
# Date 1200849399 0
# Node ID 2c8cdb9123b8d667ce70cd88a945d72bee9fba42
# Parent  ac1a2c121d3a0d6a185262ec19b3952ee49fb7da
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.

diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/com.h
--- a/loader/com.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/com.h	Sun Jan 20 17:16:39 2008 +0000
@@ -51,9 +51,9 @@
 struct IClassFactory;
 struct IUnknown_vt
 {
-    long STDCALL (*QueryInterface)(struct IUnknown* _this, const GUID* iid, void** ppv);
-    long STDCALL (*AddRef)(struct IUnknown* _this) ;
-    long STDCALL (*Release)(struct IUnknown* _this) ;
+    long STDCALL (*QueryInterface)(struct IUnknown* this, const GUID* iid, void** ppv);
+    long STDCALL (*AddRef)(struct IUnknown* this) ;
+    long STDCALL (*Release)(struct IUnknown* this) ;
 } ;
 
 typedef struct IUnknown
@@ -63,10 +63,10 @@
 
 struct IClassFactory_vt
 {
-    long STDCALL (*QueryInterface)(struct IUnknown* _this, const GUID* iid, void** ppv);
-    long STDCALL (*AddRef)(struct IUnknown* _this) ;
-    long STDCALL (*Release)(struct IUnknown* _this) ;
-    long STDCALL (*CreateInstance)(struct IClassFactory* _this, struct IUnknown* pUnkOuter, const GUID* riid, void** ppvObject);
+    long STDCALL (*QueryInterface)(struct IUnknown* this, const GUID* iid, void** ppv);
+    long STDCALL (*AddRef)(struct IUnknown* this) ;
+    long STDCALL (*Release)(struct IUnknown* this) ;
+    long STDCALL (*CreateInstance)(struct IClassFactory* this, struct IUnknown* pUnkOuter, const GUID* riid, void** ppvObject);
 };
 
 struct IClassFactory
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dmo/DMO_AudioDecoder.c
--- a/loader/dmo/DMO_AudioDecoder.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dmo/DMO_AudioDecoder.c	Sun Jan 20 17:16:39 2008 +0000
@@ -13,7 +13,7 @@
 #include "DMO_Filter.h"
 #include "DMO_AudioDecoder.h"
 
-struct _DMO_AudioDecoder
+struct DMO_AudioDecoder
 { 
     DMO_MEDIA_TYPE m_sOurType, m_sDestType;
     DMO_Filter* m_pDMO_Filter;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dmo/DMO_AudioDecoder.h
--- a/loader/dmo/DMO_AudioDecoder.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dmo/DMO_AudioDecoder.h	Sun Jan 20 17:16:39 2008 +0000
@@ -1,7 +1,7 @@
 #ifndef AVIFILE_DMO_AUDIODECODER_H
 #define AVIFILE_DMO_AUDIODECODER_H
 
-typedef struct _DMO_AudioDecoder DMO_AudioDecoder;
+typedef struct DMO_AudioDecoder DMO_AudioDecoder;
 
 //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
 DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels);
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dmo/DMO_Filter.h
--- a/loader/dmo/DMO_Filter.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dmo/DMO_Filter.h	Sun Jan 20 17:16:39 2008 +0000
@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-typedef struct _DMO_Filter
+typedef struct DMO_Filter
 {
     int m_iHandle;
     IDMOVideoOutputOptimizations* m_pOptim;
@@ -17,7 +17,7 @@
     AM_MEDIA_TYPE *m_pOurType, *m_pDestType;
 } DMO_Filter;
 
-typedef struct _CMediaBuffer CMediaBuffer;
+typedef struct CMediaBuffer CMediaBuffer;
 
 /**
  * Create DMO_Filter object - similar syntax as for DS_Filter
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dmo/DMO_VideoDecoder.c
--- a/loader/dmo/DMO_VideoDecoder.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dmo/DMO_VideoDecoder.c	Sun Jan 20 17:16:39 2008 +0000
@@ -17,7 +17,7 @@
 
 #include "DMO_VideoDecoder.h"
 
-struct _DMO_VideoDecoder
+struct DMO_VideoDecoder
 {
     IVideoDecoder iv;
     
@@ -54,9 +54,9 @@
 
 //int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this){return this->m_Caps;}
 
-typedef struct _ct ct;
+typedef struct ct ct;
 
-struct _ct {
+struct ct {
     fourcc_t fcc;
     unsigned int bits;
     const GUID* subtype;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dmo/DMO_VideoDecoder.h
--- a/loader/dmo/DMO_VideoDecoder.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dmo/DMO_VideoDecoder.h	Sun Jan 20 17:16:39 2008 +0000
@@ -1,7 +1,7 @@
 #ifndef AVIFILE_DMO_VIDEODECODER_H
 #define AVIFILE_DMO_VIDEODECODER_H
 
-typedef struct _DMO_VideoDecoder DMO_VideoDecoder;
+typedef struct DMO_VideoDecoder DMO_VideoDecoder;
 
 int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this);
 
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dmo/buffer.c
--- a/loader/dmo/buffer.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dmo/buffer.c	Sun Jan 20 17:16:39 2008 +0000
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-struct _CMediaBuffer
+struct CMediaBuffer
 {
     IMediaBuffer_vt* vt;
     DECLARE_IUNKNOWN();
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dmo/dmo.h
--- a/loader/dmo/dmo.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dmo/dmo.h	Sun Jan 20 17:16:39 2008 +0000
@@ -16,14 +16,14 @@
 
 
 
-enum _DMO_INPUT_DATA_BUFFER_FLAGS
+enum DMO_INPUT_DATA_BUFFER_FLAGS
 {
     DMO_INPUT_DATA_BUFFERF_SYNCPOINT	= 0x1,
     DMO_INPUT_DATA_BUFFERF_TIME		= 0x2,
     DMO_INPUT_DATA_BUFFERF_TIMELENGTH	= 0x4
 };
 
-enum _DMO_OUTPUT_DATA_BUFFER_FLAGS
+enum DMO_OUTPUT_DATA_BUFFER_FLAGS
 {
     DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT	= 0x1,
     DMO_OUTPUT_DATA_BUFFERF_TIME	= 0x2,
@@ -31,12 +31,12 @@
     DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE	= 0x1000000
 };
 
-enum _DMO_INPUT_STATUS_FLAGS
+enum DMO_INPUT_STATUS_FLAGS
 {
     DMO_INPUT_STATUSF_ACCEPT_DATA	= 0x1
 };
 
-enum _DMO_INPUT_STREAM_INFO_FLAGS
+enum DMO_INPUT_STREAM_INFO_FLAGS
 {
     DMO_INPUT_STREAMF_WHOLE_SAMPLES	= 0x1,
     DMO_INPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER	= 0x2,
@@ -44,7 +44,7 @@
     DMO_INPUT_STREAMF_HOLDS_BUFFERS	= 0x8
 };
 
-enum _DMO_OUTPUT_STREAM_INFO_FLAGS
+enum DMO_OUTPUT_STREAM_INFO_FLAGS
 {
     DMO_OUTPUT_STREAMF_WHOLE_SAMPLES	= 0x1,
     DMO_OUTPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER	= 0x2,
@@ -53,18 +53,18 @@
     DMO_OUTPUT_STREAMF_OPTIONAL		= 0x10
 };
 
-enum _DMO_SET_TYPE_FLAGS
+enum DMO_SET_TYPE_FLAGS
 {
     DMO_SET_TYPEF_TEST_ONLY		= 0x1,
     DMO_SET_TYPEF_CLEAR			= 0x2
 };
 
-enum _DMO_PROCESS_OUTPUT_FLAGS
+enum DMO_PROCESS_OUTPUT_FLAGS
 {
     DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER	= 0x1
 };
 
-enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS
+enum DMO_VIDEO_OUTPUT_STREAM_FLAGS
 {
     DMO_VOSF_NEEDS_PREVIOUS_SAMPLE	= 0x1
 };
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dmo/dmo_interfaces.h
--- a/loader/dmo/dmo_interfaces.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dmo/dmo_interfaces.h	Sun Jan 20 17:16:39 2008 +0000
@@ -6,7 +6,7 @@
 /*
  * IMediaBuffer interface
  */
-typedef struct _IMediaBuffer IMediaBuffer;
+typedef struct IMediaBuffer IMediaBuffer;
 typedef struct IMediaBuffer_vt
 {
     INHERIT_IUNKNOWN();
@@ -19,10 +19,10 @@
 					    /* [out] */ char** ppBuffer,
 					    /* [out] */ unsigned long* pcbLength);
 } IMediaBuffer_vt;
-struct _IMediaBuffer { IMediaBuffer_vt* vt; };
+struct IMediaBuffer { IMediaBuffer_vt* vt; };
 
 
-typedef struct _DMO_OUTPUT_DATA_BUFFER
+typedef struct DMO_OUTPUT_DATA_BUFFER
 {
     IMediaBuffer *pBuffer;
     unsigned long dwStatus;
@@ -34,7 +34,7 @@
 /*
  * IMediaObject interface
  */
-typedef struct _IMediaObject IMediaObject;
+typedef struct IMediaObject IMediaObject;
 typedef struct IMediaObject_vt
 {
     INHERIT_IUNKNOWN();
@@ -106,12 +106,12 @@
 				       /* [out] */ unsigned long *pdwStatus);
     HRESULT STDCALL ( *Lock )(IMediaObject * This, long bLock);
 } IMediaObject_vt;
-struct _IMediaObject { IMediaObject_vt* vt; };
+struct IMediaObject { IMediaObject_vt* vt; };
 
 /*
  * IEnumDMO interface
  */
-typedef struct _IEnumDMO IEnumDMO;
+typedef struct IEnumDMO IEnumDMO;
 typedef struct IEnumDMO_vt
 {
     INHERIT_IUNKNOWN();
@@ -127,12 +127,12 @@
     HRESULT STDCALL ( *Clone )(IEnumDMO * This,
 			       /* [out] */ IEnumDMO **ppEnum);
 } IEnumDMO_vt;
-struct _IEnumDMO { IEnumDMO_vt* vt; };
+struct IEnumDMO { IEnumDMO_vt* vt; };
 
 /*
  * IMediaObjectInPlace interface
  */
-typedef struct _IMediaObjectInPlace IMediaObjectInPlace;
+typedef struct IMediaObjectInPlace IMediaObjectInPlace;
 typedef struct IMediaObjectInPlace_vt
 {
     INHERIT_IUNKNOWN();
@@ -148,13 +148,13 @@
 				    /* [out] */ REFERENCE_TIME *pLatencyTime);
 
 } IMediaObjectInPlace_vt;
-struct _IMediaObjectInPlace { IMediaObjectInPlace_vt* vt; };
+struct IMediaObjectInPlace { IMediaObjectInPlace_vt* vt; };
 
 
 /*
  * IDMOQualityControl interface
  */
-typedef struct _IDMOQualityControl IDMOQualityControl;
+typedef struct IDMOQualityControl IDMOQualityControl;
 typedef struct IDMOQualityControl_vt
 {
     INHERIT_IUNKNOWN();
@@ -166,12 +166,12 @@
     HRESULT STDCALL ( *GetStatus )(IDMOQualityControl * This,
 				   /* [out] */ unsigned long *pdwFlags);
 } IDMOQualityControl_vt;
-struct _IDMOQualityControl { IDMOQualityControl_vt* vt; };
+struct IDMOQualityControl { IDMOQualityControl_vt* vt; };
 
 /*
  * IDMOVideoOutputOptimizations  interface
  */
-typedef struct _IDMOVideoOutputOptimizations  IDMOVideoOutputOptimizations;
+typedef struct IDMOVideoOutputOptimizations  IDMOVideoOutputOptimizations;
 typedef struct IDMOVideoOutputOptimizations_vt
 {
     INHERIT_IUNKNOWN();
@@ -189,6 +189,6 @@
 						      unsigned long ulOutputStreamIndex,
 						      unsigned long *pdwRequestedFeatures);
 } IDMOVideoOutputOptimizations_vt;
-struct _IDMOVideoOutputOptimizations { IDMOVideoOutputOptimizations_vt* vt; };
+struct IDMOVideoOutputOptimizations { IDMOVideoOutputOptimizations_vt* vt; };
 
 #endif /* DMO_INTERFACE_H */
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/DS_AudioDecoder.c
--- a/loader/dshow/DS_AudioDecoder.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/DS_AudioDecoder.c	Sun Jan 20 17:16:39 2008 +0000
@@ -10,7 +10,7 @@
 
 #include "DS_Filter.h"
 
-struct _DS_AudioDecoder
+struct DS_AudioDecoder
 { 
     WAVEFORMATEX in_fmt;
     AM_MEDIA_TYPE m_sOurType, m_sDestType;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/DS_AudioDecoder.h
--- a/loader/dshow/DS_AudioDecoder.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/DS_AudioDecoder.h	Sun Jan 20 17:16:39 2008 +0000
@@ -1,7 +1,7 @@
 #ifndef AVIFILE_DS_AUDIODECODER_H
 #define AVIFILE_DS_AUDIODECODER_H
 
-typedef struct _DS_AudioDecoder DS_AudioDecoder;
+typedef struct DS_AudioDecoder DS_AudioDecoder;
 
 //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
 DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf);
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/DS_Filter.h
--- a/loader/dshow/DS_Filter.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/DS_Filter.h	Sun Jan 20 17:16:39 2008 +0000
@@ -18,8 +18,8 @@
    and then set up m_pAll.
  **/
 
-typedef struct _DS_Filter DS_Filter;
-struct _DS_Filter
+typedef struct DS_Filter DS_Filter;
+struct DS_Filter
 {
     int m_iHandle;
     IBaseFilter* m_pFilter;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/DS_VideoDecoder.c
--- a/loader/dshow/DS_VideoDecoder.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/DS_VideoDecoder.c	Sun Jan 20 17:16:39 2008 +0000
@@ -11,7 +11,7 @@
 #include "libwin32.h"
 #include "DS_Filter.h"
 
-struct _DS_VideoDecoder
+struct DS_VideoDecoder
 {
     IVideoDecoder iv;
     
@@ -54,9 +54,9 @@
 int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this)
 {return this->m_Caps;}
 	    
-typedef struct _ct ct;
+typedef struct ct ct;
 
-struct _ct {
+struct ct {
 		unsigned int bits;
 		fourcc_t fcc;
 		const GUID *subtype;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/DS_VideoDecoder.h
--- a/loader/dshow/DS_VideoDecoder.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/DS_VideoDecoder.h	Sun Jan 20 17:16:39 2008 +0000
@@ -1,7 +1,7 @@
 #ifndef AVIFILE_DS_VIDEODECODER_H
 #define AVIFILE_DS_VIDEODECODER_H
 
-typedef struct _DS_VideoDecoder DS_VideoDecoder;
+typedef struct DS_VideoDecoder DS_VideoDecoder;
 
 int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this);
 
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/allocator.c
--- a/loader/dshow/allocator.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/allocator.c	Sun Jan 20 17:16:39 2008 +0000
@@ -13,10 +13,10 @@
 
 static int AllocatorKeeper = 0;
 
-struct _avm_list_t
+struct avm_list_t
 {
-    struct _avm_list_t* next;
-    struct _avm_list_t* prev;
+    struct avm_list_t* next;
+    struct avm_list_t* prev;
     void* member;
 };
 
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/allocator.h
--- a/loader/dshow/allocator.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/allocator.h	Sun Jan 20 17:16:39 2008 +0000
@@ -4,10 +4,10 @@
 #include "interfaces.h"
 #include "cmediasample.h"
 
-typedef struct _avm_list_t avm_list_t;
-typedef struct _MemAllocator MemAllocator;
+typedef struct avm_list_t avm_list_t;
+typedef struct MemAllocator MemAllocator;
 
-struct _MemAllocator
+struct MemAllocator
 {
     IMemAllocator_vt* vt;
     DECLARE_IUNKNOWN();
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/cmediasample.c
--- a/loader/dshow/cmediasample.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/cmediasample.c	Sun Jan 20 17:16:39 2008 +0000
@@ -504,12 +504,12 @@
  * \brief CMediaSample constructor
  *
  * \param[in] allocator IMemallocator interface of allocator to use
- * \param[in] _size size of internal buffer
+ * \param[in] size size of internal buffer
  *
  * \return pointer to CMediaSample object of NULL if error occured
  *
  */
-CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size)
+CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size)
 {
     CMediaSample* This = (CMediaSample*) malloc(sizeof(CMediaSample));
     if (!This)
@@ -522,11 +522,11 @@
     // anyway this is fixes the problem somehow with some reserves
     //
     // using different trick for now - in DS_Audio modify sample size
-    //if (_size < 0x1000)
-    //    _size = (_size + 0xfff) & ~0xfff;
+    //if (size < 0x1000)
+    //    size = (size + 0xfff) & ~0xfff;
 
     This->vt = (IMediaSample_vt*) malloc(sizeof(IMediaSample_vt));
-    This->own_block = (char*) malloc((size_t)_size + SAFETY_ACEL);
+    This->own_block = (char*) malloc((size_t)size + SAFETY_ACEL);
     This->media_type.pbFormat = 0;
     This->media_type.pUnk = 0;
 
@@ -557,7 +557,7 @@
     This->vt->SetMediaTime = CMediaSample_SetMediaTime;
 
     This->all = allocator;
-    This->size = _size;
+    This->size = size;
     This->refcount = 0; // increased by MemAllocator
     This->actual_size = 0;
     This->isPreroll = 0;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/cmediasample.h
--- a/loader/dshow/cmediasample.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/cmediasample.h	Sun Jan 20 17:16:39 2008 +0000
@@ -4,8 +4,8 @@
 #include "interfaces.h"
 #include "guids.h"
 
-typedef struct _CMediaSample CMediaSample;
-struct _CMediaSample
+typedef struct CMediaSample CMediaSample;
+struct CMediaSample
 {
     IMediaSample_vt* vt;
     DECLARE_IUNKNOWN();
@@ -25,7 +25,7 @@
     void ( *ResetPointer) (CMediaSample* This); // FIXME replace with Set & 0
 };
 
-CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size);
+CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size);
 // called from allocator
 void CMediaSample_Destroy(CMediaSample* This);
 
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/inputpin.h
--- a/loader/dshow/inputpin.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/inputpin.h	Sun Jan 20 17:16:39 2008 +0000
@@ -3,8 +3,8 @@
 
 #include "interfaces.h"
 
-typedef struct _CBaseFilter2 CBaseFilter2;
-struct _CBaseFilter2
+typedef struct CBaseFilter2 CBaseFilter2;
+struct CBaseFilter2
 {
     IBaseFilter_vt* vt;
     DECLARE_IUNKNOWN();
@@ -17,8 +17,8 @@
 CBaseFilter2* CBaseFilter2Create(void);
 
 
-typedef struct _CBaseFilter CBaseFilter;
-struct _CBaseFilter
+typedef struct CBaseFilter CBaseFilter;
+struct CBaseFilter
 {
     IBaseFilter_vt* vt;
     DECLARE_IUNKNOWN();  // has to match CBaseFilter2 - INHERITANCE!!
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/interfaces.h
--- a/loader/dshow/interfaces.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/interfaces.h	Sun Jan 20 17:16:39 2008 +0000
@@ -12,10 +12,10 @@
 
 /*    Sh*t. MSVC++ and g++ use different methods of storing vtables.    */
 
-typedef struct _IReferenceClock IReferenceClock;
-typedef struct _IFilterGraph IFilterGraph;
+typedef struct IReferenceClock IReferenceClock;
+typedef struct IFilterGraph IFilterGraph;
 
-typedef struct _IBaseFilter IBaseFilter;
+typedef struct IBaseFilter IBaseFilter;
 
 typedef enum
 {
@@ -23,14 +23,14 @@
     PINDIR_OUTPUT
 } PIN_DIRECTION;
 
-typedef struct _PinInfo
+typedef struct PinInfo
 {
     IBaseFilter* pFilter;
     PIN_DIRECTION dir;
     unsigned short achName[128];
 } PIN_INFO;
 
-typedef struct _AllocatorProperties
+typedef struct AllocatorProperties
 {
     long cBuffers;
     long cbBuffer;
@@ -38,7 +38,7 @@
     long cbPrefix;
 } ALLOCATOR_PROPERTIES;
 
-typedef struct _IEnumMediaTypes IEnumMediaTypes;
+typedef struct IEnumMediaTypes IEnumMediaTypes;
 typedef struct IEnumMediaTypes_vt
 {
     INHERIT_IUNKNOWN();
@@ -53,11 +53,11 @@
     HRESULT STDCALL ( *Clone )(IEnumMediaTypes* This,
 			       /* [out] */ IEnumMediaTypes** ppEnum);
 } IEnumMediaTypes_vt;
-struct _IEnumMediaTypes { IEnumMediaTypes_vt* vt; };
+struct IEnumMediaTypes { IEnumMediaTypes_vt* vt; };
 
 
 
-typedef struct _IPin IPin;
+typedef struct IPin IPin;
 typedef struct IPin_vt
 {
     INHERIT_IUNKNOWN();
@@ -91,10 +91,10 @@
 				    /* [in] */ REFERENCE_TIME tStop,
 				    /* [in] */ double dRate);
 } IPin_vt;
-struct _IPin { IPin_vt *vt; };
+struct IPin { IPin_vt *vt; };
 
 
-typedef struct _IEnumPins IEnumPins;
+typedef struct IEnumPins IEnumPins;
 typedef struct IEnumPins_vt
 {
     INHERIT_IUNKNOWN();
@@ -113,10 +113,10 @@
     HRESULT STDCALL ( *Clone )(IEnumPins* This,
 			       /* [out] */ IEnumPins** ppEnum);
 } IEnumPins_vt;
-struct _IEnumPins { struct IEnumPins_vt* vt; };
+struct IEnumPins { struct IEnumPins_vt* vt; };
 
 
-typedef struct _IMediaSample IMediaSample;
+typedef struct IMediaSample IMediaSample;
 typedef struct IMediaSample_vt
 {
     INHERIT_IUNKNOWN();
@@ -174,11 +174,11 @@
 				      /* [in] */ long long* pTimeStart,
 				      /* [in] */ long long* pTimeEnd);
 } IMediaSample_vt;
-struct _IMediaSample { struct IMediaSample_vt* vt; };
+struct IMediaSample { struct IMediaSample_vt* vt; };
 
 
 
-//typedef struct _IBaseFilter IBaseFilter;
+//typedef struct IBaseFilter IBaseFilter;
 typedef struct IBaseFilter_vt
 {
     INHERIT_IUNKNOWN();
@@ -211,11 +211,11 @@
     HRESULT STDCALL ( *QueryVendorInfo )(IBaseFilter* This,
 					 /* [string][out] */ unsigned short** pVendorInfo);
 } IBaseFilter_vt;
-struct _IBaseFilter { struct IBaseFilter_vt* vt; };
+struct IBaseFilter { struct IBaseFilter_vt* vt; };
 
 
 
-typedef struct _IMemAllocator IMemAllocator;
+typedef struct IMemAllocator IMemAllocator;
 typedef struct IMemAllocator_vt
 {
     INHERIT_IUNKNOWN();
@@ -241,11 +241,11 @@
     HRESULT STDCALL ( *ReleaseBuffer )(IMemAllocator* This,
 				       /* [in] */ IMediaSample* pBuffer);
 } IMemAllocator_vt;
-struct _IMemAllocator { IMemAllocator_vt* vt; };
+struct IMemAllocator { IMemAllocator_vt* vt; };
 
 
 
-typedef struct _IMemInputPin IMemInputPin;
+typedef struct IMemInputPin IMemInputPin;
 typedef struct IMemInputPin_vt
 {
     INHERIT_IUNKNOWN();
@@ -265,10 +265,10 @@
 					 /* [out] */ long *nSamplesProcessed);
     HRESULT STDCALL ( *ReceiveCanBlock )(IMemInputPin * This);
 } IMemInputPin_vt;
-struct _IMemInputPin { IMemInputPin_vt* vt; };
+struct IMemInputPin { IMemInputPin_vt* vt; };
 
 
-typedef struct _IHidden IHidden;
+typedef struct IHidden IHidden;
 typedef struct IHidden_vt
 {
     INHERIT_IUNKNOWN();
@@ -285,10 +285,10 @@
     HRESULT STDCALL ( *SetSmth5 )(IHidden* This, int v1, int v2);
     HRESULT STDCALL ( *GetSmth6 )(IHidden* This, int* pv);
 } IHidden_vt;
-struct _IHidden { struct IHidden_vt* vt; };
+struct IHidden { struct IHidden_vt* vt; };
 
 
-typedef struct _IHidden2 IHidden2;
+typedef struct IHidden2 IHidden2;
 typedef struct IHidden2_vt
 {
     INHERIT_IUNKNOWN();
@@ -302,7 +302,7 @@
     HRESULT STDCALL ( *unk7 )(void);
     HRESULT STDCALL ( *unk8 )(void);
 } IHidden2_vt;
-struct _IHidden2 { struct IHidden2_vt* vt; };
+struct IHidden2 { struct IHidden2_vt* vt; };
 
 
 // fixme
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/libwin32.h
--- a/loader/dshow/libwin32.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/libwin32.h	Sun Jan 20 17:16:39 2008 +0000
@@ -14,21 +14,21 @@
 typedef uint32_t fourcc_t;
 
 /*
-typedef struct _FatalError
+typedef struct FatalError
 {
     FatalError();
     void PrintAll() {}
 }FatalError;
 */
 
-typedef struct _CodecInfo
+typedef struct CodecInfo
 {
     char* dll;
     GUID* guid;
 }CodecInfo;
 
 
-typedef struct _CImage // public  your_libvo_mem
+typedef struct CImage // public  your_libvo_mem
 {
     char* ptr;
     
@@ -53,7 +53,7 @@
 };
 #endif
 
-typedef struct _IAudioDecoder
+typedef struct IAudioDecoder
 {
     WAVEFORMATEX in_fmt;
     CodecInfo  record;
@@ -96,7 +96,7 @@
 	START,
     };
 
-typedef struct _BitmapInfo
+typedef struct BitmapInfo
 {
     long 	biSize;
     long  	biWidth;
@@ -112,7 +112,7 @@
     int 	colors[3];    
 } BitmapInfo;
 
-typedef struct _IVideoDecoder
+typedef struct IVideoDecoder
 {
     int VBUFSIZE;
     int QMARKHI;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/mediatype.h
--- a/loader/dshow/mediatype.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/mediatype.h	Sun Jan 20 17:16:39 2008 +0000
@@ -7,7 +7,7 @@
 #define DS_MEDIATYPE_H
 #include "guids.h"
                   
-typedef struct __attribute__((__packed__)) _MediaType
+typedef struct __attribute__((__packed__)) MediaType
 {
     GUID	majortype;		//0x0
     GUID	subtype;		//0x10
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/outputpin.c
--- a/loader/dshow/outputpin.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/outputpin.c	Sun Jan 20 17:16:39 2008 +0000
@@ -33,7 +33,7 @@
 /**
    IMemOutput interface implementation
 */
-struct _COutputMemPin
+struct COutputMemPin
 {
     IMemInputPin_vt* vt;
     DECLARE_IUNKNOWN();
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/dshow/outputpin.h
--- a/loader/dshow/outputpin.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/dshow/outputpin.h	Sun Jan 20 17:16:39 2008 +0000
@@ -5,8 +5,8 @@
 
 #include "allocator.h"
 
-typedef struct _COutputMemPin COutputMemPin;
-typedef struct _COutputPin COutputPin;
+typedef struct COutputMemPin COutputMemPin;
+typedef struct COutputPin COutputPin;
 
 /**
  Callback routine for copying samples from pin into filter
@@ -15,7 +15,7 @@
 */
 typedef  HRESULT STDCALL (*SAMPLEPROC)(void* pUserData,IMediaSample*sample);
 
-struct _COutputPin
+struct COutputPin
 {
     IPin_vt* vt;
     DECLARE_IUNKNOWN();
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/loader.h
--- a/loader/loader.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/loader.h	Sun Jan 20 17:16:39 2008 +0000
@@ -25,10 +25,10 @@
 #include "wine/vfw.h"
 #include "wine/msacm.h"
 
-unsigned int _GetPrivateProfileIntA(const char* appname, const char* keyname, int default_value, const char* filename);
-int _GetPrivateProfileStringA(const char* appname, const char* keyname,
+unsigned int GetPrivateProfileIntA_(const char* appname, const char* keyname, int default_value, const char* filename);
+int GetPrivateProfileStringA_(const char* appname, const char* keyname,
 	const char* def_val, char* dest, unsigned int len, const char* filename);
-int _WritePrivateProfileStringA(const char* appname, const char* keyname,
+int WritePrivateProfileStringA_(const char* appname, const char* keyname,
 	const char* string, const char* filename);
 
 INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id,
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/module.c
--- a/loader/module.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/module.c	Sun Jan 20 17:16:39 2008 +0000
@@ -704,8 +704,8 @@
 
 static int c_level=0;
 
-static int dump_component(char* name,int type,void* _orig, ComponentParameters *params,void** glob){
-    int ( *orig)(ComponentParameters *params, void** glob) = _orig;
+static int dump_component(char* name, int type, void* orig, ComponentParameters *params,void** glob){
+    int ( *orig)(ComponentParameters *params, void** glob) = orig;
     int ret,i;
 
     fprintf(stderr,"%*sComponentCall: %s  flags=0x%X  size=%d  what=0x%X %s\n",3*c_level,"",name,params->flags, params->paramSize, params->what, component_func(params->what));
@@ -1051,8 +1051,8 @@
 #endif
 
     if(!strcmp(function,"theQuickTimeDispatcher")
-//      || !strcmp(function,"_CallComponentFunctionWithStorage")
-//      || !strcmp(function,"_CallComponent")
+//      || !strcmp(function,"CallComponentFunctionWithStorage")
+//      || !strcmp(function,"CallComponent")
       ){
 	fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc);
       report_entry = report_func;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/pe_image.c
--- a/loader/pe_image.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/pe_image.c	Sun Jan 20 17:16:39 2008 +0000
@@ -954,7 +954,7 @@
 }
 
 static LPVOID
-_fixup_address(PIMAGE_OPTIONAL_HEADER opt,int delta,LPVOID addr) {
+fixup_address(PIMAGE_OPTIONAL_HEADER opt,int delta,LPVOID addr) {
 	if (	((DWORD)addr>opt->ImageBase) &&
 		((DWORD)addr<opt->ImageBase+opt->SizeOfImage)
 	)
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/qtx/qtxload.c
--- a/loader/qtx/qtxload.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/qtx/qtxload.c	Sun Jan 20 17:16:39 2008 +0000
@@ -53,8 +53,8 @@
 //    handler = LoadLibraryA("/root/.wine/fake_windows/Windows/System/QuickTime.qts");
     handler = LoadLibraryA("QuickTime.qts");
     theqtdp = GetProcAddress(handler, "theQuickTimeDispatcher");
-    compcall = GetProcAddress(handler, "_CallComponent");
-    compcallws = GetProcAddress(handler, "_CallComponentFunctionWithStorage");
+    compcall = GetProcAddress(handler, "CallComponent");
+    compcallws = GetProcAddress(handler, "CallComponentFunctionWithStorage");
 
     InitializeQTML = 0x6299e590;//GetProcAddress(handler, "InitializeQTML");
     InitializeQTML(6+16);
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/resource.c
--- a/loader/resource.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/resource.c	Sun Jan 20 17:16:39 2008 +0000
@@ -36,13 +36,13 @@
 
 #define HRSRC_MAP_BLOCKSIZE 16
 
-typedef struct _HRSRC_ELEM
+typedef struct HRSRC_ELEM
 {
     HANDLE hRsrc;
     WORD     type;
 } HRSRC_ELEM;
 
-typedef struct _HRSRC_MAP
+typedef struct HRSRC_MAP
 {
     int nAlloc;
     int nUsed;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/win32.c
--- a/loader/win32.c	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/win32.c	Sun Jan 20 17:16:39 2008 +0000
@@ -2800,16 +2800,16 @@
     return 0;
 }
 
-unsigned int _GetPrivateProfileIntA(const char* appname, const char* keyname, INT default_value, const char* filename)
+unsigned int GetPrivateProfileIntA_(const char* appname, const char* keyname, INT default_value, const char* filename)
 {
     return expGetPrivateProfileIntA(appname, keyname, default_value, filename);
 }
-int _GetPrivateProfileStringA(const char* appname, const char* keyname,
+int GetPrivateProfileStringA_(const char* appname, const char* keyname,
 			      const char* def_val, char* dest, unsigned int len, const char* filename)
 {
     return expGetPrivateProfileStringA(appname, keyname, def_val, dest, len, filename);
 }
-int _WritePrivateProfileStringA(const char* appname, const char* keyname,
+int WritePrivateProfileStringA_(const char* appname, const char* keyname,
 				const char* string, const char* filename)
 {
     return expWritePrivateProfileStringA(appname, keyname, string, filename);
@@ -2817,9 +2817,9 @@
 
 
 
-static int WINAPI expDefDriverProc(int _private, int id, int msg, int arg1, int arg2)
-{
-    dbgprintf("DefDriverProc(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) => 0\n", _private, id, msg, arg1, arg2);
+static int WINAPI expDefDriverProc(int private, int id, int msg, int arg1, int arg2)
+{
+    dbgprintf("DefDriverProc(0x%x, 0x%x, 0x%x, 0x%x, 0x%x) => 0\n", private, id, msg, arg1, arg2);
     return 0;
 }
 
@@ -3038,7 +3038,7 @@
 }
 
 /*
- typedef struct _TIME_ZONE_INFORMATION {
+ typedef struct TIME_ZONE_INFORMATION {
  long Bias;
  char StandardName[32];
  SYSTEMTIME StandardDate;
@@ -4004,8 +4004,8 @@
 }
 #else
 /* merged from wine - 2002.04.21 */
-typedef void (*_INITTERMFUNC)();
-static int exp_initterm(_INITTERMFUNC *start, _INITTERMFUNC *end)
+typedef void (*INITTERMFUNC)();
+static int exp_initterm(INITTERMFUNC *start, INITTERMFUNC *end)
 {
     dbgprintf("_initterm(0x%x, 0x%x) %p\n", start, end, *start);
     while (start < end)
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/debugtools.h
--- a/loader/wine/debugtools.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/debugtools.h	Sun Jan 20 17:16:39 2008 +0000
@@ -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_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 -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/ldt.h
--- a/loader/wine/ldt.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/ldt.h	Sun Jan 20 17:16:39 2008 +0000
@@ -48,11 +48,11 @@
 
 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 @@
 #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 -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/mmreg.h
--- a/loader/wine/mmreg.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/mmreg.h	Sun Jan 20 17:16:39 2008 +0000
@@ -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 @@
     
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
-typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
+typedef struct __attribute__((__packed__)) WAVEFORMATEX {
   WORD   wFormatTag;
   WORD   nChannels;
   DWORD  nSamplesPerSec;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/module.h
--- a/loader/wine/module.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/module.h	Sun Jan 20 17:16:39 2008 +0000
@@ -82,10 +82,10 @@
 	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 @@
 	HMODULE			module;
 
 	int			nDeps;
-	struct _wine_modref	**deps;
+	struct wine_modref	**deps;
 
 	int			flags;
 	int			refCount;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/msacm.h
--- a/loader/wine/msacm.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/msacm.h	Sun Jan 20 17:16:39 2008 +0000
@@ -242,7 +242,7 @@
  * Structures
  */
 
-typedef struct _ACMDRIVERDETAILSA
+typedef struct ACMDRIVERDETAILSA
 {
   DWORD    cbStruct;
 
@@ -268,7 +268,7 @@
   CHAR     szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
 } ACMDRIVERDETAILSA, *PACMDRIVERDETAILSA;
 
-typedef struct _ACMDRIVERDETAILSW
+typedef struct ACMDRIVERDETAILSW
 {
   DWORD    cbStruct;
 
@@ -294,7 +294,7 @@
   WCHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
 } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW;
 
-typedef struct _ACMDRIVERDETAILS16
+typedef struct ACMDRIVERDETAILS16
 {
   DWORD   cbStruct;
 
@@ -320,7 +320,7 @@
   CHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
 } ACMDRIVERDETAILS16, *NPACMDRIVERDETAILS16, *LPACMDRIVERDETAILS16;
 
-typedef struct _ACMFILTERCHOOSEA
+typedef struct ACMFILTERCHOOSEA
 {
   DWORD         cbStruct;
   DWORD         fdwStyle;
@@ -346,7 +346,7 @@
   ACMFILTERCHOOSEHOOKPROCA pfnHook;
 } ACMFILTERCHOOSEA, *PACMFILTERCHOOSEA;
 
-typedef struct _ACMFILTERCHOOSEW
+typedef struct ACMFILTERCHOOSEW
 {
   DWORD         cbStruct;
   DWORD         fdwStyle;
@@ -372,7 +372,7 @@
   ACMFILTERCHOOSEHOOKPROCW pfnHook;
 } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW;
 
-typedef struct _ACMFILTERCHOOSE16
+typedef struct ACMFILTERCHOOSE16
 {
   DWORD          cbStruct;
   DWORD          fdwStyle;
@@ -398,7 +398,7 @@
   ACMFILTERCHOOSEHOOKPROC16 pfnHook;
 } ACMFILTERCHOOSE16, *NPACMFILTERCHOOSE16, *LPACMFILTERCHOOSE16;
 
-typedef struct _ACMFILTERDETAILSA
+typedef struct ACMFILTERDETAILSA
 {
   DWORD           cbStruct;
   DWORD           dwFilterIndex;
@@ -409,7 +409,7 @@
   CHAR            szFilter[ACMFILTERDETAILS_FILTER_CHARS];
 } ACMFILTERDETAILSA, *PACMFILTERDETAILSA;
 
-typedef struct _ACMFILTERDETAILSW
+typedef struct ACMFILTERDETAILSW
 {
   DWORD          cbStruct;
   DWORD          dwFilterIndex;
@@ -420,7 +420,7 @@
   WCHAR          szFilter[ACMFILTERDETAILS_FILTER_CHARS];
 } ACMFILTERDETAILSW, *PACMFILTERDETAILSW;
 
-typedef struct _ACMFILTERDETAILS16
+typedef struct ACMFILTERDETAILS16
 {
   DWORD          cbStruct;
   DWORD          dwFilterIndex;
@@ -431,7 +431,7 @@
   CHAR           szFilter[ACMFILTERDETAILS_FILTER_CHARS];
 } ACMFILTERDETAILS16, *NPACMFILTERDETAILS16, *LPACMFILTERDETAILS16;
 
-typedef struct _ACMFILTERTAGDETAILSA
+typedef struct ACMFILTERTAGDETAILSA
 {
   DWORD cbStruct;
   DWORD dwFilterTagIndex;
@@ -442,7 +442,7 @@
   CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
 } ACMFILTERTAGDETAILSA, *PACMFILTERTAGDETAILSA;
 
-typedef struct _ACMFILTERTAGDETAILSW
+typedef struct ACMFILTERTAGDETAILSW
 {
   DWORD cbStruct;
   DWORD dwFilterTagIndex;
@@ -453,7 +453,7 @@
   WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
 } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW;
 
-typedef struct _ACMFILTERTAGDETAILS16
+typedef struct ACMFILTERTAGDETAILS16
 {
   DWORD cbStruct;
   DWORD dwFilterTagIndex;
@@ -464,7 +464,7 @@
   CHAR  szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
 } ACMFILTERTAGDETAILS16, *NPACMFILTERTAGDETAILS16, *LPACMFILTERTAGDETAILS16;
 
-typedef struct _ACMFORMATCHOOSEA
+typedef struct ACMFORMATCHOOSEA
 {
   DWORD           cbStruct;
   DWORD           fdwStyle;
@@ -490,7 +490,7 @@
   ACMFORMATCHOOSEHOOKPROCA pfnHook;
 } ACMFORMATCHOOSEA, *PACMFORMATCHOOSEA;
 
-typedef struct _ACMFORMATCHOOSEW
+typedef struct ACMFORMATCHOOSEW
 {
   DWORD           cbStruct;
   DWORD           fdwStyle;
@@ -516,7 +516,7 @@
   ACMFORMATCHOOSEHOOKPROCW pfnHook;
 } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW;
 
-typedef struct _ACMFORMATCHOOSE16
+typedef struct ACMFORMATCHOOSE16
 {
   DWORD            cbStruct;
   DWORD            fdwStyle;
@@ -542,7 +542,7 @@
   ACMFORMATCHOOSEHOOKPROC16 pfnHook;
 } ACMFORMATCHOOSE16, *NPACMFORMATCHOOSE16, *LPACMFORMATCHOOSE16;
 
-typedef struct _ACMFORMATDETAILSA
+typedef struct ACMFORMATDETAILSA
 {
   DWORD           cbStruct;
   DWORD           dwFormatIndex;
@@ -553,7 +553,7 @@
   CHAR            szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILSA, *PACMFORMATDETAILSA;
 
-typedef struct _ACMFORMATDETAILSW
+typedef struct ACMFORMATDETAILSW
 {
     DWORD           cbStruct;
     DWORD           dwFormatIndex;
@@ -564,7 +564,7 @@
     WCHAR           szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILSW, *PACMFORMATDETAILSW;
 
-typedef struct _ACMFORMATDETAILS16
+typedef struct ACMFORMATDETAILS16
 {
     DWORD            cbStruct;
     DWORD            dwFormatIndex;
@@ -575,7 +575,7 @@
     CHAR             szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILS16, *NPACMFORMATDETAILS16, *LPACMFORMATDETAILS16;
 
-typedef struct _ACMFORMATTAGDETAILSA
+typedef struct ACMFORMATTAGDETAILSA
 {
   DWORD cbStruct;
   DWORD dwFormatTagIndex;
@@ -586,7 +586,7 @@
   CHAR  szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
 } ACMFORMATTAGDETAILSA, *PACMFORMATTAGDETAILSA;
 
-typedef struct _ACMFORMATTAGDETAILSW
+typedef struct ACMFORMATTAGDETAILSW
 {
   DWORD cbStruct;
   DWORD dwFormatTagIndex;
@@ -597,7 +597,7 @@
   WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
 } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW;
 
-typedef struct _ACMFORMATTAGDETAILS16
+typedef struct ACMFORMATTAGDETAILS16
 {
   DWORD cbStruct;
   DWORD dwFormatTagIndex;
@@ -608,7 +608,7 @@
   CHAR  szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
 } ACMFORMATTAGDETAILS16, *NPACMFORMATTAGDETAILS16, *LPACMFORMATTAGDETAILS16;
 
-typedef struct _ACMSTREAMHEADER
+typedef struct ACMSTREAMHEADER
 {
   DWORD  cbStruct;
   DWORD  fdwStatus;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/msacmdrv.h
--- a/loader/wine/msacmdrv.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/msacmdrv.h	Sun Jan 20 17:16:39 2008 +0000
@@ -47,7 +47,7 @@
  * Structures
  */
 
-typedef struct _ACMDRVOPENDESCA
+typedef struct ACMDRVOPENDESCA
 {
   DWORD  cbStruct;
   FOURCC fccType;
@@ -60,7 +60,7 @@
   DWORD  dnDevNode;
 } ACMDRVOPENDESCA, *PACMDRVOPENDESCA;
 
-typedef struct _ACMDRVOPENDESCW
+typedef struct ACMDRVOPENDESCW
 {
   DWORD   cbStruct;
   FOURCC  fccType;
@@ -73,7 +73,7 @@
   DWORD   dnDevNode;
 } ACMDRVOPENDESCW, *PACMDRVOPENDESCW;
 
-typedef struct _ACMDRVOPENDESC16
+typedef struct ACMDRVOPENDESC16
 {
   DWORD  cbStruct;
   FOURCC fccType;
@@ -86,7 +86,7 @@
   DWORD  dnDevNode;
 } ACMDRVOPENDESC16, *NPACMDRVOPENDESC16, *LPACMDRVOPENDESC16;
 
-typedef struct _ACMDRVSTREAMINSTANCE16
+typedef struct ACMDRVSTREAMINSTANCE16
 {
   DWORD            cbStruct;
   LPWAVEFORMATEX   pwfxSrc;
@@ -100,7 +100,7 @@
   HACMSTREAM16     has;
 } ACMDRVSTREAMINSTANCE16, *NPACMDRVSTREAMINSTANCE16, *LPACMDRVSTREAMINSTANCE16;
 
-typedef struct _ACMDRVSTREAMINSTANCE
+typedef struct ACMDRVSTREAMINSTANCE
 {
   DWORD           cbStruct;
   PWAVEFORMATEX   pwfxSrc;
@@ -115,8 +115,8 @@
 } 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 @@
   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 @@
   DWORD  cbPreparedDstLength;
 } ACMDRVSTREAMHEADER;
 
-typedef struct _ACMDRVSTREAMSIZE
+typedef struct ACMDRVSTREAMSIZE
 {
   DWORD cbStruct;
   DWORD fdwSize;
@@ -180,7 +180,7 @@
 } ACMDRVSTREAMSIZE16, *NPACMDRVSTREAMSIZE16, *LPACMDRVSTREAMSIZE16,
   ACMDRVSTREAMSIZE, *PACMDRVSTREAMSIZE;
 
-typedef struct _ACMDRVFORMATSUGGEST16
+typedef struct ACMDRVFORMATSUGGEST16
 {
   DWORD            cbStruct;
   DWORD            fdwSuggest;
@@ -190,7 +190,7 @@
   DWORD            cbwfxDst;
 } ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST;
 
-typedef struct _ACMDRVFORMATSUGGEST
+typedef struct ACMDRVFORMATSUGGEST
 {
   DWORD           cbStruct;
   DWORD           fdwSuggest;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/ntdef.h
--- a/loader/wine/ntdef.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/ntdef.h	Sun Jan 20 17:16:39 2008 +0000
@@ -40,19 +40,19 @@
  * 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 @@
 #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 -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/pe_image.h
--- a/loader/wine/pe_image.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/pe_image.h	Sun Jan 20 17:16:39 2008 +0000
@@ -24,22 +24,22 @@
 	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 @@
                               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 @@
 	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 -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/vfw.h
--- a/loader/wine/vfw.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/vfw.h	Sun Jan 20 17:16:39 2008 +0000
@@ -502,7 +502,7 @@
 
 #define	AVIGETFRAMEF_BESTDISPLAYFMT	1
 
-typedef struct _AVISTREAMINFOA {
+typedef struct AVISTREAMINFOA {
     long	fccType;
     long	fccHandler;
     long	dwFlags;        /* AVIIF_* */
@@ -523,7 +523,7 @@
     char	szName[64];
 } AVISTREAMINFOA, * LPAVISTREAMINFOA, *PAVISTREAMINFOA;
 
-typedef struct _AVISTREAMINFOW {
+typedef struct AVISTREAMINFOW {
     long	fccType;
     long	fccHandler;
     long	dwFlags;
@@ -563,7 +563,7 @@
 #define AVIFILECAPS_ALLKEYFRAMES	0x00000010
 #define AVIFILECAPS_NOCOMPRESSION	0x00000020
 
-typedef struct _AVIFILEINFOW {
+typedef struct AVIFILEINFOW {
     long               dwMaxBytesPerSec;
     long               dwFlags;
     long               dwCaps;
@@ -578,7 +578,7 @@
     short               szFileType[64];
 } AVIFILEINFOW, * LPAVIFILEINFOW, *PAVIFILEINFOW;
 
-typedef struct _AVIFILEINFOA {
+typedef struct AVIFILEINFOA {
     long               dwMaxBytesPerSec;
     long               dwFlags;
     long               dwCaps;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/winbase.h
--- a/loader/wine/winbase.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/winbase.h	Sun Jan 20 17:16:39 2008 +0000
@@ -33,18 +33,18 @@
 #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 @@
     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 @@
     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 @@
 #define DRIVE_RAMDISK              6
 
 /* The security attributes structure */
-typedef struct _SECURITY_ATTRIBUTES
+typedef struct SECURITY_ATTRIBUTES
 {
     DWORD   nLength;
     LPVOID  lpSecurityDescriptor;
@@ -754,7 +754,7 @@
 } BY_HANDLE_FILE_INFORMATION ;
 
 
-typedef struct _SYSTEM_POWER_STATUS
+typedef struct SYSTEM_POWER_STATUS
 {
   WIN_BOOL16  ACLineStatus;
   BYTE    BatteryFlag;
@@ -764,7 +764,7 @@
   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 @@
 #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 @@
 } 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 @@
     DWORD    nFileSizeLow;
 } WIN32_FILE_ATTRIBUTE_DATA, *LPWIN32_FILE_ATTRIBUTE_DATA;
 
-typedef struct _DllVersionInfo {
+typedef struct DllVersionInfo {
     DWORD cbSize;
     DWORD dwMajorVersion;
     DWORD dwMinorVersion;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/windef.h
--- a/loader/wine/windef.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/windef.h	Sun Jan 20 17:16:39 2008 +0000
@@ -95,7 +95,7 @@
 #  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 @@
 #else 
 # define __stdcall
 # define __cdecl
-# define __RESTORE_ES
+# define RESTORE_ES
 #endif
 
 #define CALLBACK    __stdcall
@@ -581,7 +581,7 @@
     LONG  y;
 } POINT, *PPOINT, *LPPOINT;
 
-typedef struct _POINTL
+typedef struct POINTL
 {
     LONG x;
     LONG y;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/winnt.h
--- a/loader/wine/winnt.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/winnt.h	Sun Jan 20 17:16:39 2008 +0000
@@ -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 @@
 
 #define SIZE_OF_80387_REGISTERS      80
 
-typedef struct _FLOATING_SAVE_AREA
+typedef struct FLOATING_SAVE_AREA
 {
     DWORD   ControlWord;
     DWORD   StatusWord;
@@ -162,7 +161,7 @@
     DWORD   Cr0NpxState;
 } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA;
 
-typedef struct _CONTEXT86
+typedef struct CONTEXT86
 {
     DWORD   ContextFlags;
 
@@ -235,7 +234,7 @@
 #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 @@
     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 @@
 
 #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 @@
     DWORD Dr7;
 } CONTEXT;
 
-typedef struct _STACK_FRAME_HEADER
+typedef struct STACK_FRAME_HEADER
 {
     DWORD BackChain;
     DWORD GlueSaved1;
@@ -568,7 +567,7 @@
 
 #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
 
-typedef struct _CONTEXT
+typedef struct CONTEXT
 {
     DWORD ContextFlags;
 
@@ -679,50 +678,50 @@
 #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( name, fn, 8 )
 #define DEFINE_REGS_ENTRYPOINT_3( name, fn, t1, t2, t3 ) \
-  _DEFINE_REGS_ENTRYPOINT( name, fn, 12 )
+  DEFINE_REGS_ENTRYPOINT( name, fn, 12 )
 #define DEFINE_REGS_ENTRYPOINT_4( name, fn, t1, t2, t3, t4 ) \
-  _DEFINE_REGS_ENTRYPOINT( name, fn, 16 )
+  DEFINE_REGS_ENTRYPOINT( name, fn, 16 )
 
 #endif  /* __i386__ */
 
 #ifdef __sparc__
 /* FIXME: use getcontext() to retrieve full context */
-#define _GET_CONTEXT \
+#define GET_CONTEXT \
     CONTEXT context;   \
     do { memset(&context, 0, sizeof(CONTEXT));            \
          context.ContextFlags = CONTEXT_CONTROL;          \
@@ -731,19 +730,19 @@
 
 #define DEFINE_REGS_ENTRYPOINT_0( name, fn ) \
   void WINAPI name ( void ) \
-  { _GET_CONTEXT; fn( &context ); }
+  { GET_CONTEXT; fn( &context ); }
 #define DEFINE_REGS_ENTRYPOINT_1( name, fn, t1 ) \
   void WINAPI name ( t1 a1 ) \
-  { _GET_CONTEXT; fn( a1, &context ); }
+  { GET_CONTEXT; fn( a1, &context ); }
 #define DEFINE_REGS_ENTRYPOINT_2( name, fn, t1, t2 ) \
   void WINAPI name ( t1 a1, t2 a2 ) \
-  { _GET_CONTEXT; fn( a1, a2, &context ); }
+  { GET_CONTEXT; fn( a1, a2, &context ); }
 #define DEFINE_REGS_ENTRYPOINT_3( name, fn, t1, t2, t3 ) \
   void WINAPI name ( t1 a1, t2 a2, t3 a3 ) \
-  { _GET_CONTEXT; fn( a1, a2, a3, &context ); }
+  { GET_CONTEXT; fn( a1, a2, a3, &context ); }
 #define DEFINE_REGS_ENTRYPOINT_4( name, fn, t1, t2, t3, t4 ) \
   void WINAPI name ( t1 a1, t2 a2, t3 a3, t4 a4 ) \
-  { _GET_CONTEXT; fn( a1, a2, a3, a4, &context ); }
+  { GET_CONTEXT; fn( a1, a2, a3, a4, &context ); }
 
 #endif /* __sparc__ */
 
@@ -994,11 +993,11 @@
 
 #define EXCEPTION_MAXIMUM_PARAMETERS 15
 
-typedef struct __EXCEPTION_RECORD
+typedef struct EXCEPTION_RECORD
 {
     DWORD    ExceptionCode;
     DWORD    ExceptionFlags;
-    struct __EXCEPTION_RECORD *ExceptionRecord;
+    struct EXCEPTION_RECORD *ExceptionRecord;
 
     LPVOID   ExceptionAddress;
     DWORD    NumberParameters;
@@ -1010,7 +1009,7 @@
  * in except() and the UnhandledExceptionFilter().
  */
  
-typedef struct _EXCEPTION_POINTERS 
+typedef struct EXCEPTION_POINTERS
 {
   PEXCEPTION_RECORD  ExceptionRecord;
   PCONTEXT           ContextRecord;
@@ -1023,14 +1022,14 @@
  * larger exception frames for their own use.
  */
 
-struct __EXCEPTION_FRAME;
+struct EXCEPTION_FRAME;
 
-typedef DWORD (*PEXCEPTION_HANDLER)(PEXCEPTION_RECORD,struct __EXCEPTION_FRAME*,
-                                    PCONTEXT,struct __EXCEPTION_FRAME **);
+typedef DWORD (*PEXCEPTION_HANDLER)(PEXCEPTION_RECORD, struct EXCEPTION_FRAME*,
+                                    PCONTEXT, struct EXCEPTION_FRAME **);
 
-typedef struct __EXCEPTION_FRAME
+typedef struct EXCEPTION_FRAME
 {
-  struct __EXCEPTION_FRAME *Prev;
+  struct EXCEPTION_FRAME *Prev;
   PEXCEPTION_HANDLER       Handler;
 } EXCEPTION_FRAME, *PEXCEPTION_FRAME;
 
@@ -1055,9 +1054,9 @@
 #define DBG_CONTROL_BREAK           0x40010008
 #define DBG_EXCEPTION_NOT_HANDLED   0x80010001
 
-typedef struct _NT_TIB 
+typedef struct NT_TIB
 {
-	struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;
+	struct EXCEPTION_REGISTRATION_RECORD *ExceptionList;
 	PVOID StackBase;
 	PVOID StackLimit;
 	PVOID SubSystemTib;
@@ -1066,21 +1065,21 @@
           DWORD Version;
 	} DUMMYUNIONNAME;
 	PVOID ArbitraryUserPointer;
-	struct _NT_TIB *Self;
+	struct NT_TIB *Self;
 } NT_TIB, *PNT_TIB;
 
-struct _TEB;
+struct TEB;
 /*
 #if defined(__i386__) && defined(__GNUC__)
-extern inline struct _TEB * WINAPI NtCurrentTeb(void);
-extern inline struct _TEB * WINAPI NtCurrentTeb(void)
+extern inline struct TEB * WINAPI NtCurrentTeb(void);
+extern inline struct TEB * WINAPI NtCurrentTeb(void)
 {
-    struct _TEB *teb;
+    struct TEB *teb;
     __asm__(".byte 0x64\n\tmovl (0x18),%0" : "=r" (teb));
     return teb;
 }
 #else
-extern struct _TEB * WINAPI NtCurrentTeb(void);
+extern struct TEB * WINAPI NtCurrentTeb(void);
 #endif
 */
 
@@ -1088,7 +1087,7 @@
  * File formats definitions
  */
 
-typedef struct _IMAGE_DOS_HEADER {
+typedef struct IMAGE_DOS_HEADER {
     WORD  e_magic;      /* 00: MZ Header signature */
     WORD  e_cblp;       /* 02: Bytes on last page of file */
     WORD  e_cp;         /* 04: Pages in file */
@@ -1155,7 +1154,7 @@
     WORD  ne_expver;            /* 3e Expected Windows version number */
 } IMAGE_OS2_HEADER,*PIMAGE_OS2_HEADER;
 
-typedef struct _IMAGE_VXD_HEADER {
+typedef struct IMAGE_VXD_HEADER {
   WORD  e32_magic;
   BYTE  e32_border;
   BYTE  e32_worder;
@@ -1281,7 +1280,7 @@
 #define	IMAGE_SUBSYSTEM_OS2_CUI		5
 #define	IMAGE_SUBSYSTEM_POSIX_CUI	7
 
-typedef struct _IMAGE_FILE_HEADER {
+typedef struct IMAGE_FILE_HEADER {
   WORD  Machine;
   WORD  NumberOfSections;
   DWORD TimeDateStamp;
@@ -1291,14 +1290,14 @@
   WORD  Characteristics;
 } IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER;
 
-typedef struct _IMAGE_DATA_DIRECTORY {
+typedef struct IMAGE_DATA_DIRECTORY {
   DWORD VirtualAddress;
   DWORD Size;
 } IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY;
 
 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
 
-typedef struct _IMAGE_OPTIONAL_HEADER {
+typedef struct IMAGE_OPTIONAL_HEADER {
 
   /* Standard fields */
 
@@ -1338,7 +1337,7 @@
   IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
 } IMAGE_OPTIONAL_HEADER, *PIMAGE_OPTIONAL_HEADER;
 
-typedef struct _IMAGE_NT_HEADERS {
+typedef struct IMAGE_NT_HEADERS {
   DWORD Signature;
   IMAGE_FILE_HEADER FileHeader;
   IMAGE_OPTIONAL_HEADER OptionalHeader;
@@ -1346,7 +1345,7 @@
 
 #define IMAGE_SIZEOF_SHORT_NAME 8
 
-typedef struct _IMAGE_SECTION_HEADER {
+typedef struct IMAGE_SECTION_HEADER {
   BYTE  Name[IMAGE_SIZEOF_SHORT_NAME];
   union {
     DWORD PhysicalAddress;
@@ -1418,7 +1417,7 @@
 
 #include "pshpack2.h"
 
-typedef struct _IMAGE_SYMBOL {
+typedef struct IMAGE_SYMBOL {
     union {
         BYTE    ShortName[8];
         struct {
@@ -1437,7 +1436,7 @@
 
 #define IMAGE_SIZEOF_SYMBOL 18
 
-typedef struct _IMAGE_LINENUMBER {
+typedef struct IMAGE_LINENUMBER {
     union {
         DWORD   SymbolTableIndex;
         DWORD   VirtualAddress;
@@ -1448,7 +1447,7 @@
 
 #define IMAGE_SIZEOF_LINENUMBER  6
 
-typedef union _IMAGE_AUX_SYMBOL {
+typedef union IMAGE_AUX_SYMBOL {
     struct {
         DWORD    TagIndex;
         union {
@@ -1589,7 +1588,7 @@
 
 /* Export module directory */
 
-typedef struct _IMAGE_EXPORT_DIRECTORY {
+typedef struct IMAGE_EXPORT_DIRECTORY {
 	DWORD	Characteristics;
 	DWORD	TimeDateStamp;
 	WORD	MajorVersion;
@@ -1604,13 +1603,13 @@
 } IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY;
 
 /* Import name entry */
-typedef struct _IMAGE_IMPORT_BY_NAME {
+typedef struct IMAGE_IMPORT_BY_NAME {
 	WORD	Hint;
 	BYTE	Name[1];
 } IMAGE_IMPORT_BY_NAME,*PIMAGE_IMPORT_BY_NAME;
 
 /* Import thunk */
-typedef struct _IMAGE_THUNK_DATA {
+typedef struct IMAGE_THUNK_DATA {
 	union {
 		LPBYTE    ForwarderString;
 		FARPROC Function;
@@ -1621,7 +1620,7 @@
 
 /* Import module directory */
 
-typedef struct _IMAGE_IMPORT_DESCRIPTOR {
+typedef struct IMAGE_IMPORT_DESCRIPTOR {
 	union {
 		DWORD	Characteristics; /* 0 for terminating null import descriptor  */
 		PIMAGE_THUNK_DATA OriginalFirstThunk;	/* RVA to original unbound IAT */
@@ -1643,7 +1642,7 @@
 #define	IMAGE_SNAP_BY_ORDINAL(Ordinal)	((Ordinal & IMAGE_ORDINAL_FLAG) != 0)
 #define	IMAGE_ORDINAL(Ordinal)		(Ordinal & 0xffff)
 
-typedef struct _IMAGE_BOUND_IMPORT_DESCRIPTOR
+typedef struct IMAGE_BOUND_IMPORT_DESCRIPTOR
 {
     DWORD   TimeDateStamp;
     WORD    OffsetModuleName;
@@ -1651,21 +1650,21 @@
 /* Array of zero or more IMAGE_BOUND_FORWARDER_REF follows */
 } IMAGE_BOUND_IMPORT_DESCRIPTOR,  *PIMAGE_BOUND_IMPORT_DESCRIPTOR;
 
-typedef struct _IMAGE_BOUND_FORWARDER_REF
+typedef struct IMAGE_BOUND_FORWARDER_REF
 {
     DWORD   TimeDateStamp;
     WORD    OffsetModuleName;
     WORD    Reserved;
 } IMAGE_BOUND_FORWARDER_REF, *PIMAGE_BOUND_FORWARDER_REF;
 
-typedef struct _IMAGE_BASE_RELOCATION
+typedef struct IMAGE_BASE_RELOCATION
 {
 	DWORD	VirtualAddress;
 	DWORD	SizeOfBlock;
 	WORD	TypeOffset[1];
 } IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION;
 
-typedef struct _IMAGE_RELOCATION
+typedef struct IMAGE_RELOCATION
 {
     union {
         DWORD   VirtualAddress;
@@ -1839,7 +1838,7 @@
 #define IMAGE_ARCHIVE_LINKER_MEMBER          "/               "
 #define IMAGE_ARCHIVE_LONGNAMES_MEMBER       "//              "
 
-typedef struct _IMAGE_ARCHIVE_MEMBER_HEADER
+typedef struct IMAGE_ARCHIVE_MEMBER_HEADER
 {
     BYTE     Name[16];
     BYTE     Date[12];
@@ -1855,7 +1854,7 @@
 /*
  * Resource directory stuff
  */
-typedef struct _IMAGE_RESOURCE_DIRECTORY {
+typedef struct IMAGE_RESOURCE_DIRECTORY {
 	DWORD	Characteristics;
 	DWORD	TimeDateStamp;
 	WORD	MajorVersion;
@@ -1868,7 +1867,7 @@
 #define	IMAGE_RESOURCE_NAME_IS_STRING		0x80000000
 #define	IMAGE_RESOURCE_DATA_IS_DIRECTORY	0x80000000
 
-typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY {
+typedef struct IMAGE_RESOURCE_DIRECTORY_ENTRY {
 	union {
 		struct {
 			unsigned NameOffset:31;
@@ -1887,17 +1886,17 @@
 } IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY;
 
 
-typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING {
+typedef struct IMAGE_RESOURCE_DIRECTORY_STRING {
 	WORD	Length;
 	CHAR	NameString[ 1 ];
 } IMAGE_RESOURCE_DIRECTORY_STRING,*PIMAGE_RESOURCE_DIRECTORY_STRING;
 
-typedef struct _IMAGE_RESOURCE_DIR_STRING_U {
+typedef struct IMAGE_RESOURCE_DIR_STRING_U {
 	WORD	Length;
 	WCHAR	NameString[ 1 ];
 } IMAGE_RESOURCE_DIR_STRING_U,*PIMAGE_RESOURCE_DIR_STRING_U;
 
-typedef struct _IMAGE_RESOURCE_DATA_ENTRY {
+typedef struct IMAGE_RESOURCE_DATA_ENTRY {
 	DWORD	OffsetToData;
 	DWORD	Size;
 	DWORD	CodePage;
@@ -1909,7 +1908,7 @@
 	LPVOID DllHandle,DWORD Reason,LPVOID Reserved
 );
 
-typedef struct _IMAGE_TLS_DIRECTORY {
+typedef struct IMAGE_TLS_DIRECTORY {
 	DWORD	StartAddressOfRawData;
 	DWORD	EndAddressOfRawData;
 	LPDWORD	AddressOfIndex;
@@ -1918,7 +1917,7 @@
 	DWORD	Characteristics;
 } IMAGE_TLS_DIRECTORY,*PIMAGE_TLS_DIRECTORY;
 
-typedef struct _IMAGE_DEBUG_DIRECTORY {
+typedef struct IMAGE_DEBUG_DIRECTORY {
   DWORD Characteristics;
   DWORD TimeDateStamp;
   WORD  MajorVersion;
@@ -1941,7 +1940,7 @@
 #define IMAGE_DEBUG_TYPE_BORLAND        9
 #define IMAGE_DEBUG_TYPE_RESERVED10    10
 
-typedef struct _IMAGE_COFF_SYMBOLS_HEADER {
+typedef struct IMAGE_COFF_SYMBOLS_HEADER {
   DWORD NumberOfSymbols;
   DWORD LvaToFirstSymbol;
   DWORD NumberOfLinenumbers;
@@ -1957,7 +1956,7 @@
 #define FRAME_TSS       2
 #define FRAME_NONFPO    3
 
-typedef struct _FPO_DATA {
+typedef struct FPO_DATA {
   DWORD ulOffStart;
   DWORD cbProcSize;
   DWORD cdwLocals;
@@ -1970,7 +1969,7 @@
   unsigned cbFrame  : 2;
 } FPO_DATA, *PFPO_DATA;
 
-typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY {
+typedef struct IMAGE_LOAD_CONFIG_DIRECTORY {
   DWORD Characteristics;
   DWORD TimeDateStamp;
   WORD  MajorVersion;
@@ -1991,7 +1990,7 @@
   DWORD Reserved[1];
 } IMAGE_LOAD_CONFIG_DIRECTORY, *PIMAGE_LOAD_CONFIG_DIRECTORY;
 
-typedef struct _IMAGE_FUNCTION_ENTRY {
+typedef struct IMAGE_FUNCTION_ENTRY {
   DWORD StartingAddress;
   DWORD EndingAddress;
   DWORD EndOfPrologue;
@@ -1999,7 +1998,7 @@
 
 /* This is the structure that appears at the very start of a .DBG file. */
 
-typedef struct _IMAGE_SEPARATE_DEBUG_HEADER {
+typedef struct IMAGE_SEPARATE_DEBUG_HEADER {
 	WORD	Signature;
 	WORD	Flags;
 	WORD	Machine;
@@ -2053,7 +2052,7 @@
  * TOKEN_INFORMATION_CLASS
  */
 
-typedef enum _TOKEN_INFORMATION_CLASS {
+typedef enum TOKEN_INFORMATION_CLASS {
   TokenUser = 1, 
   TokenGroups, 
   TokenPrivileges, 
@@ -2066,14 +2065,14 @@
   TokenStatistics 
 } TOKEN_INFORMATION_CLASS; 
 
-#ifndef _SECURITY_DEFINED
-#define _SECURITY_DEFINED
+#ifndef SECURITY_DEFINED
+#define SECURITY_DEFINED
 
 #include "pshpack1.h"
 
 typedef DWORD ACCESS_MASK, *PACCESS_MASK;
 
-typedef struct _GENERIC_MAPPING {
+typedef struct GENERIC_MAPPING {
     ACCESS_MASK GenericRead;
     ACCESS_MASK GenericWrite;
     ACCESS_MASK GenericExecute;
@@ -2089,7 +2088,7 @@
 
 #ifndef SID_DEFINED
 #define SID_DEFINED
-typedef struct _SID {
+typedef struct SID {
     BYTE Revision;
     BYTE SubAuthorityCount;
     SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
@@ -2114,7 +2113,7 @@
 #define MIN_ACL_REVISION ACL_REVISION2
 #define MAX_ACL_REVISION ACL_REVISION4
 
-typedef struct _ACL {
+typedef struct ACL {
     BYTE AclRevision;
     BYTE Sbz1;
     WORD AclSize;
@@ -2163,7 +2162,7 @@
 
 #include "poppack.h"
 
-#endif /* _SECURITY_DEFINED */
+#endif /* SECURITY_DEFINED */
 
 #include "pshpack1.h"
 
@@ -2171,7 +2170,7 @@
  * SID_AND_ATTRIBUTES
  */
 
-typedef struct _SID_AND_ATTRIBUTES {
+typedef struct SID_AND_ATTRIBUTES {
   PSID  Sid; 
   DWORD Attributes; 
 } SID_AND_ATTRIBUTES ; 
@@ -2234,7 +2233,7 @@
  * TOKEN_USER
  */
 
-typedef struct _TOKEN_USER {
+typedef struct TOKEN_USER {
   SID_AND_ATTRIBUTES User; 
 } TOKEN_USER; 
 
@@ -2242,7 +2241,7 @@
  * TOKEN_GROUPS
  */
 
-typedef struct _TOKEN_GROUPS  {
+typedef struct TOKEN_GROUPS  {
   DWORD GroupCount; 
   SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY]; 
 } TOKEN_GROUPS; 
@@ -2251,7 +2250,7 @@
  * LUID_AND_ATTRIBUTES
  */
 
-typedef union _LARGE_INTEGER {
+typedef union LARGE_INTEGER {
     struct {
         DWORD    LowPart;
         LONG     HighPart;
@@ -2259,7 +2258,7 @@
     LONGLONG QuadPart;
 } LARGE_INTEGER, *LPLARGE_INTEGER, *PLARGE_INTEGER;
 
-typedef union _ULARGE_INTEGER {
+typedef union ULARGE_INTEGER {
     struct {
         DWORD    LowPart;
         LONG     HighPart;
@@ -2273,7 +2272,7 @@
 
 typedef LARGE_INTEGER LUID,*PLUID;
 
-typedef struct _LUID_AND_ATTRIBUTES {
+typedef struct LUID_AND_ATTRIBUTES {
   LUID   Luid; 
   DWORD  Attributes; 
 } LUID_AND_ATTRIBUTES; 
@@ -2282,7 +2281,7 @@
  * PRIVILEGE_SET
  */
 
-typedef struct _PRIVILEGE_SET {
+typedef struct PRIVILEGE_SET {
     DWORD PrivilegeCount;
     DWORD Control;
     LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY];
@@ -2292,7 +2291,7 @@
  * TOKEN_PRIVILEGES
  */
 
-typedef struct _TOKEN_PRIVILEGES {
+typedef struct TOKEN_PRIVILEGES {
   DWORD PrivilegeCount; 
   LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY]; 
 } TOKEN_PRIVILEGES, *PTOKEN_PRIVILEGES; 
@@ -2301,7 +2300,7 @@
  * TOKEN_OWNER
  */
 
-typedef struct _TOKEN_OWNER {
+typedef struct TOKEN_OWNER {
   PSID Owner; 
 } TOKEN_OWNER; 
 
@@ -2309,7 +2308,7 @@
  * TOKEN_PRIMARY_GROUP
  */
 
-typedef struct _TOKEN_PRIMARY_GROUP {
+typedef struct TOKEN_PRIMARY_GROUP {
   PSID PrimaryGroup; 
 } TOKEN_PRIMARY_GROUP; 
 
@@ -2318,7 +2317,7 @@
  * TOKEN_DEFAULT_DACL
  */
 
-typedef struct _TOKEN_DEFAULT_DACL { 
+typedef struct TOKEN_DEFAULT_DACL {
   PACL DefaultDacl; 
 } TOKEN_DEFAULT_DACL; 
 
@@ -2326,7 +2325,7 @@
  * TOKEN_SOURCEL
  */
 
-typedef struct _TOKEN_SOURCE {
+typedef struct TOKEN_SOURCE {
   char Sourcename[8]; 
   LUID SourceIdentifier; 
 } TOKEN_SOURCE; 
@@ -2344,7 +2343,7 @@
  * SECURITY_IMPERSONATION_LEVEL
  */
 
-typedef enum _SECURITY_IMPERSONATION_LEVEL {
+typedef enum SECURITY_IMPERSONATION_LEVEL {
   SecurityAnonymous, 
   SecurityIdentification, 
   SecurityImpersonation, 
@@ -2358,7 +2357,7 @@
  *	Quality of Service
  */
 
-typedef struct _SECURITY_QUALITY_OF_SERVICE {
+typedef struct SECURITY_QUALITY_OF_SERVICE {
   DWORD				Length;
   SECURITY_IMPERSONATION_LEVEL	ImpersonationLevel;
   SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode;
@@ -2369,7 +2368,7 @@
  * TOKEN_STATISTICS
  */
 
-typedef struct _TOKEN_STATISTICS {
+typedef struct TOKEN_STATISTICS {
   LUID  TokenId; 
   LUID  AuthenticationId; 
   LARGE_INTEGER ExpirationTime; 
@@ -2392,7 +2391,7 @@
 #define	ACL_REVISION2	2
 
 /* ACEs, directly starting after an ACL */
-typedef struct _ACE_HEADER {
+typedef struct ACE_HEADER {
 	BYTE	AceType;
 	BYTE	AceFlags;
 	WORD	AceSize;
@@ -2422,25 +2421,25 @@
  * 4: ACCESS_MASK
  * 8... : SID
  */
-typedef struct _ACCESS_ALLOWED_ACE {
+typedef struct ACCESS_ALLOWED_ACE {
 	ACE_HEADER	Header;
 	DWORD		Mask;
 	DWORD		SidStart;
 } ACCESS_ALLOWED_ACE,*PACCESS_ALLOWED_ACE;
 
-typedef struct _ACCESS_DENIED_ACE {
+typedef struct ACCESS_DENIED_ACE {
 	ACE_HEADER	Header;
 	DWORD		Mask;
 	DWORD		SidStart;
 } ACCESS_DENIED_ACE,*PACCESS_DENIED_ACE;
 
-typedef struct _SYSTEM_AUDIT_ACE {
+typedef struct SYSTEM_AUDIT_ACE {
 	ACE_HEADER	Header;
 	DWORD		Mask;
 	DWORD		SidStart;
 } SYSTEM_AUDIT_ACE,*PSYSTEM_AUDIT_ACE;
 
-typedef struct _SYSTEM_ALARM_ACE {
+typedef struct SYSTEM_ALARM_ACE {
 	ACE_HEADER	Header;
 	DWORD		Mask;
 	DWORD		SidStart;
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wine/winuser.h
--- a/loader/wine/winuser.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wine/winuser.h	Sun Jan 20 17:16:39 2008 +0000
@@ -1824,7 +1824,7 @@
 DECL_WINELIB_TYPE_AW(MSGBOXPARAMS)
 DECL_WINELIB_TYPE_AW(LPMSGBOXPARAMS)
 
-typedef struct _numberfmt32a {
+typedef struct numberfmt32a {
     UINT NumDigits;
     UINT LeadingZero;
     UINT Grouping;
@@ -1833,7 +1833,7 @@
     UINT NegativeOrder;
 } NUMBERFMTA;
 
-typedef struct _numberfmt32w {
+typedef struct numberfmt32w {
     UINT NumDigits;
     UINT LeadingZero;
     UINT Grouping;
@@ -1842,7 +1842,7 @@
     UINT NegativeOrder;
 } NUMBERFMTW;
 
-typedef struct _currencyfmt32a
+typedef struct currencyfmt32a
 {   
 	UINT      NumDigits;   
 	UINT      LeadingZero; 
@@ -1854,7 +1854,7 @@
 	LPCSTR    lpCurrencySymbol;
 } CURRENCYFMTA; 
 
-typedef struct _currencyfmt32w
+typedef struct currencyfmt32w
 {   
 	UINT      NumDigits;   
 	UINT      LeadingZero; 
diff -r ac1a2c121d3a -r 2c8cdb9123b8 loader/wineacm.h
--- a/loader/wineacm.h	Sun Jan 20 17:03:35 2008 +0000
+++ b/loader/wineacm.h	Sun Jan 20 17:16:39 2008 +0000
@@ -14,15 +14,15 @@
 #endif /* defined(__cplusplus) */
 
 
-typedef struct _WINE_ACMDRIVERID *PWINE_ACMDRIVERID;
-typedef struct _WINE_ACMDRIVER   *PWINE_ACMDRIVER;
+typedef struct WINE_ACMDRIVERID *PWINE_ACMDRIVERID;
+typedef struct WINE_ACMDRIVER   *PWINE_ACMDRIVER;
 
-typedef struct _WINE_ACMOBJ
+typedef struct WINE_ACMOBJ
 {
   PWINE_ACMDRIVERID	pACMDriverID;
 } WINE_ACMOBJ, *PWINE_ACMOBJ;
 
-typedef struct _WINE_ACMDRIVER
+typedef struct WINE_ACMDRIVER
 {
     WINE_ACMOBJ		obj;
     HDRVR      		hDrvr;
@@ -31,7 +31,7 @@
     int                 iUsage;
 } WINE_ACMDRIVER;
 
-typedef struct _WINE_ACMSTREAM
+typedef struct WINE_ACMSTREAM
 {
     WINE_ACMOBJ		obj;
     PWINE_ACMDRIVER	pDrv;
@@ -39,7 +39,7 @@
     HACMDRIVER		hAcmDriver;
 } WINE_ACMSTREAM, *PWINE_ACMSTREAM;
 
-typedef struct _WINE_ACMDRIVERID
+typedef struct WINE_ACMDRIVERID
 {
     LPSTR               pszFileName;
     WORD		wFormatTag;