diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index 9540441953f..ae95c910551 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -44,10 +44,8 @@ typedef struct tagWINE_LLTYPE {
     /* those attributes depend on the specification of the type */
     LPCSTR		typestr;	/* name (for debugging) */
     BOOL		bSupportMapper;	/* if type is allowed to support mapper */
-    MMDRV_MAPFUNC	Map16To32A;	/* those are function pointers to handle */
-    MMDRV_UNMAPFUNC	UnMap16To32A;	/*   the parameter conversion (16 vs 32 bit) */
-    MMDRV_MAPFUNC	Map32ATo16; 	/*   when hi-func (in mmsystem or winmm) and */
-    MMDRV_UNMAPFUNC	UnMap32ATo16;	/*   low-func (in .drv) do not match */
+    MMDRV_MAPFUNC	Map32WTo16; 	/*   when hi-func (in mmsystem or winmm) and */
+    MMDRV_UNMAPFUNC	UnMap32WTo16;	/*   low-func (in .drv) do not match */
     LPDRVCALLBACK	Callback;       /* handles callback for a specified type */
     /* those attributes reflect the loaded/current situation for the type */
     UINT		wMaxId;		/* number of loaded devices (sum across all loaded drivers) */
@@ -60,7 +58,7 @@ static WINE_MM_DRIVER	MMDrvs[8];
 static LPWINE_MLD	MM_MLDrvs[40];
 #define MAX_MM_MLDRVS	(sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0]))
 
-#define A(_x,_y) {#_y, _x, NULL, NULL, NULL, NULL, NULL, 0, NULL, -1}
+#define A(_x,_y) {#_y, _x, NULL, NULL, NULL, 0, NULL, -1}
 /* Note: the indices of this array must match the definitions
  *	 of the MMDRV_???? manifest constants
  */
@@ -79,16 +77,13 @@ static WINE_LLTYPE	llTypes[MMDRV_MAX] = {
  *
  *
  */
-void    MMDRV_InstallMap(unsigned int drv, 
-                         MMDRV_MAPFUNC mp1632, MMDRV_UNMAPFUNC um1632,
+void    MMDRV_InstallMap(unsigned int drv,
                          MMDRV_MAPFUNC mp3216, MMDRV_UNMAPFUNC um3216,
                          LPDRVCALLBACK cb)
 {
     assert(drv < MMDRV_MAX);
-    llTypes[drv].Map16To32A   = mp1632;
-    llTypes[drv].UnMap16To32A = um1632;
-    llTypes[drv].Map32ATo16   = mp3216;
-    llTypes[drv].UnMap32ATo16 = um3216;
+    llTypes[drv].Map32WTo16   = mp3216;
+    llTypes[drv].UnMap32WTo16 = um3216;
     llTypes[drv].Callback     = cb;
 }
 
@@ -165,7 +160,7 @@ DWORD  MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1,
     } else {
 	assert(part->u.fnMessage16 && pFnCallMMDrvFunc16);
 
-        map = llType->Map32ATo16(wMsg, &mld->dwDriverInstance, &dwParam1, &dwParam2);
+        map = llType->Map32WTo16(wMsg, &mld->dwDriverInstance, &dwParam1, &dwParam2);
         switch (map) {
         case WINMM_MAP_NOMEM:
             ret = MMSYSERR_NOMEM;
@@ -182,7 +177,7 @@ DWORD  MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1,
                                      mld->dwDriverInstance, dwParam1, dwParam2);
             TRACE("=> %s\n", WINMM_ErrorToString(ret));
             if (map == WINMM_MAP_OKMEM)
-                llType->UnMap32ATo16(wMsg, &mld->dwDriverInstance, &dwParam1, &dwParam2, ret);
+                llType->UnMap32WTo16(wMsg, &mld->dwDriverInstance, &dwParam1, &dwParam2, ret);
             break;
         default:
             FIXME("NIY\n");
diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c
index 46923986385..d13190e01c3 100644
--- a/dlls/winmm/message16.c
+++ b/dlls/winmm/message16.c
@@ -66,22 +66,6 @@ static  void	MMDRV_Callback(LPWINE_MLD mld, HDRVR hDev, UINT uMsg, DWORD_PTR dwP
  *       A U X    M A P P E R S
  * ================================= */
 
-/**************************************************************************
- * 				MMDRV_Aux_Map16To32W		[internal]
- */
-static  WINMM_MapType	MMDRV_Aux_Map16To32W  (UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2)
-{
-    return WINMM_MAP_MSGERROR;
-}
-
-/**************************************************************************
- * 				MMDRV_Aux_UnMap16To32W		[internal]
- */
-static  WINMM_MapType	MMDRV_Aux_UnMap16To32W(UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret)
-{
-    return WINMM_MAP_MSGERROR;
-}
-
 /**************************************************************************
  * 				MMDRV_Aux_Map32WTo16		[internal]
  */
@@ -2615,30 +2599,9 @@ static  WINMM_MapType	MCI_UnMapMsg32WTo16(WORD uDevType, WORD wMsg, DWORD dwFlag
     return MCI_MsgMapper32WTo16_Destroy((void*)lParam, size, map, kept);
 }
 
-/* temporary hack */
-static  WINMM_MapType	MMDRV_Map16To32W  (UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2)
-{
-    return WINMM_MAP_MSGERROR;
-}
-static  WINMM_MapType	MMDRV_UnMap16To32W(UINT wMsg, DWORD_PTR *lpdwUser, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret)
-{
-    return WINMM_MAP_MSGERROR;
-}
-#define MMDRV_Mixer_Map16To32W          MMDRV_Map16To32W
-#define MMDRV_Mixer_UnMap16To32W        MMDRV_UnMap16To32W
-#define MMDRV_MidiIn_Map16To32W         MMDRV_Map16To32W
-#define MMDRV_MidiIn_UnMap16To32W       MMDRV_UnMap16To32W
-#define MMDRV_MidiOut_Map16To32W        MMDRV_Map16To32W
-#define MMDRV_MidiOut_UnMap16To32W      MMDRV_UnMap16To32W
-#define MMDRV_WaveIn_Map16To32W         MMDRV_Map16To32W
-#define MMDRV_WaveIn_UnMap16To32W       MMDRV_UnMap16To32W
-#define MMDRV_WaveOut_Map16To32W        MMDRV_Map16To32W
-#define MMDRV_WaveOut_UnMap16To32W      MMDRV_UnMap16To32W
-
 void    MMDRV_Init16(void)
 {
 #define A(_x,_y) MMDRV_InstallMap(_x, \
-MMDRV_##_y##_Map16To32W, MMDRV_##_y##_UnMap16To32W, \
 MMDRV_##_y##_Map32WTo16, MMDRV_##_y##_UnMap32WTo16, \
 MMDRV_##_y##_Callback)
     A(MMDRV_AUX,        Aux);
diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h
index 1a2a0c6c363..8bf2cae4e00 100644
--- a/dlls/winmm/winemm.h
+++ b/dlls/winmm/winemm.h
@@ -191,8 +191,7 @@ LPWINE_MLD	MMDRV_GetRelated(HANDLE hndl, UINT srcType, BOOL bSrcCanBeID, UINT ds
 DWORD           MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
 UINT		MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
 BOOL            MMDRV_Is32(unsigned int);
-void            MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC,
-                                 MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, LPDRVCALLBACK);
+void            MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, LPDRVCALLBACK);
 
 const char* 	MCI_MessageToString(UINT wMsg);
 DWORD           MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2);