diff --git a/include/debug.h b/include/debug.h
index 166e2ed..a8bb299 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -79,82 +79,84 @@
 #define dbch_local 71
 #define dbch_mci 72
 #define dbch_mcianim 73
-#define dbch_mciwave 74
-#define dbch_mdi 75
-#define dbch_menu 76
-#define dbch_message 77
-#define dbch_metafile 78
-#define dbch_midi 79
-#define dbch_mmaux 80
-#define dbch_mmio 81
-#define dbch_mmsys 82
-#define dbch_mmtime 83
-#define dbch_module 84
-#define dbch_monthcal 85
-#define dbch_mpr 86
-#define dbch_msacm 87
-#define dbch_msg 88
-#define dbch_nativefont 89
-#define dbch_nonclient 90
-#define dbch_ntdll 91
-#define dbch_ole 92
-#define dbch_pager 93
-#define dbch_palette 94
-#define dbch_pidl 95
-#define dbch_print 96
-#define dbch_process 97
-#define dbch_profile 98
-#define dbch_progress 99
-#define dbch_prop 100
-#define dbch_psapi 101
-#define dbch_psdrv 102
-#define dbch_rebar 103
-#define dbch_reg 104
-#define dbch_region 105
-#define dbch_relay 106
-#define dbch_resource 107
-#define dbch_s 108
-#define dbch_scroll 109
-#define dbch_security 110
-#define dbch_segment 111
-#define dbch_selector 112
-#define dbch_sem 113
-#define dbch_sendmsg 114
-#define dbch_shell 115
-#define dbch_shm 116
-#define dbch_snoop 117
-#define dbch_sound 118
-#define dbch_static 119
-#define dbch_statusbar 120
-#define dbch_stress 121
-#define dbch_string 122
-#define dbch_syscolor 123
-#define dbch_system 124
-#define dbch_tab 125
-#define dbch_task 126
-#define dbch_text 127
-#define dbch_thread 128
-#define dbch_thunk 129
-#define dbch_timer 130
-#define dbch_toolbar 131
-#define dbch_toolhelp 132
-#define dbch_tooltips 133
-#define dbch_trackbar 134
-#define dbch_treeview 135
-#define dbch_tweak 136
-#define dbch_uitools 137
-#define dbch_updown 138
-#define dbch_ver 139
-#define dbch_virtual 140
-#define dbch_vxd 141
-#define dbch_win 142
-#define dbch_win16drv 143
-#define dbch_win32 144
-#define dbch_wing 145
-#define dbch_winsock 146
-#define dbch_wnet 147
-#define dbch_x11 148
-#define dbch_x11drv 149
+#define dbch_mcimidi 74
+#define dbch_mciwave 75
+#define dbch_mdi 76
+#define dbch_menu 77
+#define dbch_message 78
+#define dbch_metafile 79
+#define dbch_midi 80
+#define dbch_mmaux 81
+#define dbch_mmio 82
+#define dbch_mmsys 83
+#define dbch_mmtime 84
+#define dbch_module 85
+#define dbch_monthcal 86
+#define dbch_mpr 87
+#define dbch_msacm 88
+#define dbch_msg 89
+#define dbch_nativefont 90
+#define dbch_nonclient 91
+#define dbch_ntdll 92
+#define dbch_ole 93
+#define dbch_pager 94
+#define dbch_palette 95
+#define dbch_pidl 96
+#define dbch_print 97
+#define dbch_process 98
+#define dbch_profile 99
+#define dbch_progress 100
+#define dbch_prop 101
+#define dbch_psapi 102
+#define dbch_psdrv 103
+#define dbch_rebar 104
+#define dbch_reg 105
+#define dbch_region 106
+#define dbch_relay 107
+#define dbch_resource 108
+#define dbch_s 109
+#define dbch_scroll 110
+#define dbch_security 111
+#define dbch_segment 112
+#define dbch_selector 113
+#define dbch_sem 114
+#define dbch_sendmsg 115
+#define dbch_shell 116
+#define dbch_shm 117
+#define dbch_snoop 118
+#define dbch_sound 119
+#define dbch_static 120
+#define dbch_statusbar 121
+#define dbch_stress 122
+#define dbch_string 123
+#define dbch_syscolor 124
+#define dbch_system 125
+#define dbch_tab 126
+#define dbch_task 127
+#define dbch_text 128
+#define dbch_thread 129
+#define dbch_thunk 130
+#define dbch_timer 131
+#define dbch_toolbar 132
+#define dbch_toolhelp 133
+#define dbch_tooltips 134
+#define dbch_trackbar 135
+#define dbch_treeview 136
+#define dbch_tweak 137
+#define dbch_uitools 138
+#define dbch_updown 139
+#define dbch_ver 140
+#define dbch_virtual 141
+#define dbch_vxd 142
+#define dbch_wave 143
+#define dbch_win 144
+#define dbch_win16drv 145
+#define dbch_win32 146
+#define dbch_wing 147
+#define dbch_winsock 148
+#define dbch_wnet 149
+#define dbch_x11 150
+#define dbch_x11drv 151
 /* Definitions for classes identifiers */
 #define dbcl_fixme 0
 #define dbcl_err 1
diff --git a/include/debugdefs.h b/include/debugdefs.h
index 964e2a9..4977e53 100644
--- a/include/debugdefs.h
+++ b/include/debugdefs.h
@@ -4,7 +4,7 @@
 #include "debugtools.h"
 #endif
 
-#define DEBUG_CHANNEL_COUNT 150
+#define DEBUG_CHANNEL_COUNT 152
 #ifdef DEBUG_RUNTIME
 short debug_msg_enabled[][DEBUG_CLASS_COUNT] = {
 {1, 1, 0, 0},
@@ -157,6 +157,8 @@
 {1, 1, 0, 0},
 {1, 1, 0, 0},
 {1, 1, 0, 0},
+{1, 1, 0, 0},
+{1, 1, 0, 0},
 };
 const char* debug_ch_name[] = {
 "1",
@@ -233,6 +235,7 @@
 "local",
 "mci",
 "mcianim",
+"mcimidi",
 "mciwave",
 "mdi",
 "menu",
@@ -301,6 +304,7 @@
 "ver",
 "virtual",
 "vxd",
+"wave",
 "win",
 "win16drv",
 "win32",
diff --git a/multimedia/Makefile.in b/multimedia/Makefile.in
index 25e2312..7fe03ba 100644
--- a/multimedia/Makefile.in
+++ b/multimedia/Makefile.in
@@ -13,7 +13,9 @@
 	joystick.c \
 	mcianim.c \
 	mcicda.c \
+	mcimidi.c \
 	mcistring.c \
+	mciwave.c \
 	midi.c \
 	midipatch.c \
 	mixer.c \