diff --git a/otherbuilds/Makefile.ios b/otherbuilds/Makefile.ios
index f6b8abe..6a5e67c 100644
--- a/otherbuilds/Makefile.ios
+++ b/otherbuilds/Makefile.ios
@@ -1,16 +1,16 @@
 
-CXX		:= clang++
+CXX		:= clang++ -stdlib=libc++ -std=c++11
 CC		:= clang
 
-OPTFLAGS	:= -DNDEBUG -ffast-math -freciprocal-math -O3 -ftree-vectorize 
+OPTFLAGS	:= -DNDEBUG -ffast-math -O3 -ftree-vectorize 
 
 # For the device
-ARCHFLAGS_DEV	:= -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk -miphoneos-version-min=6 -stdlib=libc++ -arch armv7 -arch arm64 -fembed-bitcode
+ARCHFLAGS_DEV	:= -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk -miphoneos-version-min=6 -arch armv7 -arch arm64 -fembed-bitcode
 
 # Or for the simulator
-ARCHFLAGS_SIM	:= -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk -miphoneos-version-min=6 -stdlib=libc++ -arch i386 -arch x86_64 -fembed-bitcode
+ARCHFLAGS_SIM	:= -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk -miphoneos-version-min=6 -arch x86_64 -fembed-bitcode
 
-CXXFLAGS_ANY	:= $(OPTFLAGS) -I. -Isrc -Irubberband -DMALLOC_IS_ALIGNED -DHAVE_VDSP -DUSE_SPEEX -DUSE_POMMIER_MATHFUN -DNO_THREADING -DNO_THREAD_CHECKS -DNO_TIMING -DNO_TIMING_COMPLETE_NOOP -DNDEBUG
+CXXFLAGS_ANY	:= $(OPTFLAGS) -I. -Isrc -Irubberband -DUSE_BQRESAMPLER -DHAVE_VDSP -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DMALLOC_IS_ALIGNED -DNDEBUG
 
 CXXFLAGS_DEV	:= $(ARCHFLAGS_DEV) $(CXXFLAGS_ANY)
 CXXFLAGS_SIM	:= $(ARCHFLAGS_SIM) $(CXXFLAGS_ANY)
@@ -36,59 +36,25 @@ PUBLIC_INCLUDES := \
 	rubberband/rubberband-c.h \
 	rubberband/RubberBandStretcher.h
 
-LIBRARY_INCLUDES := \
-	src/StretcherChannelData.h \
-	src/float_cast/float_cast.h \
-	src/StretcherImpl.h \
-	src/StretchCalculator.h \
-	src/base/Profiler.h \
-	src/base/RingBuffer.h \
-	src/base/Scavenger.h \
-	src/dsp/AudioCurveCalculator.h \
-	src/audiocurves/CompoundAudioCurve.h \
-	src/audiocurves/ConstantAudioCurve.h \
-	src/audiocurves/HighFrequencyAudioCurve.h \
-	src/audiocurves/PercussiveAudioCurve.h \
-	src/audiocurves/SilentAudioCurve.h \
-	src/audiocurves/SpectralDifferenceAudioCurve.h \
-	src/dsp/Resampler.h \
-	src/dsp/FFT.h \
-	src/dsp/MovingMedian.h \
-	src/dsp/SincWindow.h \
-	src/dsp/Window.h \
-	src/system/Allocators.h \
-	src/system/Thread.h \
-	src/system/VectorOps.h \
-	src/system/VectorOpsComplex.h \
-	src/system/sysutils.h
-
 LIBRARY_SOURCES := \
 	src/rubberband-c.cpp \
 	src/RubberBandStretcher.cpp \
-	src/StretcherProcess.cpp \
-	src/StretchCalculator.cpp \
-	src/base/Profiler.cpp \
-	src/dsp/AudioCurveCalculator.cpp \
-	src/audiocurves/CompoundAudioCurve.cpp \
-	src/audiocurves/SpectralDifferenceAudioCurve.cpp \
-	src/audiocurves/HighFrequencyAudioCurve.cpp \
-	src/audiocurves/SilentAudioCurve.cpp \
-	src/audiocurves/ConstantAudioCurve.cpp \
-	src/audiocurves/PercussiveAudioCurve.cpp \
-	src/dsp/Resampler.cpp \
-	src/dsp/FFT.cpp \
-	src/system/Allocators.cpp \
-	src/system/sysutils.cpp \
-	src/system/Thread.cpp \
-	src/system/VectorOpsComplex.cpp \
-	src/StretcherChannelData.cpp \
-	src/StretcherImpl.cpp
-
-# For Speex resampler -- comment these lines out if not specifying USE_SPEEX
-LIBRARY_INCLUDES := $(LIBRARY_INCLUDES) \
-	src/speex/speex_resampler.h
-LIBRARY_SOURCES := $(LIBRARY_SOURCES) \
-	src/speex/resample.c
+	src/faster/AudioCurveCalculator.cpp \
+	src/faster/CompoundAudioCurve.cpp \
+	src/faster/HighFrequencyAudioCurve.cpp \
+	src/faster/SilentAudioCurve.cpp \
+	src/faster/PercussiveAudioCurve.cpp \
+	src/faster/StretcherChannelData.cpp \
+	src/faster/StretcherImpl.cpp \
+	src/faster/StretcherProcess.cpp \
+	src/common/Profiler.cpp \
+	src/common/Resampler.cpp \
+	src/common/FFT.cpp \
+	src/common/Allocators.cpp \
+	src/common/StretchCalculator.cpp \
+	src/common/sysutils.cpp \
+	src/common/Thread.cpp \
+	src/finer/R3StretcherImpl.cpp 
 
 LIBRARY_OBJECTS_DEV := $(LIBRARY_SOURCES:.cpp=.dev.o)
 LIBRARY_OBJECTS_DEV := $(LIBRARY_OBJECTS_DEV:.c=.dev.o)
diff --git a/otherbuilds/Makefile.linux b/otherbuilds/Makefile.linux
index fe52c77..7ca5470 100644
--- a/otherbuilds/Makefile.linux
+++ b/otherbuilds/Makefile.linux
@@ -1,12 +1,12 @@
 
-CXX		:= g++
+CXX		:= g++ -std=c++11
 CC		:= gcc
 
 OPTFLAGS	:= -DNDEBUG -ffast-math -O3 -ftree-vectorize
 
 ARCHFLAGS	:= 
 
