diff --git a/README.txt b/README.txt
index 2a40a14..34ca52b 100644
--- a/README.txt
+++ b/README.txt
@@ -5,7 +5,7 @@ Rubber Band
 An audio time-stretching and pitch-shifting library and utility program.
 
 Written by Chris Cannam, chris.cannam@breakfastquay.com.
-Copyright 2007-2015 Particular Programs Ltd.
+Copyright 2007-2018 Particular Programs Ltd.
 
 Rubber Band is a library and utility program that permits changing the
 tempo and pitch of an audio recording independently of one another.
@@ -223,8 +223,8 @@ the supplied build files will handle these for you.)
    for mobile architectures.
 
 
-4c. GNU/POSIX systems and Makefiles
------------------------------------
+4c. Building on Linux
+---------------------
 
 A GNU-style configure script is included for use on Linux and similar
 systems.
@@ -246,10 +246,10 @@ The following Makefile targets are available:
 The default target is "all".
 
 
-4d. OS/X
---------
+4d. Building on macOS
+---------------------
 
-A Makefile for OS/X is provided as Makefile.osx.
+A Makefile for macOS is provided as Makefile.osx.
 
 Adjust the Makefile according to your preference for compiler and
 platform SDK, FFT and resampler implementations.  The default is to
@@ -308,13 +308,11 @@ commercial terms.
 4e. Win32 and Visual Studio
 ---------------------------
 
-Two Visual Studio 2005 projects are supplied.
-
-rubberband-library.vcproj builds the Rubber Band static libraries
-only.
-
-rubberband-program.vcproj builds the Rubber Band command-line tool
-only (requires the Rubber Band libraries, and libsndfile).
+A Visual Studio solution, targeted to VC 2015, with two projects is
+supplied. The rubberband-library project builds the Rubber Band static
+libraries only. The rubberband-program project builds the Rubber Band
+command-line tool (which requires the Rubber Band libraries, and
+libsndfile).
 
 You will need to adjust the project settings so as to set the compile
 flags according to your preference for FFT and resampler
diff --git a/rubberband-library.vcproj b/rubberband-library.vcproj
deleted file mode 100644
index 12d3f39..0000000
--- a/rubberband-library.vcproj
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="rubberband-library"
-	ProjectGUID="{020CEB11-EF4E-400E-971D-A35DB69D7CF9}"
-	RootNamespace="rubberband-library"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			EnableManagedIncrementalBuild="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".;.\src;"
-				PreprocessorDefinitions="__MSVC__;WIN32;_DEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;USE_SPEEX"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				ShowIncludes="false"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".;.\src"
-				PreprocessorDefinitions="__MSVC__;WIN32;NDEBUG;_LIB;NOMINMAX;_USE_MATH_DEFINES;USE_KISSFFT;NO_TIMING;USE_SPEEX;NO_THREAD_CHECKS"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="1"
-				FloatingPointModel="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\src\system\Allocators.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\AudioCurveCalculator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\CompoundAudioCurve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\ConstantAudioCurve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\FFT.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\float_cast\float_cast.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\HighFrequencyAudioCurve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\MovingMedian.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\PercussiveAudioCurve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\base\Profiler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\Resampler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\base\RingBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\rubberband\rubberband-c.h"
-				>
-			</File>
-			<File
-				RelativePath=".\rubberband\RubberBandStretcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\SampleFilter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\base\Scavenger.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\SilentAudioCurve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\SpectralDifferenceAudioCurve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\speex\speex_resampler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StretchCalculator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StretcherChannelData.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StretcherImpl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\system\sysutils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\system\Thread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\system\VectorOps.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\SincWindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\Window.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\src\system\Allocators.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\AudioCurveCalculator.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\CompoundAudioCurve.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\ConstantAudioCurve.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\FFT.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\HighFrequencyAudioCurve.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\PercussiveAudioCurve.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\base\Profiler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\speex\resample.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\dsp\Resampler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\rubberband-c.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\RubberBandStretcher.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\SilentAudioCurve.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\audiocurves\SpectralDifferenceAudioCurve.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StretchCalculator.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StretcherChannelData.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StretcherImpl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\StretcherProcess.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\system\sysutils.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\system\Thread.cpp"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/rubberband-program.vcproj b/rubberband-program.vcproj
deleted file mode 100644
index 23cbb93..0000000
--- a/rubberband-program.vcproj
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="rubberband-program"
-	ProjectGUID="{06838307-FEAA-4DB0-8E08-AF19698E9C40}"
-	RootNamespace="rubberband-program"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".;.\rubberband;.\src;&quot;..\libsndfile-1_0_17&quot;"
-				PreprocessorDefinitions="__MSVC__;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=".\Debug\rubberband-library.lib ..\libsndfile-1_0_17\libsndfile-1.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories=".;.\rubberband;.\src;&quot;..\libsndfile-1_0_17&quot;"
-				PreprocessorDefinitions="__MSVC__;WIN32;NDEBUG;_CONSOLE;WANT_TIMING"
-				RuntimeLibrary="2"
-				EnableEnhancedInstructionSet="1"
-				FloatingPointModel="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=".\Release\rubberband-library.lib ..\libsndfile-1_0_17\libsndfile-1.lib"
-				LinkIncremental="0"
-				GenerateDebugInformation="false"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\src\float_cast\float_cast.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\getopt\getopt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\rubberband\RubberBandStretcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\getopt\unistd.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\src\getopt\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\getopt\getopt_long.c"
-				>
-			</File>
-			<File
-				RelativePath=".\main\main.cpp"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\debug\BuildLog.htm"
-			>
-		</File>
-		<File
-			RelativePath=".\wub\index.html"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>