diff --git a/libs/ardour/MSVClibardour/ardour.vcproj b/libs/ardour/MSVClibardour/ardour.vcproj
index 894bf7ee64..ec8d340e79 100644
--- a/libs/ardour/MSVClibardour/ardour.vcproj
+++ b/libs/ardour/MSVClibardour/ardour.vcproj
@@ -351,6 +351,10 @@
 				RelativePath="..\audioregion.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\audiorom.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\audiosource.cc"
 				>
@@ -939,6 +943,10 @@
 				RelativePath="..\rc_configuration.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\readable.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\readonly_control.cc"
 				>
@@ -1577,6 +1585,10 @@
 				RelativePath="..\ardour\audioregion.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ardour\audiorom.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ardour\audiosource.h"
 				>
diff --git a/libs/ardour/convolver.cc b/libs/ardour/convolver.cc
index 916fd35fe8..093921a055 100644
--- a/libs/ardour/convolver.cc
+++ b/libs/ardour/convolver.cc
@@ -24,19 +24,21 @@
 #include "ardour/audio_buffer.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
+#include "ardour/chan_mapping.h"
 #include "ardour/convolver.h"
 #include "ardour/dsp_filter.h"
 #include "ardour/readable.h"
 #include "ardour/session.h"
 #include "ardour/source_factory.h"
 #include "ardour/srcfilesource.h"
+#include "ardour/types.h"
 
 #include "pbd/i18n.h"
 
+using namespace ARDOUR;
 using namespace ARDOUR::DSP;
 using namespace ArdourZita;
 
-using ARDOUR::Session;
 Convolution::Convolution (Session& session, uint32_t n_in, uint32_t n_out)
     : SessionHandleRef (session)
     , _n_samples (0)
diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj
index c6867c1e05..5d1b4f0e7e 100644
--- a/libs/pbd/MSVCpbd/pbd.vcproj
+++ b/libs/pbd/MSVCpbd/pbd.vcproj
@@ -470,6 +470,10 @@
 				RelativePath="..\timing.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\tlsf.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\transmitter.cc"
 				>
@@ -832,6 +836,10 @@
 				RelativePath="..\pbd\timing.h"
 				>
 			</File>
+			<File
+				RelativePath="..\pbd\tlsf.h"
+				>
+			</File>
 			<File
 				RelativePath="..\pbd\tokenizer.h"
 				>
diff --git a/libs/pbd/tlsf.cc b/libs/pbd/tlsf.cc
index 40c5864c41..3fe8674f0f 100644
--- a/libs/pbd/tlsf.cc
+++ b/libs/pbd/tlsf.cc
@@ -52,8 +52,10 @@
 //#define TLSF_STATISTIC 1
 
 #ifndef USE_PRINTF
+#if TLSF_STATISTIC
 #define USE_PRINTF      (1)
 #endif
+#endif
 
 #include <assert.h>
 #include <stdlib.h>
@@ -138,9 +140,11 @@
 # define ERROR_MSG(fmt, args...) printf(fmt, ## args)
 #else
 # if !defined(PRINT_MSG)
-#  define PRINT_MSG(fmt, args...)
+#  if TLSF_STATISTIC
+#    define PRINT_MSG(fmt, args...)
+#  endif
 # endif
-# if !defined(ERROR_MSG)
+# if !defined(ERROR_MSG) && !defined(COMPILER_MSVC)
 #  define ERROR_MSG(fmt, args...)
 # endif
 #endif