-CXXFLAGS	:= -std=c++11 $(ARCHFLAGS) $(OPTFLAGS) -I. -Isrc -Irubberband -DHAVE_LIBSAMPLERATE -DUSE_BUILTIN_FFT -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DHAVE_POSIX_MEMALIGN -DNDEBUG
+CXXFLAGS	:= $(ARCHFLAGS) $(OPTFLAGS) -I. -Isrc -Irubberband -DUSE_BQRESAMPLER -DUSE_BUILTIN_FFT -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DHAVE_POSIX_MEMALIGN -DNDEBUG
 
 CFLAGS		:= $(ARCHFLAGS) $(OPTFLAGS)
 
diff --git a/otherbuilds/Makefile.macos b/otherbuilds/Makefile.macos
index eae185f..1bd1184 100644
--- a/otherbuilds/Makefile.macos
+++ b/otherbuilds/Makefile.macos
@@ -1,12 +1,12 @@
 
-CXX		:= clang++ -stdlib=libc++
+CXX		:= clang++ -stdlib=libc++ -std=c++11
 CC		:= clang
 
 OPTFLAGS	:= -DNDEBUG -ffast-math -O3 -ftree-vectorize
 
 ARCHFLAGS	:= -mmacosx-version-min=10.7
 
-CXXFLAGS	:= $(ARCHFLAGS) $(OPTFLAGS) -I. -Isrc -Irubberband -I/usr/local/include -DUSE_PTHREADS -DMALLOC_IS_ALIGNED -DHAVE_VDSP -DUSE_SPEEX -DNO_THREAD_CHECKS -DNO_TIMING
+CXXFLAGS	:= $(ARCHFLAGS) $(OPTFLAGS) -I. -Isrc -Irubberband -DUSE_BQRESAMPLER -DHAVE_VDSP -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DMALLOC_IS_ALIGNED -DNDEBUG
 
 CFLAGS		:= $(ARCHFLAGS) $(OPTFLAGS)
 
@@ -25,59 +25,25 @@ PUBLIC_INCLUDES := \
 	rubberband/rubberband-c.h \
 	rubberband/RubberBandStretcher.h
 
-LIBRARY_INCLUDES := \
-	src/StretcherChannelData.h \
-	src/float_cast/float_cast.h \
-	src/StretcherImpl.h \
-	src/StretchCalculator.h \
-	src/base/Profiler.h \
-	src/base/RingBuffer.h \
-	src/base/Scavenger.h \
-	src/dsp/AudioCurveCalculator.h \
-	src/audiocurves/CompoundAudioCurve.h \
-	src/audiocurves/ConstantAudioCurve.h \
-	src/audiocurves/HighFrequencyAudioCurve.h \
-	src/audiocurves/PercussiveAudioCurve.h \
-	src/audiocurves/SilentAudioCurve.h \
-	src/audiocurves/SpectralDifferenceAudioCurve.h \
-	src/dsp/Resampler.h \
-	src/dsp/FFT.h \
-	src/dsp/MovingMedian.h \
-	src/dsp/SincWindow.h \
-	src/dsp/Window.h \
-	src/system/Allocators.h \
-	src/system/Thread.h \
-	src/system/VectorOps.h \
-	src/system/VectorOpsComplex.h \
-	src/system/sysutils.h
-
 LIBRARY_SOURCES := \
 	src/rubberband-c.cpp \
 	src/RubberBandStretcher.cpp \
-	src/StretcherProcess.cpp \
-	src/StretchCalculator.cpp \
-	src/base/Profiler.cpp \
-	src/dsp/AudioCurveCalculator.cpp \
-	src/audiocurves/CompoundAudioCurve.cpp \
-	src/audiocurves/SpectralDifferenceAudioCurve.cpp \
-	src/audiocurves/HighFrequencyAudioCurve.cpp \
-	src/audiocurves/SilentAudioCurve.cpp \
-	src/audiocurves/ConstantAudioCurve.cpp \
-	src/audiocurves/PercussiveAudioCurve.cpp \
-	src/dsp/Resampler.cpp \
-	src/dsp/FFT.cpp \
-	src/system/Allocators.cpp \
-	src/system/sysutils.cpp \
-	src/system/Thread.cpp \
-	src/system/VectorOpsComplex.cpp \
-	src/StretcherChannelData.cpp \
-	src/StretcherImpl.cpp
-
-# For Speex resampler -- comment these lines out if not specifying USE_SPEEX
-LIBRARY_INCLUDES := $(LIBRARY_INCLUDES) \
-	src/speex/speex_resampler.h
-LIBRARY_SOURCES := $(LIBRARY_SOURCES) \
-	src/speex/resample.c
+	src/faster/AudioCurveCalculator.cpp \
+	src/faster/CompoundAudioCurve.cpp \
+	src/faster/HighFrequencyAudioCurve.cpp \
+	src/faster/SilentAudioCurve.cpp \
+	src/faster/PercussiveAudioCurve.cpp \
+	src/faster/StretcherChannelData.cpp \
+	src/faster/StretcherImpl.cpp \
+	src/faster/StretcherProcess.cpp \
+	src/common/Profiler.cpp \
+	src/common/Resampler.cpp \
+	src/common/FFT.cpp \
+	src/common/Allocators.cpp \
+	src/common/StretchCalculator.cpp \
+	src/common/sysutils.cpp \
+	src/common/Thread.cpp \
+	src/finer/R3StretcherImpl.cpp 
 
 LIBRARY_OBJECTS := $(LIBRARY_SOURCES:.cpp=.o)
 LIBRARY_OBJECTS := $(LIBRARY_OBJECTS:.c=.o)
@@ -103,71 +69,138 @@ depend:
 
 src/rubberband-c.o: rubberband/rubberband-c.h
 src/rubberband-c.o: rubberband/RubberBandStretcher.h
