diff --git a/src/add-ons/media/media-add-ons/mixer/Jamfile b/src/add-ons/media/media-add-ons/mixer/Jamfile
index 201e4a2f6e..6cbe852076 100644
--- a/src/add-ons/media/media-add-ons/mixer/Jamfile
+++ b/src/add-ons/media/media-add-ons/mixer/Jamfile
@@ -12,6 +12,7 @@ Addon mixer.media_addon :
 	MixerSettings.cpp
 	MixerUtils.cpp
 	Resampler.cpp
+	ResamplerSmooth.cpp
 	: be media
 ;
 
diff --git a/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp b/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
index 942bf36abe..9463e9d64c 100644
--- a/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/MixerCore.cpp
@@ -10,7 +10,8 @@
 #include "MixerInput.h"
 #include "MixerOutput.h"
 #include "MixerUtils.h"
-#include "Resampler.h"
+//#include "Resampler.h"
+#include "ResamplerSmooth.h"
 #include "RtList.h"
 
 #include <Buffer.h>
@@ -261,9 +262,15 @@ MixerCore::ApplyOutputFormat()
 	}
 
 	fResampler = new Resampler * [fMixBufferChannelCount];
+#if 0
 	for (int i = 0; i < fMixBufferChannelCount; i++)
 		fResampler[i] = new Resampler(media_raw_audio_format::B_AUDIO_FLOAT, 
-										format.format);
+			format.format);
+#else
+	for (int i = 0; i < fMixBufferChannelCount; i++)
+		fResampler[i] = new ResamplerSmooth(media_raw_audio_format::B_AUDIO_FLOAT, 
+			format.format);
+#endif
 	
 	TRACE("MixerCore::OutputFormatChanged:\n");
 	TRACE("  fMixBufferFrameRate %ld\n", fMixBufferFrameRate);
diff --git a/src/add-ons/media/media-add-ons/mixer/Resampler.h b/src/add-ons/media/media-add-ons/mixer/Resampler.h
index 09fa110369..ce508bf0b8 100644
--- a/src/add-ons/media/media-add-ons/mixer/Resampler.h
+++ b/src/add-ons/media/media-add-ons/mixer/Resampler.h
@@ -1,5 +1,3 @@
-#ifndef _RESAMPLER_H
-#define _RESAMPLER_H
 /* Copyright (C) 2003 Marcus Overhagen
  * Released under terms of the MIT license.
  *
@@ -10,6 +8,11 @@
  * both source and destination.
  *
  */
+#ifndef _RESAMPLER_H
+#define _RESAMPLER_H
+
+#include <SupportDefs.h>
+
 
 class Resampler
 {
@@ -53,4 +56,4 @@ Resampler::Resample(const void *src, int32 src_sample_offset, int32 src_sample_c
 	(this->*fFunc)(src, src_sample_offset, src_sample_count, dst, dst_sample_offset, dst_sample_count, gain);
 }
 
-#endif
+#endif // _RESAMPLER_H