diff --git a/dlls/winmm/mciavi/mmoutput.c b/dlls/winmm/mciavi/mmoutput.c
index 1408f1437c8..541bcf87503 100644
--- a/dlls/winmm/mciavi/mmoutput.c
+++ b/dlls/winmm/mciavi/mmoutput.c
@@ -438,7 +438,7 @@ DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr)
     LPWAVEHDR	waveHdr;
     unsigned	i;
 
-    dwRet = waveOutOpen(&wma->hWave, WAVE_MAPPER, wma->lpWaveFormat,
+    dwRet = waveOutOpen((HWAVEOUT *)&wma->hWave, WAVE_MAPPER, wma->lpWaveFormat,
 			(DWORD)MCIAVI_waveCallback, (DWORD)wma, CALLBACK_FUNCTION);
     if (dwRet != 0) {
 	TRACE("Can't open low level audio device %ld\n", dwRet);
diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c
index a2b7f8ca9de..3c19c8b4264 100644
--- a/dlls/winmm/mciwave/mciwave.c
+++ b/dlls/winmm/mciwave/mciwave.c
@@ -775,7 +775,7 @@ static DWORD WAVE_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms)
      * change from output to input and back
      */
     /* FIXME: how to choose between several output channels ? here mapper is forced */
-    dwRet = waveOutOpen(&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat,
+    dwRet = waveOutOpen((HWAVEOUT *)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat,
 			(DWORD)WAVE_mciPlayCallback, (DWORD)wmw, CALLBACK_FUNCTION);
 
     if (dwRet != 0) {
@@ -1006,7 +1006,7 @@ static DWORD WAVE_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar
      * change from output to input and back
      */
     /* FIXME: how to choose between several output channels ? here mapper is forced */
-    dwRet = waveInOpen(&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat,
+    dwRet = waveInOpen((HWAVEIN*)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat,
 			(DWORD)WAVE_mciRecordCallback, (DWORD)wmw, CALLBACK_FUNCTION);
 
     if (dwRet != 0) {
diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c
index 743fad44f52..4c2ea91bf00 100644
--- a/dlls/winmm/winealsa/audio.c
+++ b/dlls/winmm/winealsa/audio.c
@@ -632,7 +632,7 @@ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD
     case WOM_CLOSE:
     case WOM_DONE:
 	if (wwo->wFlags != DCB_NULL &&
-	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, wwo->waveDesc.hWave,
+	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave,
 			    wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) {
 	    WARN("can't notify client !\n");
 	    return MMSYSERR_ERROR;
diff --git a/dlls/winmm/winearts/audio.c b/dlls/winmm/winearts/audio.c
index 5996b0f4182..3838ab00718 100644
--- a/dlls/winmm/winearts/audio.c
+++ b/dlls/winmm/winearts/audio.c
@@ -456,7 +456,7 @@ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD
     case WOM_CLOSE:
     case WOM_DONE:
 	if (wwo->wFlags != DCB_NULL &&
-	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, wwo->waveDesc.hWave,
+	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave,
 			    wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) {
 	    WARN("can't notify client !\n");
 	    return MMSYSERR_ERROR;
diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c
index 7196349da48..dbbb7f70964 100644
--- a/dlls/winmm/winenas/audio.c
+++ b/dlls/winmm/winenas/audio.c
@@ -534,7 +534,7 @@ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD
     case WOM_CLOSE:
     case WOM_DONE:
 	if (wwo->wFlags != DCB_NULL &&
-	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, wwo->waveDesc.hWave,
+	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave,
 			    wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) {
 	    WARN("can't notify client !\n");
 	    return MMSYSERR_ERROR;
diff --git a/include/windef.h b/include/windef.h
index d37f8e0b64c..e689bc71461 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -72,24 +72,24 @@ typedef DWORD           COLORREF, *LPCOLORREF;
 
 typedef int HFILE;
 DECLARE_HANDLE(HACCEL);
-DECLARE_OLD_HANDLE(HBITMAP);
-DECLARE_OLD_HANDLE(HBRUSH);
+DECLARE_HANDLE(HBITMAP);
+DECLARE_HANDLE(HBRUSH);
 DECLARE_HANDLE(HCOLORSPACE);
-DECLARE_OLD_HANDLE(HDC);
+DECLARE_HANDLE(HDC);
 DECLARE_HANDLE(HDESK);
 DECLARE_HANDLE(HENHMETAFILE);
-DECLARE_OLD_HANDLE(HFONT);
+DECLARE_HANDLE(HFONT);
 DECLARE_HANDLE(HHOOK);
 DECLARE_HANDLE(HICON);
-DECLARE_OLD_HANDLE(HINSTANCE);
+DECLARE_HANDLE(HINSTANCE);
 DECLARE_HANDLE(HKEY);
 DECLARE_HANDLE(HKL);
-DECLARE_OLD_HANDLE(HMENU);
+DECLARE_HANDLE(HMENU);
 DECLARE_HANDLE(HMETAFILE);
 DECLARE_HANDLE(HMONITOR);
 DECLARE_HANDLE(HPALETTE);
-DECLARE_OLD_HANDLE(HPEN);
-DECLARE_OLD_HANDLE(HRGN);
+DECLARE_HANDLE(HPEN);
+DECLARE_HANDLE(HRGN);
 DECLARE_HANDLE(HRSRC);
 DECLARE_HANDLE(HTASK);
 DECLARE_HANDLE(HWINEVENTHOOK);
diff --git a/include/winnt.h b/include/winnt.h
index afc60c73ab7..63f0e6de846 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -561,20 +561,14 @@ typedef DWORD		EXECUTION_STATE;
  * we're ready we'll remove the '!defined(__WINE__)' (the equivalent
  * of converting it from DECLARE_OLD_HANDLE to DECLARE_HANDLE).
  */
-#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
-typedef VOID*           HANDLE;
-#define DECLARE_OLD_HANDLE(a) \
-    typedef struct a##__ { int unused; } *a; \
-    typedef a *P##a
+#if defined(__WINE__) && defined(WINE_NO_STRICT)
+typedef UINT HANDLE;
 #else
-typedef UINT            HANDLE;
-#define DECLARE_OLD_HANDLE(a) \
-    typedef HANDLE a; \
-    typedef a *P##a
+typedef void *HANDLE;
 #endif
-typedef HANDLE         *PHANDLE,    *LPHANDLE;
+typedef HANDLE *PHANDLE, *LPHANDLE;
 
-#ifdef STRICT
+#if defined(STRICT) || (defined(__WINE__) && !defined(WINE_NO_STRICT))
 #define DECLARE_HANDLE(a) \
     typedef struct a##__ { int unused; } *a; \
     typedef a *P##a