-src/RubberBandStretcher.o: src/StretcherImpl.h
-src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h src/dsp/Window.h
-src/RubberBandStretcher.o: src/dsp/FFT.h src/base/RingBuffer.h
-src/RubberBandStretcher.o: src/base/Scavenger.h src/system/Thread.h
-src/RubberBandStretcher.o: src/system/Thread.h src/system/sysutils.h
-src/StretcherProcess.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
-src/StretcherProcess.o: src/dsp/Window.h src/dsp/FFT.h src/base/RingBuffer.h
-src/StretcherProcess.o: src/base/Scavenger.h src/system/Thread.h
-src/StretcherProcess.o: src/system/Thread.h src/system/sysutils.h
-src/StretcherProcess.o: src/audiocurves/PercussiveAudioCurve.h
-src/StretcherProcess.o: src/dsp/AudioCurveCalculator.h
-src/StretcherProcess.o: src/audiocurves/HighFrequencyAudioCurve.h
-src/StretcherProcess.o: src/audiocurves/ConstantAudioCurve.h src/StretchCalculator.h
-src/StretcherProcess.o: src/StretcherChannelData.h src/dsp/Resampler.h
-src/StretcherProcess.o: src/base/Profiler.h src/system/VectorOps.h
-src/StretcherProcess.o: src/system/sysutils.h
-src/StretchCalculator.o: src/StretchCalculator.h src/system/sysutils.h
-src/system/Thread.o: src/system/Thread.h
-src/base/Profiler.o: src/base/Profiler.h src/system/sysutils.h
-src/dsp/AudioCurveCalculator.o: src/dsp/AudioCurveCalculator.h
-src/dsp/AudioCurveCalculator.o: src/system/sysutils.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/audiocurves/SpectralDifferenceAudioCurve.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/system/sysutils.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/dsp/Window.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/system/VectorOps.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/system/sysutils.h
-src/audiocurves/HighFrequencyAudioCurve.o: src/audiocurves/HighFrequencyAudioCurve.h
-src/audiocurves/HighFrequencyAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/HighFrequencyAudioCurve.o: src/system/sysutils.h
-src/audiocurves/SilentAudioCurve.o: src/audiocurves/SilentAudioCurve.h
-src/audiocurves/SilentAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/SilentAudioCurve.o: src/system/sysutils.h
-src/audiocurves/ConstantAudioCurve.o: src/audiocurves/ConstantAudioCurve.h
-src/audiocurves/ConstantAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/ConstantAudioCurve.o: src/system/sysutils.h
-src/audiocurves/PercussiveAudioCurve.o: src/audiocurves/PercussiveAudioCurve.h
-src/audiocurves/PercussiveAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/PercussiveAudioCurve.o: src/system/sysutils.h src/system/VectorOps.h
-src/audiocurves/PercussiveAudioCurve.o: src/system/sysutils.h
-src/dsp/Resampler.o: src/dsp/Resampler.h src/system/sysutils.h
-src/dsp/Resampler.o: src/base/Profiler.h
-src/dsp/FFT.o: src/dsp/FFT.h src/system/sysutils.h src/system/Thread.h
-src/dsp/FFT.o: src/base/Profiler.h src/system/VectorOps.h
-src/dsp/FFT.o: src/system/sysutils.h
-src/system/Allocators.o: src/system/Allocators.h src/system/VectorOps.h
-src/system/Allocators.o: src/system/sysutils.h
-src/system/sysutils.o: src/system/sysutils.h
-src/StretcherChannelData.o: src/StretcherChannelData.h src/StretcherImpl.h
-src/StretcherChannelData.o: rubberband/RubberBandStretcher.h src/dsp/Window.h
-src/StretcherChannelData.o: src/dsp/FFT.h src/base/RingBuffer.h
-src/StretcherChannelData.o: src/base/Scavenger.h src/system/Thread.h
-src/StretcherChannelData.o: src/system/Thread.h src/system/sysutils.h
-src/StretcherChannelData.o: src/dsp/Resampler.h src/system/Allocators.h
-src/StretcherChannelData.o: src/system/VectorOps.h src/system/sysutils.h
-src/StretcherImpl.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
-src/StretcherImpl.o: src/dsp/Window.h src/dsp/FFT.h src/base/RingBuffer.h
-src/StretcherImpl.o: src/base/Scavenger.h src/system/Thread.h src/system/Thread.h
-src/StretcherImpl.o: src/system/sysutils.h src/audiocurves/PercussiveAudioCurve.h
-src/StretcherImpl.o: src/dsp/AudioCurveCalculator.h
-src/StretcherImpl.o: src/audiocurves/HighFrequencyAudioCurve.h
-src/StretcherImpl.o: src/audiocurves/SpectralDifferenceAudioCurve.h src/dsp/Window.h
-src/StretcherImpl.o: src/system/VectorOps.h src/system/sysutils.h
-src/StretcherImpl.o: src/audiocurves/SilentAudioCurve.h src/audiocurves/ConstantAudioCurve.h
-src/StretcherImpl.o: src/dsp/Resampler.h src/StretchCalculator.h
-src/StretcherImpl.o: src/StretcherChannelData.h src/base/Profiler.h
-main/main.o: rubberband/RubberBandStretcher.h src/system/sysutils.h
-main/main.o: src/base/Profiler.h
+src/RubberBandStretcher.o: src/faster/StretcherImpl.h
+src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h
+src/RubberBandStretcher.o: src/common/Window.h src/common/sysutils.h
+src/RubberBandStretcher.o: src/common/VectorOps.h src/common/Allocators.h
+src/RubberBandStretcher.o: src/common/FFT.h src/common/RingBuffer.h
+src/RubberBandStretcher.o: src/common/Scavenger.h src/common/Thread.h
+src/RubberBandStretcher.o: src/common/Thread.h src/common/sysutils.h
+src/RubberBandStretcher.o: src/faster/SincWindow.h src/common/VectorOps.h
+src/RubberBandStretcher.o: src/common/Allocators.h
+src/RubberBandStretcher.o: src/faster/CompoundAudioCurve.h
+src/RubberBandStretcher.o: src/faster/PercussiveAudioCurve.h
+src/RubberBandStretcher.o: src/faster/AudioCurveCalculator.h
+src/RubberBandStretcher.o: src/faster/HighFrequencyAudioCurve.h
+src/RubberBandStretcher.o: src/common/SampleFilter.h
+src/RubberBandStretcher.o: src/finer/R3StretcherImpl.h
+src/RubberBandStretcher.o: src/finer/BinSegmenter.h src/finer/BinClassifier.h
+src/RubberBandStretcher.o: src/common/MovingMedian.h
+src/RubberBandStretcher.o: src/common/SampleFilter.h src/common/FixedVector.h
+src/RubberBandStretcher.o: src/common/SingleThreadRingBuffer.h
+src/RubberBandStretcher.o: src/common/HistogramFilter.h src/common/mathmisc.h
+src/RubberBandStretcher.o: src/finer/Guide.h src/finer/Peak.h
+src/RubberBandStretcher.o: src/finer/PhaseAdvance.h
+src/RubberBandStretcher.o: src/common/StretchCalculator.h
+src/RubberBandStretcher.o: src/common/Resampler.h src/common/FixedVector.h
+src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h
+src/faster/AudioCurveCalculator.o: src/faster/AudioCurveCalculator.h
+src/faster/AudioCurveCalculator.o: src/common/sysutils.h
+src/faster/CompoundAudioCurve.o: src/faster/CompoundAudioCurve.h
+src/faster/CompoundAudioCurve.o: src/faster/PercussiveAudioCurve.h
+src/faster/CompoundAudioCurve.o: src/faster/AudioCurveCalculator.h
+src/faster/CompoundAudioCurve.o: src/common/sysutils.h
+src/faster/CompoundAudioCurve.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/CompoundAudioCurve.o: src/common/SampleFilter.h
+src/faster/CompoundAudioCurve.o: src/common/MovingMedian.h
+src/faster/CompoundAudioCurve.o: src/common/SampleFilter.h
+src/faster/CompoundAudioCurve.o: src/common/FixedVector.h
+src/faster/CompoundAudioCurve.o: src/common/Allocators.h
+src/faster/CompoundAudioCurve.o: src/common/VectorOps.h src/common/sysutils.h
+src/faster/CompoundAudioCurve.o: src/common/SingleThreadRingBuffer.h
+src/faster/HighFrequencyAudioCurve.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/HighFrequencyAudioCurve.o: src/faster/AudioCurveCalculator.h
+src/faster/HighFrequencyAudioCurve.o: src/common/sysutils.h
+src/faster/SilentAudioCurve.o: src/faster/SilentAudioCurve.h
+src/faster/SilentAudioCurve.o: src/faster/AudioCurveCalculator.h
+src/faster/SilentAudioCurve.o: src/common/sysutils.h
+src/faster/PercussiveAudioCurve.o: src/faster/PercussiveAudioCurve.h
+src/faster/PercussiveAudioCurve.o: src/faster/AudioCurveCalculator.h
+src/faster/PercussiveAudioCurve.o: src/common/sysutils.h
+src/faster/PercussiveAudioCurve.o: src/common/Allocators.h
+src/faster/PercussiveAudioCurve.o: src/common/VectorOps.h
+src/faster/StretcherChannelData.o: src/faster/StretcherChannelData.h
+src/faster/StretcherChannelData.o: src/faster/StretcherImpl.h
+src/faster/StretcherChannelData.o: rubberband/RubberBandStretcher.h
+src/faster/StretcherChannelData.o: src/common/Window.h src/common/sysutils.h
+src/faster/StretcherChannelData.o: src/common/VectorOps.h
+src/faster/StretcherChannelData.o: src/common/Allocators.h src/common/FFT.h
+src/faster/StretcherChannelData.o: src/common/RingBuffer.h
+src/faster/StretcherChannelData.o: src/common/Scavenger.h src/common/Thread.h
+src/faster/StretcherChannelData.o: src/common/Thread.h src/common/sysutils.h
+src/faster/StretcherChannelData.o: src/faster/SincWindow.h
+src/faster/StretcherChannelData.o: src/common/VectorOps.h
+src/faster/StretcherChannelData.o: src/common/Allocators.h
+src/faster/StretcherChannelData.o: src/faster/CompoundAudioCurve.h
+src/faster/StretcherChannelData.o: src/faster/PercussiveAudioCurve.h
+src/faster/StretcherChannelData.o: src/faster/AudioCurveCalculator.h
+src/faster/StretcherChannelData.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/StretcherChannelData.o: src/common/SampleFilter.h
+src/faster/StretcherChannelData.o: src/common/Resampler.h
+src/faster/StretcherImpl.o: src/faster/StretcherImpl.h
+src/faster/StretcherImpl.o: rubberband/RubberBandStretcher.h
+src/faster/StretcherImpl.o: src/common/Window.h src/common/sysutils.h
+src/faster/StretcherImpl.o: src/common/VectorOps.h src/common/Allocators.h
+src/faster/StretcherImpl.o: src/common/FFT.h src/common/RingBuffer.h
+src/faster/StretcherImpl.o: src/common/Scavenger.h src/common/Thread.h
+src/faster/StretcherImpl.o: src/common/Thread.h src/common/sysutils.h
+src/faster/StretcherImpl.o: src/faster/SincWindow.h src/common/VectorOps.h
+src/faster/StretcherImpl.o: src/common/Allocators.h
+src/faster/StretcherImpl.o: src/faster/CompoundAudioCurve.h
+src/faster/StretcherImpl.o: src/faster/PercussiveAudioCurve.h
+src/faster/StretcherImpl.o: src/faster/AudioCurveCalculator.h
+src/faster/StretcherImpl.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/StretcherImpl.o: src/common/SampleFilter.h
+src/faster/StretcherImpl.o: src/faster/SilentAudioCurve.h
+src/faster/StretcherImpl.o: src/faster/StretcherChannelData.h
+src/faster/StretcherImpl.o: src/common/StretchCalculator.h
+src/faster/StretcherImpl.o: src/common/Resampler.h src/common/Profiler.h
+src/faster/StretcherProcess.o: src/faster/StretcherImpl.h
+src/faster/StretcherProcess.o: rubberband/RubberBandStretcher.h
+src/faster/StretcherProcess.o: src/common/Window.h src/common/sysutils.h
+src/faster/StretcherProcess.o: src/common/VectorOps.h src/common/Allocators.h
+src/faster/StretcherProcess.o: src/common/FFT.h src/common/RingBuffer.h
+src/faster/StretcherProcess.o: src/common/Scavenger.h src/common/Thread.h
+src/faster/StretcherProcess.o: src/common/Thread.h src/common/sysutils.h
+src/faster/StretcherProcess.o: src/faster/SincWindow.h src/common/VectorOps.h
+src/faster/StretcherProcess.o: src/common/Allocators.h
+src/faster/StretcherProcess.o: src/faster/CompoundAudioCurve.h
+src/faster/StretcherProcess.o: src/faster/PercussiveAudioCurve.h
+src/faster/StretcherProcess.o: src/faster/AudioCurveCalculator.h
+src/faster/StretcherProcess.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/StretcherProcess.o: src/common/SampleFilter.h
+src/faster/StretcherProcess.o: src/faster/StretcherChannelData.h
+src/faster/StretcherProcess.o: src/common/StretchCalculator.h
+src/faster/StretcherProcess.o: src/common/Resampler.h src/common/Profiler.h
+src/faster/StretcherProcess.o: src/common/mathmisc.h
+src/common/Profiler.o: src/common/Profiler.h src/common/sysutils.h
+src/common/Profiler.o: src/common/Thread.h
+src/common/Resampler.o: src/common/Resampler.h src/common/sysutils.h
+src/common/Resampler.o: src/common/Allocators.h src/common/VectorOps.h
+src/common/FFT.o: src/common/FFT.h src/common/sysutils.h src/common/Thread.h
+src/common/FFT.o: src/common/Profiler.h src/common/Allocators.h
+src/common/FFT.o: src/common/VectorOps.h src/common/VectorOpsComplex.h
+src/common/Allocators.o: src/common/Allocators.h src/common/VectorOps.h
+src/common/Allocators.o: src/common/sysutils.h
+src/common/StretchCalculator.o: src/common/StretchCalculator.h
+src/common/StretchCalculator.o: src/common/sysutils.h
+src/common/sysutils.o: src/common/sysutils.h
+src/common/Thread.o: src/common/Thread.h
+src/finer/R3StretcherImpl.o: src/finer/R3StretcherImpl.h
+src/finer/R3StretcherImpl.o: src/finer/BinSegmenter.h
+src/finer/R3StretcherImpl.o: src/finer/BinClassifier.h
+src/finer/R3StretcherImpl.o: src/common/Allocators.h
+src/finer/R3StretcherImpl.o: src/common/MovingMedian.h
+src/finer/R3StretcherImpl.o: src/common/SampleFilter.h
+src/finer/R3StretcherImpl.o: src/common/FixedVector.h src/common/Allocators.h
+src/finer/R3StretcherImpl.o: src/common/VectorOps.h src/common/sysutils.h
+src/finer/R3StretcherImpl.o: src/common/SingleThreadRingBuffer.h
+src/finer/R3StretcherImpl.o: src/common/RingBuffer.h
+src/finer/R3StretcherImpl.o: src/common/HistogramFilter.h
+src/finer/R3StretcherImpl.o: src/common/mathmisc.h src/finer/Guide.h
+src/finer/R3StretcherImpl.o: src/finer/Peak.h src/finer/PhaseAdvance.h
+src/finer/R3StretcherImpl.o: src/common/StretchCalculator.h
+src/finer/R3StretcherImpl.o: src/common/Resampler.h src/common/FFT.h
+src/finer/R3StretcherImpl.o: src/common/FixedVector.h src/common/Window.h
+src/finer/R3StretcherImpl.o: rubberband/RubberBandStretcher.h
+src/finer/R3StretcherImpl.o: src/common/VectorOpsComplex.h
diff --git a/otherbuilds/Makefile.macos-universal b/otherbuilds/Makefile.macos-universal
index aa03954..0b32b75 100644
--- a/otherbuilds/Makefile.macos-universal
+++ b/otherbuilds/Makefile.macos-universal
@@ -1,85 +1,49 @@
 
