- Convert HDRVR to a void*.
- Fix declaration of DriverCallback().

diff --git a/include/mmddk.h b/include/mmddk.h
index f3f917a..b224a01 100644
--- a/include/mmddk.h
+++ b/include/mmddk.h
@@ -515,10 +515,9 @@
 
 BOOL16			WINAPI	DriverCallback16(DWORD dwCallBack, UINT16 uFlags, HANDLE16 hDev,
 						 WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
-BOOL		 	WINAPI	DriverCallback(DWORD dwCallBack, UINT uFlags, HANDLE hDev,
+BOOL		 	WINAPI	DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev,
 					       UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
 
 #include "poppack.h"
 
 #endif /* __MMDDK_H */
-
diff --git a/include/mmsystem.h b/include/mmsystem.h
index 88dd1dc..a24eaab 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -30,7 +30,7 @@
 typedef LPSTR		HPSTR;          /* a huge version of LPSTR */
 typedef LPCSTR		HPCSTR;         /* a huge version of LPCSTR */
 
-DECLARE_OLD_HANDLE(HDRVR);
+DECLARE_HANDLE(HDRVR);
 DECLARE_HANDLE(HWAVE);
 DECLARE_HANDLE(HWAVEIN);
 DECLARE_HANDLE(HWAVEOUT);