- Converted HWAVE, HWAVEIN, HWAVEOUT to void*.
- Fixed some HMIDI{IN,OUT}16 to HANDLE conversions.
- midiOutCacheDrumPatches16 called itself recursively in an infinite
  loop.

diff --git a/include/mmsystem.h b/include/mmsystem.h
index 0ef4f80..51f16cf 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -31,9 +31,9 @@
 typedef LPCSTR		HPCSTR;         /* a huge version of LPCSTR */
 
 DECLARE_OLD_HANDLE(HDRVR);
-DECLARE_OLD_HANDLE(HWAVE);
-DECLARE_OLD_HANDLE(HWAVEIN);
-DECLARE_OLD_HANDLE(HWAVEOUT);
+DECLARE_HANDLE(HWAVE);
+DECLARE_HANDLE(HWAVEIN);
+DECLARE_HANDLE(HWAVEOUT);
 DECLARE_HANDLE(HMIDI);
 DECLARE_HANDLE(HMIDIIN);
 DECLARE_HANDLE(HMIDIOUT);