diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index c43e5c5..6fe8bde 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -53,8 +53,8 @@ endif()
 if( WIN32 )
 	add_definitions( -D_WIN32 )
 	set( SYS_LIBS winmm )
-elseif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "^NetBSD$")
-	set( SYS_LIBS dl )
+else()
+	set( SYS_LIBS ${CMAKE_DL_LIBS} )
 endif() 
 
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/zmusic" "${CMAKE_CURRENT_SOURCE_DIR}/../include" "${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/dumb/include" "${ZLIB_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" "${OPLSYNTH_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" )
diff --git a/source/zmusic/fileio.h b/source/zmusic/fileio.h
index e1cff1e..a843459 100644
--- a/source/zmusic/fileio.h
+++ b/source/zmusic/fileio.h
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <vector>
 #include <string>
-#include <cstdarg>
+
 
 #if defined _WIN32 && !defined _WINDOWS_	// only define this if windows.h is not included.
 	// I'd rather not include Windows.h for just this. This header is not supposed to pollute everything it touches.
diff --git a/thirdparty/wildmidi/wildmidi/wildmidi_lib.h b/thirdparty/wildmidi/wildmidi/wildmidi_lib.h
index e969da3..f76598e 100644
--- a/thirdparty/wildmidi/wildmidi/wildmidi_lib.h
+++ b/thirdparty/wildmidi/wildmidi/wildmidi_lib.h
@@ -28,6 +28,7 @@
 #define WILDMIDI_LIB_H
 
 #include "../../../source/zmusic/fileio.h"
+#include <cstdarg>
 
 namespace WildMidi
 {