diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index 84348063695..03ccba829b3 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -133,7 +133,7 @@ static const IDirectSoundNotifyVtbl dsnvt =
     IDirectSoundNotifyImpl_SetNotificationPositions,
 };
 
-HRESULT WINAPI IDirectSoundNotifyImpl_Create(
+HRESULT IDirectSoundNotifyImpl_Create(
     IDirectSoundBufferImpl * dsb,
     IDirectSoundNotifyImpl **pdsn)
 {
@@ -157,7 +157,7 @@ HRESULT WINAPI IDirectSoundNotifyImpl_Create(
     return DS_OK;
 }
 
-HRESULT WINAPI IDirectSoundNotifyImpl_Destroy(
+HRESULT IDirectSoundNotifyImpl_Destroy(
     IDirectSoundNotifyImpl *pdsn)
 {
     TRACE("(%p)\n",pdsn);
@@ -983,7 +983,7 @@ static const IDirectSoundBuffer8Vtbl dsbvt =
 	IDirectSoundBufferImpl_GetObjectInPath
 };
 
-HRESULT WINAPI IDirectSoundBufferImpl_Create(
+HRESULT IDirectSoundBufferImpl_Create(
 	IDirectSoundImpl *ds,
 	IDirectSoundBufferImpl **pdsb,
 	LPCDSBUFFERDESC dsbd)
@@ -1173,7 +1173,7 @@ HRESULT WINAPI IDirectSoundBufferImpl_Create(
 	return err;
 }
 
-HRESULT WINAPI IDirectSoundBufferImpl_Destroy(
+HRESULT IDirectSoundBufferImpl_Destroy(
     IDirectSoundBufferImpl *pdsb)
 {
     TRACE("(%p)\n",pdsb);
@@ -1478,7 +1478,7 @@ static const IDirectSoundBuffer8Vtbl sbvt =
 	SecondaryBufferImpl_GetObjectInPath
 };
 
-HRESULT WINAPI SecondaryBufferImpl_Create(
+HRESULT SecondaryBufferImpl_Create(
 	IDirectSoundBufferImpl *dsb,
 	SecondaryBufferImpl **psb)
 {
@@ -1501,7 +1501,7 @@ HRESULT WINAPI SecondaryBufferImpl_Create(
 	return S_OK;
 }
 
-HRESULT WINAPI SecondaryBufferImpl_Destroy(
+HRESULT SecondaryBufferImpl_Destroy(
     SecondaryBufferImpl *pdsb)
 {
     TRACE("(%p)\n",pdsb);
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 33328c015be..b2633f26613 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -68,7 +68,7 @@ static const char * captureStateString[] = {
     "STATE_STOPPING"
 };
 
-HRESULT WINAPI IDirectSoundCaptureImpl_Create(
+HRESULT IDirectSoundCaptureImpl_Create(
     LPDIRECTSOUNDCAPTURE8 * ppDSC)
 {
     IDirectSoundCaptureImpl *pDSC;
@@ -91,7 +91,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_Create(
     return DS_OK;
 }
 
-HRESULT WINAPI DSOUND_CaptureCreate(
+HRESULT DSOUND_CaptureCreate(
     LPDIRECTSOUNDCAPTURE *ppDSC,
     IUnknown *pUnkOuter)
 {
@@ -114,7 +114,7 @@ HRESULT WINAPI DSOUND_CaptureCreate(
     return hr;
 }
 
-HRESULT WINAPI DSOUND_CaptureCreate8(
+HRESULT DSOUND_CaptureCreate8(
     LPDIRECTSOUNDCAPTURE8 *ppDSC8,
     IUnknown *pUnkOuter)
 {
@@ -1030,7 +1030,7 @@ static const IDirectSoundNotifyVtbl dscnvt =
     IDirectSoundCaptureNotifyImpl_SetNotificationPositions,
 };
 
-HRESULT WINAPI IDirectSoundCaptureNotifyImpl_Create(
+HRESULT IDirectSoundCaptureNotifyImpl_Create(
     IDirectSoundCaptureBufferImpl *dscb,
     IDirectSoundCaptureNotifyImpl **pdscn)
 {
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 02bf0162f51..ca5fa805eb2 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -1016,7 +1016,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
     return ref;
 }
 
-HRESULT WINAPI IDirectSoundImpl_Create(
+HRESULT IDirectSoundImpl_Create(
     LPDIRECTSOUND8 * ppDS)
 {
     IDirectSoundImpl* pDS;
@@ -1082,7 +1082,7 @@ static const IUnknownVtbl DirectSound_Unknown_Vtbl =
     IDirectSound_IUnknown_Release
 };
 
-HRESULT WINAPI IDirectSound_IUnknown_Create(
+HRESULT IDirectSound_IUnknown_Create(
     LPDIRECTSOUND8 pds,
     LPUNKNOWN * ppunk)
 {
@@ -1243,7 +1243,7 @@ static const IDirectSoundVtbl DirectSound_DirectSound_Vtbl =
     IDirectSound_IDirectSound_Initialize
 };
 
-HRESULT WINAPI IDirectSound_IDirectSound_Create(
+HRESULT IDirectSound_IDirectSound_Create(
     LPDIRECTSOUND8  pds,
     LPDIRECTSOUND * ppds)
 {
@@ -1321,7 +1321,7 @@ static const IUnknownVtbl DirectSound8_Unknown_Vtbl =
     IDirectSound8_IUnknown_Release
 };
 
-HRESULT WINAPI IDirectSound8_IUnknown_Create(
+HRESULT IDirectSound8_IUnknown_Create(
     LPDIRECTSOUND8 pds,
     LPUNKNOWN * ppunk)
 {
@@ -1482,7 +1482,7 @@ static const IDirectSoundVtbl DirectSound8_DirectSound_Vtbl =
     IDirectSound8_IDirectSound_Initialize
 };
 
-HRESULT WINAPI IDirectSound8_IDirectSound_Create(
+HRESULT IDirectSound8_IDirectSound_Create(
     LPDIRECTSOUND8 pds,
     LPDIRECTSOUND * ppds)
 {
@@ -1653,7 +1653,7 @@ static const IDirectSound8Vtbl DirectSound8_DirectSound8_Vtbl =
     IDirectSound8_IDirectSound8_VerifyCertification
 };
 
-HRESULT WINAPI IDirectSound8_IDirectSound8_Create(
+HRESULT IDirectSound8_IDirectSound8_Create(
     LPDIRECTSOUND8 pds,
     LPDIRECTSOUND8 * ppds)
 {
@@ -1688,7 +1688,7 @@ HRESULT WINAPI IDirectSound8_IDirectSound8_Create(
     return DS_OK;
 }
 
-HRESULT WINAPI DSOUND_Create(
+HRESULT DSOUND_Create(
     LPDIRECTSOUND *ppDS,
     IUnknown *pUnkOuter)
 {
@@ -1769,7 +1769,7 @@ HRESULT WINAPI DirectSoundCreate(
     return hr;
 }
 
-HRESULT WINAPI DSOUND_Create8(
+HRESULT DSOUND_Create8(
     LPDIRECTSOUND8 *ppDS,
     IUnknown *pUnkOuter)
 {
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 2ccf7fcd4d1..a6defb31f15 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -122,14 +122,14 @@ typedef struct BufferMemory
     LPBYTE                      memory;
 } BufferMemory;
 
-HRESULT WINAPI IDirectSoundImpl_Create(
+HRESULT IDirectSoundImpl_Create(
     LPDIRECTSOUND8 * ppds);
 
-HRESULT WINAPI DSOUND_Create(
+HRESULT DSOUND_Create(
     LPDIRECTSOUND *ppDS,
     IUnknown *pUnkOuter);
 
-HRESULT WINAPI DSOUND_Create8(
+HRESULT DSOUND_Create8(
     LPDIRECTSOUND8 *ppDS,
     IUnknown *pUnkOuter);
 
@@ -142,7 +142,7 @@ struct IDirectSound_IUnknown {
     LPDIRECTSOUND8              pds;
 };
 
-HRESULT WINAPI IDirectSound_IUnknown_Create(
+HRESULT IDirectSound_IUnknown_Create(
     LPDIRECTSOUND8 pds,
     LPUNKNOWN * ppunk);
 
@@ -152,7 +152,7 @@ struct IDirectSound_IDirectSound {
     LPDIRECTSOUND8              pds;
 };
 
-HRESULT WINAPI IDirectSound_IDirectSound_Create(
+HRESULT IDirectSound_IDirectSound_Create(
     LPDIRECTSOUND8 pds,
     LPDIRECTSOUND * ppds);
 
@@ -165,7 +165,7 @@ struct IDirectSound8_IUnknown {
     LPDIRECTSOUND8              pds;
 };
 
-HRESULT WINAPI IDirectSound8_IUnknown_Create(
+HRESULT IDirectSound8_IUnknown_Create(
     LPDIRECTSOUND8 pds,
     LPUNKNOWN * ppunk);
 
@@ -175,7 +175,7 @@ struct IDirectSound8_IDirectSound {
     LPDIRECTSOUND8              pds;
 };
 
-HRESULT WINAPI IDirectSound8_IDirectSound_Create(
+HRESULT IDirectSound8_IDirectSound_Create(
     LPDIRECTSOUND8 pds,
     LPDIRECTSOUND * ppds);
 
@@ -185,7 +185,7 @@ struct IDirectSound8_IDirectSound8 {
     LPDIRECTSOUND8              pds;
 };
 
-HRESULT WINAPI IDirectSound8_IDirectSound8_Create(
+HRESULT IDirectSound8_IDirectSound8_Create(
     LPDIRECTSOUND8 pds,
     LPDIRECTSOUND8 * ppds);
 
@@ -234,11 +234,11 @@ struct IDirectSoundBufferImpl
     IKsBufferPropertySetImpl*   iks;
 };
 
-HRESULT WINAPI IDirectSoundBufferImpl_Create(
+HRESULT IDirectSoundBufferImpl_Create(
     IDirectSoundImpl *ds,
     IDirectSoundBufferImpl **pdsb,
     LPCDSBUFFERDESC dsbd);
-HRESULT WINAPI IDirectSoundBufferImpl_Destroy(
+HRESULT IDirectSoundBufferImpl_Destroy(
     IDirectSoundBufferImpl *pdsb);
 
 /*****************************************************************************
@@ -251,10 +251,10 @@ struct SecondaryBufferImpl
     IDirectSoundBufferImpl*     dsb;
 };
 
-HRESULT WINAPI SecondaryBufferImpl_Create(
+HRESULT SecondaryBufferImpl_Create(
     IDirectSoundBufferImpl *dsb,
     SecondaryBufferImpl **pdsb);
-HRESULT WINAPI SecondaryBufferImpl_Destroy(
+HRESULT SecondaryBufferImpl_Destroy(
     SecondaryBufferImpl *pdsb);
 
 /*****************************************************************************
@@ -267,7 +267,7 @@ struct PrimaryBufferImpl
     IDirectSoundImpl*           dsound;
 };
 
-HRESULT WINAPI PrimaryBufferImpl_Create(
+HRESULT PrimaryBufferImpl_Create(
     IDirectSoundImpl *ds,
     PrimaryBufferImpl **pdsb,
     LPCDSBUFFERDESC dsbd);
@@ -314,14 +314,14 @@ struct DirectSoundCaptureDevice
     CRITICAL_SECTION                   lock;
 };
 
-HRESULT WINAPI IDirectSoundCaptureImpl_Create(
+HRESULT IDirectSoundCaptureImpl_Create(
     LPDIRECTSOUNDCAPTURE8 * ppds);
 
-HRESULT WINAPI DSOUND_CaptureCreate(
+HRESULT DSOUND_CaptureCreate(
     LPDIRECTSOUNDCAPTURE *ppDSC,
     IUnknown *pUnkOuter);
 
-HRESULT WINAPI DSOUND_CaptureCreate8(
+HRESULT DSOUND_CaptureCreate8(
     LPDIRECTSOUNDCAPTURE8 *ppDSC8,
     IUnknown *pUnkOuter);
 
@@ -370,10 +370,10 @@ struct IDirectSoundNotifyImpl
     IDirectSoundBufferImpl*     dsb;
 };
 
-HRESULT WINAPI IDirectSoundNotifyImpl_Create(
+HRESULT IDirectSoundNotifyImpl_Create(
     IDirectSoundBufferImpl *dsb,
     IDirectSoundNotifyImpl **pdsn);
-HRESULT WINAPI IDirectSoundNotifyImpl_Destroy(
+HRESULT IDirectSoundNotifyImpl_Destroy(
     IDirectSoundNotifyImpl *pdsn);
 
 /*****************************************************************************
@@ -387,7 +387,7 @@ struct IDirectSoundCaptureNotifyImpl
     IDirectSoundCaptureBufferImpl*      dscb;
 };
 
-HRESULT WINAPI IDirectSoundCaptureNotifyImpl_Create(
+HRESULT IDirectSoundCaptureNotifyImpl_Create(
     IDirectSoundCaptureBufferImpl *dscb,
     IDirectSoundCaptureNotifyImpl ** pdscn);
 
@@ -403,7 +403,7 @@ struct IDirectSound3DListenerImpl
     IDirectSoundImpl*           dsound;
 };
 
-HRESULT WINAPI IDirectSound3DListenerImpl_Create(
+HRESULT IDirectSound3DListenerImpl_Create(
     PrimaryBufferImpl *pb,
     IDirectSound3DListenerImpl **pdsl);
 
@@ -419,10 +419,10 @@ struct IKsBufferPropertySetImpl
     IDirectSoundBufferImpl*	dsb;
 };
 
-HRESULT WINAPI IKsBufferPropertySetImpl_Create(
+HRESULT IKsBufferPropertySetImpl_Create(
     IDirectSoundBufferImpl *dsb,
     IKsBufferPropertySetImpl **piks);
-HRESULT WINAPI IKsBufferPropertySetImpl_Destroy(
+HRESULT IKsBufferPropertySetImpl_Destroy(
     IKsBufferPropertySetImpl *piks);
 
 /*****************************************************************************
@@ -435,7 +435,7 @@ struct IKsPrivatePropertySetImpl
     LONG 			ref;
 };
 
-HRESULT WINAPI IKsPrivatePropertySetImpl_Create(
+HRESULT IKsPrivatePropertySetImpl_Create(
     IKsPrivatePropertySetImpl **piks);
 
 /*****************************************************************************
@@ -450,10 +450,10 @@ struct IDirectSound3DBufferImpl
     IDirectSoundBufferImpl*     dsb;
 };
 
-HRESULT WINAPI IDirectSound3DBufferImpl_Create(
+HRESULT IDirectSound3DBufferImpl_Create(
     IDirectSoundBufferImpl *dsb,
     IDirectSound3DBufferImpl **pds3db);
-HRESULT WINAPI IDirectSound3DBufferImpl_Destroy(
+HRESULT IDirectSound3DBufferImpl_Destroy(
     IDirectSound3DBufferImpl *pds3db);
 
 /*******************************************************************************
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index bca6b85c571..15c84d4f777 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -1033,7 +1033,7 @@ static const IDirectSoundBuffer8Vtbl dspbvt =
 	PrimaryBufferImpl_GetObjectInPath
 };
 
-HRESULT WINAPI PrimaryBufferImpl_Create(
+HRESULT PrimaryBufferImpl_Create(
 	IDirectSoundImpl *ds,
 	PrimaryBufferImpl **pdsb,
 	LPCDSBUFFERDESC dsbd)
diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 99709bf326a..b7d61a83ad3 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -194,7 +194,7 @@ static const IKsPropertySetVtbl iksbvt = {
     IKsBufferPropertySetImpl_QuerySupport
 };
 
-HRESULT WINAPI IKsBufferPropertySetImpl_Create(
+HRESULT IKsBufferPropertySetImpl_Create(
     IDirectSoundBufferImpl *dsb,
     IKsBufferPropertySetImpl **piks)
 {
@@ -219,7 +219,7 @@ HRESULT WINAPI IKsBufferPropertySetImpl_Create(
     return S_OK;
 }
 
-HRESULT WINAPI IKsBufferPropertySetImpl_Destroy(
+HRESULT IKsBufferPropertySetImpl_Destroy(
     IKsBufferPropertySetImpl *piks)
 {
     TRACE("(%p)\n",piks);
@@ -1503,7 +1503,7 @@ static const IKsPropertySetVtbl ikspvt = {
     IKsPrivatePropertySetImpl_QuerySupport
 };
 
-HRESULT WINAPI IKsPrivatePropertySetImpl_Create(
+HRESULT IKsPrivatePropertySetImpl_Create(
     IKsPrivatePropertySetImpl **piks)
 {
     IKsPrivatePropertySetImpl *iks;
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
index 887c785e149..9874ff8c790 100644
--- a/dlls/dsound/sound3d.c
+++ b/dlls/dsound/sound3d.c
@@ -332,7 +332,7 @@ static void DSOUND_Mix3DBuffer(IDirectSoundBufferImpl *dsb)
 	DSOUND_ForceRemix(dsb);			
 }
 
-static void WINAPI DSOUND_ChangeListener(IDirectSound3DListenerImpl *ds3dl)
+static void DSOUND_ChangeListener(IDirectSound3DListenerImpl *ds3dl)
 {
 	int i;
 	TRACE("(%p)\n",ds3dl);
@@ -705,7 +705,7 @@ static const IDirectSound3DBufferVtbl ds3dbvt =
 	IDirectSound3DBufferImpl_SetVelocity,
 };
 
-HRESULT WINAPI IDirectSound3DBufferImpl_Create(
+HRESULT IDirectSound3DBufferImpl_Create(
 	IDirectSoundBufferImpl *dsb,
 	IDirectSound3DBufferImpl **pds3db)
 {
@@ -749,7 +749,7 @@ HRESULT WINAPI IDirectSound3DBufferImpl_Create(
 	return S_OK;
 }
 
-HRESULT WINAPI IDirectSound3DBufferImpl_Destroy(
+HRESULT IDirectSound3DBufferImpl_Destroy(
     IDirectSound3DBufferImpl *pds3db)
 {
     TRACE("(%p)\n",pds3db);
@@ -1071,7 +1071,7 @@ static const IDirectSound3DListenerVtbl ds3dlvt =
 	IDirectSound3DListenerImpl_CommitDeferredSettings,
 };
 
-HRESULT WINAPI IDirectSound3DListenerImpl_Create(
+HRESULT IDirectSound3DListenerImpl_Create(
 	PrimaryBufferImpl *This,
 	IDirectSound3DListenerImpl **pdsl)
 {