diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c
index 51384c0fad..6aff1be771 100644
--- a/gtk2_ardour/canvas-waveview.c
+++ b/gtk2_ardour/canvas-waveview.c
@@ -35,7 +35,7 @@
 /* POSIX guarantees casting between void* and function pointers, ISO C doesn't
  * We can work around warnings by going one step deeper in our casts
  */
-#if defined(_POSIX_VERSION) || defined(__MINGW32__)
+#if defined(_POSIX_VERSION) || defined(COMPILER_MINGW)
 #define POSIX_FUNC_PTR_CAST(type, object) *((type*) &(object))
 #endif // _POSIX_VERSION
 
diff --git a/gtk2_ardour/system_exec.cc b/gtk2_ardour/system_exec.cc
index 46b011171d..1a8399d22e 100644
--- a/gtk2_ardour/system_exec.cc
+++ b/gtk2_ardour/system_exec.cc
@@ -25,7 +25,10 @@
 #include <unistd.h>
 
 #include <assert.h>
+
+#ifndef COMPILER_MSVC
 #include <dirent.h>
+#endif
 
 #ifdef PLATFORM_WINDOWS
 #include <windows.h>