diff --git a/libs/ardour/MSVClibardour/ardour.vcproj b/libs/ardour/MSVClibardour/ardour.vcproj
index ed0a313996..5e52638313 100644
--- a/libs/ardour/MSVClibardour/ardour.vcproj
+++ b/libs/ardour/MSVClibardour/ardour.vcproj
@@ -299,10 +299,6 @@
 				RelativePath="..\audio_buffer.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\audio_diskstream.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\audio_library.cc"
 				>
@@ -384,7 +380,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\beats_frames_converter.cc"
+				RelativePath="..\beats_samples_converter.cc"
 				>
 			</File>
 			<File
@@ -468,7 +464,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\diskstream.cc"
+				RelativePath="..\disk_io.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\disk_reader.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\disk_writer.cc"
 				>
 			</File>
 			<File
@@ -707,10 +711,6 @@
 				RelativePath="..\midi_clock_slave.cc"
 				>
 			</File>
-			<File
-				RelativePath="..\midi_diskstream.cc"
-				>
-			</File>
 			<File
 				RelativePath="..\midi_model.cc"
 				>
@@ -1481,10 +1481,6 @@
 				RelativePath="..\ardour\audio_buffer.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ardour\audio_diskstream.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ardour\audio_library.h"
 				>
@@ -1574,7 +1570,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\ardour\beats_frames_converter.h"
+				RelativePath="..\ardour\beats_samples_converter.h"
 				>
 			</File>
 			<File
@@ -1678,7 +1674,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\ardour\diskstream.h"
+				RelativePath="..\ardour\disk_io.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ardour\disk_reader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ardour\disk_writer.h"
 				>
 			</File>
 			<File
@@ -1961,10 +1965,6 @@
 				RelativePath="..\ardour\midi_cursor.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ardour\midi_diskstream.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ardour\midi_model.h"
 				>
@@ -2185,10 +2185,6 @@
 				RelativePath="..\ardour\proxy_controllable.h"
 				>
 			</File>
-			<File
-				RelativePath="..\ardour\public_diskstream.h"
-				>
-			</File>
 			<File
 				RelativePath="..\ardour\quantize.h"
 				>
@@ -2425,6 +2421,10 @@
 				RelativePath="..\ardour\stripable.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ardour\superclock.h"
+				>
+			</File>
 			<File
 				RelativePath="..\ardour\system_exec.h"
 				>