-CXX		:= clang++ -stdlib=libc++
+CXX		:= clang++ -stdlib=libc++ -std=c++11
 CC		:= clang
 
 OPTFLAGS	:= -DNDEBUG -ffast-math -O3 -ftree-vectorize
 
 ARCHFLAGS	:= -arch arm64 -arch x86_64 -mmacosx-version-min=10.7
 
-CXXFLAGS	:= $(ARCHFLAGS) $(OPTFLAGS) -I. -Isrc -Irubberband -I/usr/local/include -DUSE_PTHREADS -DMALLOC_IS_ALIGNED -DHAVE_VDSP -DUSE_SPEEX -DNO_THREAD_CHECKS -DNO_TIMING
+CXXFLAGS	:= $(ARCHFLAGS) $(OPTFLAGS) -I. -Isrc -Irubberband -DUSE_BQRESAMPLER -DHAVE_VDSP -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DMALLOC_IS_ALIGNED -DNDEBUG
 
 CFLAGS		:= $(ARCHFLAGS) $(OPTFLAGS)
 
-AR			:= ar
-MKDIR			:= mkdir
+AR		:= ar
+MKDIR		:= mkdir
 
-LIBNAME			:= librubberband
+LIBNAME		:= librubberband
 
-STATIC_TARGET  		:= lib/$(LIBNAME).a
+STATIC_TARGET  	:= lib/$(LIBNAME).a
 
 default:	$(STATIC_TARGET)
