diff --git a/src/StretcherChannelData.cpp b/src/StretcherChannelData.cpp
index 1c555dc7..3c3f39fc 100644
--- a/src/StretcherChannelData.cpp
+++ b/src/StretcherChannelData.cpp
@@ -29,6 +29,9 @@
 
 #include <algorithm>
 
+#undef min
+#undef max
+
 namespace RubberBand 
 {
       
diff --git a/src/StretcherImpl.cpp b/src/StretcherImpl.cpp
index 50839f95..eb4cc7ca 100644
--- a/src/StretcherImpl.cpp
+++ b/src/StretcherImpl.cpp
@@ -45,6 +45,9 @@
 #include <map>
 #include <algorithm>
 
+#undef min
+#undef max
+
 using namespace RubberBand;
 
 using std::cerr;
diff --git a/src/StretcherProcess.cpp b/src/StretcherProcess.cpp
index edc18c9d..a0bbea9d 100644
--- a/src/StretcherProcess.cpp
+++ b/src/StretcherProcess.cpp
@@ -42,6 +42,9 @@
 #include <deque>
 #include <algorithm>
 
+#undef min
+#undef max
+
 using namespace RubberBand;
 
 using std::cerr;
diff --git a/src/dsp/BQResampler.cpp b/src/dsp/BQResampler.cpp
index f4260139..3c103d04 100644
--- a/src/dsp/BQResampler.cpp
+++ b/src/dsp/BQResampler.cpp
@@ -33,6 +33,9 @@
 
 #define BQ_R__ R__
 
+#undef min
+#undef max
+
 using std::vector;
 using std::cerr;
 using std::endl;
diff --git a/src/dsp/Resampler.cpp b/src/dsp/Resampler.cpp
index 155daaa8..12748706 100644
--- a/src/dsp/Resampler.cpp
+++ b/src/dsp/Resampler.cpp
@@ -75,6 +75,9 @@
 
 #define BQ_R__ R__
 
+#undef min
+#undef max
+
 using namespace std;
 
 namespace RubberBand {