diff --git a/libraries/music_common/fileio.h b/libraries/music_common/fileio.h
index ebf740cda6..dab3b3b27a 100644
--- a/libraries/music_common/fileio.h
+++ b/libraries/music_common/fileio.h
@@ -24,6 +24,7 @@
 
 #pragma once
 #include <stdio.h>
+#include <string.h>
 #include <vector>
 #include <string>
 
diff --git a/libraries/timidity/timidity.cpp b/libraries/timidity/timidity.cpp
index 1608dd92ef..afd36a9d1f 100644
--- a/libraries/timidity/timidity.cpp
+++ b/libraries/timidity/timidity.cpp
@@ -20,6 +20,7 @@
 	timidity.c
 */
 
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory>
diff --git a/libraries/zmusic/CMakeLists.txt b/libraries/zmusic/CMakeLists.txt
index 071eeb20d7..f7da61a5b6 100644
--- a/libraries/zmusic/CMakeLists.txt
+++ b/libraries/zmusic/CMakeLists.txt
@@ -91,7 +91,7 @@ add_library( zmusic STATIC
 	zmusic/zmusic.cpp
 	${PLAT_SOURCES}
 	)
-target_link_libraries( zmusic )
+target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
 
 
 source_group("MIDI Devices" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/mididevices/.+")
diff --git a/libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp b/libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp
index acb0c695b5..e6fb89b29c 100644
--- a/libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp
+++ b/libraries/zmusic/mididevices/music_adlmidi_mididevice.cpp
@@ -34,6 +34,8 @@
 
 // HEADER FILES ------------------------------------------------------------
 
+#include <stdlib.h>
+
 #include "mididevice.h"
 #include "adlmidi.h"
 
diff --git a/libraries/zmusic/mididevices/music_timidity_mididevice.cpp b/libraries/zmusic/mididevices/music_timidity_mididevice.cpp
index 44837462fe..b460a74a83 100644
--- a/libraries/zmusic/mididevices/music_timidity_mididevice.cpp
+++ b/libraries/zmusic/mididevices/music_timidity_mididevice.cpp
@@ -34,6 +34,8 @@
 
 // HEADER FILES ------------------------------------------------------------
 
+#include <stdlib.h>
+
 #include "mididevice.h"
 #include "timidity/timidity.h"
 #include "timidity/playmidi.h"
diff --git a/libraries/zmusic/midisources/midisource.h b/libraries/zmusic/midisources/midisource.h
index 42f7690d83..b8792f60ab 100644
--- a/libraries/zmusic/midisources/midisource.h
+++ b/libraries/zmusic/midisources/midisource.h
@@ -8,6 +8,8 @@
 #ifndef midisources_h
 #define midisources_h
 
+#include <stddef.h>
+#include <string.h>
 #include <stdint.h>
 #include <functional>
 #include <vector>
diff --git a/libraries/zmusic/musicformats/music_cd.cpp b/libraries/zmusic/musicformats/music_cd.cpp
index daedcd3705..e8534cc0d5 100644
--- a/libraries/zmusic/musicformats/music_cd.cpp
+++ b/libraries/zmusic/musicformats/music_cd.cpp
@@ -196,6 +196,8 @@ MusInfo* CDDA_OpenSong(MusicIO::FileInterface* reader)
 
 #else
 
+#include <stdexcept>
+
 MusInfo* CD_OpenSong(int track, int id)
 {
 	throw std::runtime_error("CD Audio playback not supported");