-
 all:		$(STATIC_TARGET)
-
 static:		$(STATIC_TARGET)
 
 PUBLIC_INCLUDES := \
 	rubberband/rubberband-c.h \
 	rubberband/RubberBandStretcher.h
 
-LIBRARY_INCLUDES := \
-	src/StretcherChannelData.h \
-	src/float_cast/float_cast.h \
-	src/StretcherImpl.h \
-	src/StretchCalculator.h \
-	src/base/Profiler.h \
-	src/base/RingBuffer.h \
-	src/base/Scavenger.h \
-	src/dsp/AudioCurveCalculator.h \
-	src/audiocurves/CompoundAudioCurve.h \
-	src/audiocurves/ConstantAudioCurve.h \
-	src/audiocurves/HighFrequencyAudioCurve.h \
-	src/audiocurves/PercussiveAudioCurve.h \
-	src/audiocurves/SilentAudioCurve.h \
-	src/audiocurves/SpectralDifferenceAudioCurve.h \
-	src/dsp/Resampler.h \
-	src/dsp/FFT.h \
-	src/dsp/MovingMedian.h \
-	src/dsp/SincWindow.h \
-	src/dsp/Window.h \
-	src/system/Allocators.h \
-	src/system/Thread.h \
-	src/system/VectorOps.h \
-	src/system/VectorOpsComplex.h \
-	src/system/sysutils.h
-
 LIBRARY_SOURCES := \
 	src/rubberband-c.cpp \
 	src/RubberBandStretcher.cpp \
