diff --git a/sfizz/FilePool.cpp b/sfizz/FilePool.cpp
index 8392afb9..7b94c791 100644
--- a/sfizz/FilePool.cpp
+++ b/sfizz/FilePool.cpp
@@ -131,7 +131,7 @@ void sfz::FilePool::loadingThread() noexcept
 
         SndfileHandle sndFile(reinterpret_cast<const char*>(file.c_str()));
         
-        std::lock_guard guard { fileHandleMutex };
+        std::lock_guard<std::mutex> guard { fileHandleMutex };
         fileHandles.emplace_back(readFromFile<float>(sndFile, fileToLoad.numFrames));
         fileToLoad.voice->setFileData(fileHandles.back(), fileToLoad.ticket);
     }
@@ -142,11 +142,10 @@ void sfz::FilePool::garbageThread() noexcept
     while (!quitThread) {
         for (auto handle = fileHandles.begin(); handle < fileHandles.end();) {
             if (handle->use_count() == 1) {
-                std::lock_guard guard { fileHandleMutex };
                 handle->reset();
+                std::lock_guard<std::mutex> guard { fileHandleMutex };
                 std::iter_swap(handle, fileHandles.end() - 1);
                 fileHandles.pop_back();
-                DBG("Popped a background file... " << fileHandles.size() << " remaining")
             } else {
                 handle++;
             }
diff --git a/sfizz/LeakDetector.h b/sfizz/LeakDetector.h
index 9d50500d..a6f007e5 100644
--- a/sfizz/LeakDetector.h
+++ b/sfizz/LeakDetector.h
@@ -24,7 +24,7 @@
 #pragma once
 #include <atomic>
 #include "Debug.h"
-#include "compat/inline.h"
+#include "compat/utils.h"
 
 template <class Owner>
 class LeakDetector {
diff --git a/sfizz/MathHelpers.h b/sfizz/MathHelpers.h
index 7452eb20..b4b1a953 100644
--- a/sfizz/MathHelpers.h
+++ b/sfizz/MathHelpers.h
@@ -22,7 +22,7 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
-#include "compat/inline.h"
+#include "compat/utils.h"
 #include <algorithm>
 #include <cmath>
 #include <random>
diff --git a/sfizz/MidiState.h b/sfizz/MidiState.h
index 84eab5d5..fd575529 100644
--- a/sfizz/MidiState.h
+++ b/sfizz/MidiState.h
@@ -1,6 +1,6 @@
 #include <chrono>
 #include <array>
-#include "compat/inline.h"
+#include "compat/utils.h"
 namespace sfz
 {
 	SFZ_INLINE std::array<std::chrono::steady_clock::time_point, 128> noteOnTimes { };
diff --git a/sfizz/compat/filesystem.h b/sfizz/compat/filesystem.h
index d3103fe6..6b040bf7 100644
--- a/sfizz/compat/filesystem.h
+++ b/sfizz/compat/filesystem.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #ifdef __cplusplus
-	#if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+	#if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
 		#include <filesystem>
-	#elif (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+	#elif (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 		#warning std::experimental::filesystem in use
 		#include <experimental/filesystem>
 		namespace std {
diff --git a/sfizz/compat/inline.h b/sfizz/compat/utils.h
similarity index 71%
rename from sfizz/compat/inline.h
rename to sfizz/compat/utils.h
index 6faf861a..0d053c0e 100644
--- a/sfizz/compat/inline.h
+++ b/sfizz/compat/utils.h
@@ -1,9 +1,11 @@
 #pragma once
 
 #ifdef __cplusplus
-    #if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+    #if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+        #define SFZ_HAVE_CXX17 1
         #define SFZ_INLINE inline
     #else
+        #define SFZ_HAVE_CXX17 0
         #define SFZ_INLINE
     #endif
 #else