diff --git a/libs/pbd/pbd/msvc_pbd.h b/libs/pbd/pbd/msvc_pbd.h
index 97ac72ff27..462eafc756 100644
--- a/libs/pbd/pbd/msvc_pbd.h
+++ b/libs/pbd/pbd/msvc_pbd.h
@@ -142,7 +142,7 @@ LIBPBD_API     char* 	PBD_APICALLTYPE     dlerror () __THROW;
 /* For whatever reason, Ardour's 'libevoral' refuses to build as a DLL if we include both 'rpc.h' */
 /* and 'WinSock2.h'. It doesn't seem to matter which order we #include them. Given that we can't  */
 /* edit 'rpc.h' or 'WinSock2.h', just make sure we don't #include them when building libevoral.   */
-#ifndef BUILDING_EVORAL
+#if !defined(BUILDING_EVORAL) && !defined(BUILDING_VAMPPLUGINS)
 #include <rpc.h>
 typedef int (FAR PBDEXTN_APICALLTYPE *CYGINIT_API)(unsigned int);
 #endif
diff --git a/libs/vamp-plugins/BarBeatTrack.cpp b/libs/vamp-plugins/BarBeatTrack.cpp
index 2f3016cc40..d2f7d73c38 100644
--- a/libs/vamp-plugins/BarBeatTrack.cpp
+++ b/libs/vamp-plugins/BarBeatTrack.cpp
@@ -25,7 +25,7 @@ using std::vector;
 using std::cerr;
 using std::endl;
 
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(_MSC_VER)
 #include <alloca.h>
 #endif
 
diff --git a/msvc_extra_headers/ardourext/sys/time.h.input b/msvc_extra_headers/ardourext/sys/time.h.input
index a0e7ce95f2..b989d0cd36 100644
--- a/msvc_extra_headers/ardourext/sys/time.h.input
+++ b/msvc_extra_headers/ardourext/sys/time.h.input
@@ -7,7 +7,7 @@
 typedef long          __suseconds_t;
 typedef __suseconds_t   suseconds_t;
 #endif
-#ifndef BUILDING_EVORAL
+#if !defined(BUILDING_EVORAL) && !defined(BUILDING_VAMPPLUGINS)
 #include <WinSock2.h> /* gets 'struct timeval' - Changed by JE - 23-07-2013. Was formerly. . . #include <WinSock.h> */
 /* For whatever reason, Ardour's 'libevoral' refuses to build as a DLL if we include both 'rpc.h' */
 /* and 'WinSock2.h'. It doesn't seem to matter which order we #include them. Given that we can't  */