-	src/StretcherProcess.cpp \
-	src/StretchCalculator.cpp \
-	src/base/Profiler.cpp \
-	src/dsp/AudioCurveCalculator.cpp \
-	src/audiocurves/CompoundAudioCurve.cpp \
-	src/audiocurves/SpectralDifferenceAudioCurve.cpp \
-	src/audiocurves/HighFrequencyAudioCurve.cpp \
-	src/audiocurves/SilentAudioCurve.cpp \
-	src/audiocurves/ConstantAudioCurve.cpp \
-	src/audiocurves/PercussiveAudioCurve.cpp \
-	src/dsp/Resampler.cpp \
-	src/dsp/FFT.cpp \
-	src/system/Allocators.cpp \
-	src/system/sysutils.cpp \
-	src/system/Thread.cpp \
-	src/system/VectorOpsComplex.cpp \
-	src/StretcherChannelData.cpp \
-	src/StretcherImpl.cpp
-
-# For Speex resampler -- comment these lines out if not specifying USE_SPEEX
-LIBRARY_INCLUDES := $(LIBRARY_INCLUDES) \
-	src/speex/speex_resampler.h
-LIBRARY_SOURCES := $(LIBRARY_SOURCES) \
-	src/speex/resample.c
+	src/faster/AudioCurveCalculator.cpp \
+	src/faster/CompoundAudioCurve.cpp \
+	src/faster/HighFrequencyAudioCurve.cpp \
+	src/faster/SilentAudioCurve.cpp \
+	src/faster/PercussiveAudioCurve.cpp \
+	src/faster/StretcherChannelData.cpp \
+	src/faster/StretcherImpl.cpp \
+	src/faster/StretcherProcess.cpp \
+	src/common/Profiler.cpp \
+	src/common/Resampler.cpp \
+	src/common/FFT.cpp \
+	src/common/Allocators.cpp \
+	src/common/StretchCalculator.cpp \
+	src/common/sysutils.cpp \
+	src/common/Thread.cpp \
+	src/finer/R3StretcherImpl.cpp 
 
 LIBRARY_OBJECTS := $(LIBRARY_SOURCES:.cpp=.o)
 LIBRARY_OBJECTS := $(LIBRARY_OBJECTS:.c=.o)
@@ -105,71 +69,138 @@ depend:
 
 src/rubberband-c.o: rubberband/rubberband-c.h
 src/rubberband-c.o: rubberband/RubberBandStretcher.h
