diff --git a/libraries/timidity/CMakeLists.txt b/libraries/timidity/CMakeLists.txt
index 84dc7d286..8d3b758ed 100644
--- a/libraries/timidity/CMakeLists.txt
+++ b/libraries/timidity/CMakeLists.txt
@@ -9,6 +9,13 @@ endif()
 
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ZD_FASTMATH_FLAG}")
 
+include( CheckFunctionExists )
+
+CHECK_FUNCTION_EXISTS( stricmp STRICMP_EXISTS )
+if( NOT STRICMP_EXISTS )
+	add_definitions( -Dstricmp=strcasecmp )
+endif()
+
 include_directories( timidity )
 
 file( GLOB HEADER_FILES
diff --git a/libraries/timidity/instrum_dls.cpp b/libraries/timidity/instrum_dls.cpp
index 552090e09..24c4c2ebc 100644
--- a/libraries/timidity/instrum_dls.cpp
+++ b/libraries/timidity/instrum_dls.cpp
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <limits.h>
 
 #include "t_swap.h"
 #include "timidity.h"
diff --git a/libraries/timidity/timidity.cpp b/libraries/timidity/timidity.cpp
index 1d7d09c64..3255de186 100644
--- a/libraries/timidity/timidity.cpp
+++ b/libraries/timidity/timidity.cpp
@@ -25,6 +25,7 @@
 #include <memory>
 #include <algorithm>
 #include <stdarg.h>
+#include <string.h>
 
 #include "timidity.h"
 #include "timidity_file.h"