-src/RubberBandStretcher.o: src/StretcherImpl.h
-src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h src/dsp/Window.h
-src/RubberBandStretcher.o: src/dsp/FFT.h src/base/RingBuffer.h
-src/RubberBandStretcher.o: src/base/Scavenger.h src/system/Thread.h
-src/RubberBandStretcher.o: src/system/Thread.h src/system/sysutils.h
-src/StretcherProcess.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
-src/StretcherProcess.o: src/dsp/Window.h src/dsp/FFT.h src/base/RingBuffer.h
-src/StretcherProcess.o: src/base/Scavenger.h src/system/Thread.h
-src/StretcherProcess.o: src/system/Thread.h src/system/sysutils.h
-src/StretcherProcess.o: src/audiocurves/PercussiveAudioCurve.h
-src/StretcherProcess.o: src/dsp/AudioCurveCalculator.h
-src/StretcherProcess.o: src/audiocurves/HighFrequencyAudioCurve.h
-src/StretcherProcess.o: src/audiocurves/ConstantAudioCurve.h src/StretchCalculator.h
-src/StretcherProcess.o: src/StretcherChannelData.h src/dsp/Resampler.h
-src/StretcherProcess.o: src/base/Profiler.h src/system/VectorOps.h
-src/StretcherProcess.o: src/system/sysutils.h
-src/StretchCalculator.o: src/StretchCalculator.h src/system/sysutils.h
-src/system/Thread.o: src/system/Thread.h
-src/base/Profiler.o: src/base/Profiler.h src/system/sysutils.h
-src/dsp/AudioCurveCalculator.o: src/dsp/AudioCurveCalculator.h
-src/dsp/AudioCurveCalculator.o: src/system/sysutils.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/audiocurves/SpectralDifferenceAudioCurve.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/system/sysutils.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/dsp/Window.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/system/VectorOps.h
-src/audiocurves/SpectralDifferenceAudioCurve.o: src/system/sysutils.h
-src/audiocurves/HighFrequencyAudioCurve.o: src/audiocurves/HighFrequencyAudioCurve.h
-src/audiocurves/HighFrequencyAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/HighFrequencyAudioCurve.o: src/system/sysutils.h
-src/audiocurves/SilentAudioCurve.o: src/audiocurves/SilentAudioCurve.h
-src/audiocurves/SilentAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/SilentAudioCurve.o: src/system/sysutils.h
-src/audiocurves/ConstantAudioCurve.o: src/audiocurves/ConstantAudioCurve.h
-src/audiocurves/ConstantAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/ConstantAudioCurve.o: src/system/sysutils.h
-src/audiocurves/PercussiveAudioCurve.o: src/audiocurves/PercussiveAudioCurve.h
-src/audiocurves/PercussiveAudioCurve.o: src/dsp/AudioCurveCalculator.h
-src/audiocurves/PercussiveAudioCurve.o: src/system/sysutils.h src/system/VectorOps.h
-src/audiocurves/PercussiveAudioCurve.o: src/system/sysutils.h
-src/dsp/Resampler.o: src/dsp/Resampler.h src/system/sysutils.h
-src/dsp/Resampler.o: src/base/Profiler.h
-src/dsp/FFT.o: src/dsp/FFT.h src/system/sysutils.h src/system/Thread.h
-src/dsp/FFT.o: src/base/Profiler.h src/system/VectorOps.h
-src/dsp/FFT.o: src/system/sysutils.h
-src/system/Allocators.o: src/system/Allocators.h src/system/VectorOps.h
-src/system/Allocators.o: src/system/sysutils.h
-src/system/sysutils.o: src/system/sysutils.h
-src/StretcherChannelData.o: src/StretcherChannelData.h src/StretcherImpl.h
-src/StretcherChannelData.o: rubberband/RubberBandStretcher.h src/dsp/Window.h
-src/StretcherChannelData.o: src/dsp/FFT.h src/base/RingBuffer.h
-src/StretcherChannelData.o: src/base/Scavenger.h src/system/Thread.h
-src/StretcherChannelData.o: src/system/Thread.h src/system/sysutils.h
-src/StretcherChannelData.o: src/dsp/Resampler.h src/system/Allocators.h
-src/StretcherChannelData.o: src/system/VectorOps.h src/system/sysutils.h
-src/StretcherImpl.o: src/StretcherImpl.h rubberband/RubberBandStretcher.h
-src/StretcherImpl.o: src/dsp/Window.h src/dsp/FFT.h src/base/RingBuffer.h
-src/StretcherImpl.o: src/base/Scavenger.h src/system/Thread.h src/system/Thread.h
-src/StretcherImpl.o: src/system/sysutils.h src/audiocurves/PercussiveAudioCurve.h
-src/StretcherImpl.o: src/dsp/AudioCurveCalculator.h
-src/StretcherImpl.o: src/audiocurves/HighFrequencyAudioCurve.h
-src/StretcherImpl.o: src/audiocurves/SpectralDifferenceAudioCurve.h src/dsp/Window.h
-src/StretcherImpl.o: src/system/VectorOps.h src/system/sysutils.h
-src/StretcherImpl.o: src/audiocurves/SilentAudioCurve.h src/audiocurves/ConstantAudioCurve.h
-src/StretcherImpl.o: src/dsp/Resampler.h src/StretchCalculator.h
-src/StretcherImpl.o: src/StretcherChannelData.h src/base/Profiler.h
-main/main.o: rubberband/RubberBandStretcher.h src/system/sysutils.h
-main/main.o: src/base/Profiler.h
+src/RubberBandStretcher.o: src/faster/StretcherImpl.h
+src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h
+src/RubberBandStretcher.o: src/common/Window.h src/common/sysutils.h
+src/RubberBandStretcher.o: src/common/VectorOps.h src/common/Allocators.h
+src/RubberBandStretcher.o: src/common/FFT.h src/common/RingBuffer.h
+src/RubberBandStretcher.o: src/common/Scavenger.h src/common/Thread.h
+src/RubberBandStretcher.o: src/common/Thread.h src/common/sysutils.h
+src/RubberBandStretcher.o: src/faster/SincWindow.h src/common/VectorOps.h
+src/RubberBandStretcher.o: src/common/Allocators.h
+src/RubberBandStretcher.o: src/faster/CompoundAudioCurve.h
+src/RubberBandStretcher.o: src/faster/PercussiveAudioCurve.h
+src/RubberBandStretcher.o: src/faster/AudioCurveCalculator.h
+src/RubberBandStretcher.o: src/faster/HighFrequencyAudioCurve.h
+src/RubberBandStretcher.o: src/common/SampleFilter.h
+src/RubberBandStretcher.o: src/finer/R3StretcherImpl.h
+src/RubberBandStretcher.o: src/finer/BinSegmenter.h src/finer/BinClassifier.h
+src/RubberBandStretcher.o: src/common/MovingMedian.h
+src/RubberBandStretcher.o: src/common/SampleFilter.h src/common/FixedVector.h
+src/RubberBandStretcher.o: src/common/SingleThreadRingBuffer.h
+src/RubberBandStretcher.o: src/common/HistogramFilter.h src/common/mathmisc.h
+src/RubberBandStretcher.o: src/finer/Guide.h src/finer/Peak.h
+src/RubberBandStretcher.o: src/finer/PhaseAdvance.h
+src/RubberBandStretcher.o: src/common/StretchCalculator.h
+src/RubberBandStretcher.o: src/common/Resampler.h src/common/FixedVector.h
+src/RubberBandStretcher.o: rubberband/RubberBandStretcher.h
+src/faster/AudioCurveCalculator.o: src/faster/AudioCurveCalculator.h
+src/faster/AudioCurveCalculator.o: src/common/sysutils.h
+src/faster/CompoundAudioCurve.o: src/faster/CompoundAudioCurve.h
+src/faster/CompoundAudioCurve.o: src/faster/PercussiveAudioCurve.h
+src/faster/CompoundAudioCurve.o: src/faster/AudioCurveCalculator.h
+src/faster/CompoundAudioCurve.o: src/common/sysutils.h
+src/faster/CompoundAudioCurve.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/CompoundAudioCurve.o: src/common/SampleFilter.h
+src/faster/CompoundAudioCurve.o: src/common/MovingMedian.h
+src/faster/CompoundAudioCurve.o: src/common/SampleFilter.h
+src/faster/CompoundAudioCurve.o: src/common/FixedVector.h
+src/faster/CompoundAudioCurve.o: src/common/Allocators.h
+src/faster/CompoundAudioCurve.o: src/common/VectorOps.h src/common/sysutils.h
+src/faster/CompoundAudioCurve.o: src/common/SingleThreadRingBuffer.h
+src/faster/HighFrequencyAudioCurve.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/HighFrequencyAudioCurve.o: src/faster/AudioCurveCalculator.h
+src/faster/HighFrequencyAudioCurve.o: src/common/sysutils.h
+src/faster/SilentAudioCurve.o: src/faster/SilentAudioCurve.h
+src/faster/SilentAudioCurve.o: src/faster/AudioCurveCalculator.h
+src/faster/SilentAudioCurve.o: src/common/sysutils.h
+src/faster/PercussiveAudioCurve.o: src/faster/PercussiveAudioCurve.h
+src/faster/PercussiveAudioCurve.o: src/faster/AudioCurveCalculator.h
+src/faster/PercussiveAudioCurve.o: src/common/sysutils.h
+src/faster/PercussiveAudioCurve.o: src/common/Allocators.h
+src/faster/PercussiveAudioCurve.o: src/common/VectorOps.h
+src/faster/StretcherChannelData.o: src/faster/StretcherChannelData.h
+src/faster/StretcherChannelData.o: src/faster/StretcherImpl.h
+src/faster/StretcherChannelData.o: rubberband/RubberBandStretcher.h
+src/faster/StretcherChannelData.o: src/common/Window.h src/common/sysutils.h
+src/faster/StretcherChannelData.o: src/common/VectorOps.h
+src/faster/StretcherChannelData.o: src/common/Allocators.h src/common/FFT.h
+src/faster/StretcherChannelData.o: src/common/RingBuffer.h
+src/faster/StretcherChannelData.o: src/common/Scavenger.h src/common/Thread.h
+src/faster/StretcherChannelData.o: src/common/Thread.h src/common/sysutils.h
+src/faster/StretcherChannelData.o: src/faster/SincWindow.h
+src/faster/StretcherChannelData.o: src/common/VectorOps.h
+src/faster/StretcherChannelData.o: src/common/Allocators.h
+src/faster/StretcherChannelData.o: src/faster/CompoundAudioCurve.h
+src/faster/StretcherChannelData.o: src/faster/PercussiveAudioCurve.h
+src/faster/StretcherChannelData.o: src/faster/AudioCurveCalculator.h
+src/faster/StretcherChannelData.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/StretcherChannelData.o: src/common/SampleFilter.h
+src/faster/StretcherChannelData.o: src/common/Resampler.h
+src/faster/StretcherImpl.o: src/faster/StretcherImpl.h
+src/faster/StretcherImpl.o: rubberband/RubberBandStretcher.h
+src/faster/StretcherImpl.o: src/common/Window.h src/common/sysutils.h
+src/faster/StretcherImpl.o: src/common/VectorOps.h src/common/Allocators.h
+src/faster/StretcherImpl.o: src/common/FFT.h src/common/RingBuffer.h
+src/faster/StretcherImpl.o: src/common/Scavenger.h src/common/Thread.h
+src/faster/StretcherImpl.o: src/common/Thread.h src/common/sysutils.h
+src/faster/StretcherImpl.o: src/faster/SincWindow.h src/common/VectorOps.h
+src/faster/StretcherImpl.o: src/common/Allocators.h
+src/faster/StretcherImpl.o: src/faster/CompoundAudioCurve.h
+src/faster/StretcherImpl.o: src/faster/PercussiveAudioCurve.h
+src/faster/StretcherImpl.o: src/faster/AudioCurveCalculator.h
+src/faster/StretcherImpl.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/StretcherImpl.o: src/common/SampleFilter.h
+src/faster/StretcherImpl.o: src/faster/SilentAudioCurve.h
+src/faster/StretcherImpl.o: src/faster/StretcherChannelData.h
+src/faster/StretcherImpl.o: src/common/StretchCalculator.h
+src/faster/StretcherImpl.o: src/common/Resampler.h src/common/Profiler.h
+src/faster/StretcherProcess.o: src/faster/StretcherImpl.h
+src/faster/StretcherProcess.o: rubberband/RubberBandStretcher.h
+src/faster/StretcherProcess.o: src/common/Window.h src/common/sysutils.h
+src/faster/StretcherProcess.o: src/common/VectorOps.h src/common/Allocators.h
+src/faster/StretcherProcess.o: src/common/FFT.h src/common/RingBuffer.h
+src/faster/StretcherProcess.o: src/common/Scavenger.h src/common/Thread.h
+src/faster/StretcherProcess.o: src/common/Thread.h src/common/sysutils.h
+src/faster/StretcherProcess.o: src/faster/SincWindow.h src/common/VectorOps.h
+src/faster/StretcherProcess.o: src/common/Allocators.h
+src/faster/StretcherProcess.o: src/faster/CompoundAudioCurve.h
+src/faster/StretcherProcess.o: src/faster/PercussiveAudioCurve.h
+src/faster/StretcherProcess.o: src/faster/AudioCurveCalculator.h
+src/faster/StretcherProcess.o: src/faster/HighFrequencyAudioCurve.h
+src/faster/StretcherProcess.o: src/common/SampleFilter.h
+src/faster/StretcherProcess.o: src/faster/StretcherChannelData.h
+src/faster/StretcherProcess.o: src/common/StretchCalculator.h
+src/faster/StretcherProcess.o: src/common/Resampler.h src/common/Profiler.h
+src/faster/StretcherProcess.o: src/common/mathmisc.h
+src/common/Profiler.o: src/common/Profiler.h src/common/sysutils.h
+src/common/Profiler.o: src/common/Thread.h
+src/common/Resampler.o: src/common/Resampler.h src/common/sysutils.h
+src/common/Resampler.o: src/common/Allocators.h src/common/VectorOps.h
+src/common/FFT.o: src/common/FFT.h src/common/sysutils.h src/common/Thread.h
+src/common/FFT.o: src/common/Profiler.h src/common/Allocators.h
+src/common/FFT.o: src/common/VectorOps.h src/common/VectorOpsComplex.h
+src/common/Allocators.o: src/common/Allocators.h src/common/VectorOps.h
+src/common/Allocators.o: src/common/sysutils.h
+src/common/StretchCalculator.o: src/common/StretchCalculator.h
+src/common/StretchCalculator.o: src/common/sysutils.h
+src/common/sysutils.o: src/common/sysutils.h
+src/common/Thread.o: src/common/Thread.h
+src/finer/R3StretcherImpl.o: src/finer/R3StretcherImpl.h
+src/finer/R3StretcherImpl.o: src/finer/BinSegmenter.h
+src/finer/R3StretcherImpl.o: src/finer/BinClassifier.h
+src/finer/R3StretcherImpl.o: src/common/Allocators.h
+src/finer/R3StretcherImpl.o: src/common/MovingMedian.h
+src/finer/R3StretcherImpl.o: src/common/SampleFilter.h
+src/finer/R3StretcherImpl.o: src/common/FixedVector.h src/common/Allocators.h
+src/finer/R3StretcherImpl.o: src/common/VectorOps.h src/common/sysutils.h
+src/finer/R3StretcherImpl.o: src/common/SingleThreadRingBuffer.h
+src/finer/R3StretcherImpl.o: src/common/RingBuffer.h
+src/finer/R3StretcherImpl.o: src/common/HistogramFilter.h
+src/finer/R3StretcherImpl.o: src/common/mathmisc.h src/finer/Guide.h
+src/finer/R3StretcherImpl.o: src/finer/Peak.h src/finer/PhaseAdvance.h
+src/finer/R3StretcherImpl.o: src/common/StretchCalculator.h
+src/finer/R3StretcherImpl.o: src/common/Resampler.h src/common/FFT.h
+src/finer/R3StretcherImpl.o: src/common/FixedVector.h src/common/Window.h
+src/finer/R3StretcherImpl.o: rubberband/RubberBandStretcher.h
+src/finer/R3StretcherImpl.o: src/common/VectorOpsComplex.h