diff --git a/audio/audio_filters/echo.c b/audio/audio_filters/echo.c
index 14e6aabf4e..82f544d52c 100644
--- a/audio/audio_filters/echo.c
+++ b/audio/audio_filters/echo.c
@@ -13,13 +13,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dspfilter.h"
-#include <math.h>
 #include <stdlib.h>
 
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif
+#include <retro_miscellaneous.h>
+
+#include "dspfilter.h"
 
 struct echo_channel
 {
diff --git a/audio/audio_filters/eq.c b/audio/audio_filters/eq.c
index 0660245dd5..3318809d2c 100644
--- a/audio/audio_filters/eq.c
+++ b/audio/audio_filters/eq.c
@@ -24,10 +24,6 @@
 
 #include "fft/fft.c"
 
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
 struct eq_data
 {
    fft_t *fft;
diff --git a/audio/drivers/xaudio.cpp b/audio/drivers/xaudio.cpp
index ace9d75702..ce03407655 100644
--- a/audio/drivers/xaudio.cpp
+++ b/audio/drivers/xaudio.cpp
@@ -21,6 +21,7 @@
 #include <boolean.h>
 
 #include <compat/msvc.h>
+#include <retro_miscellaneous.h>
 
 #include "xaudio.h"
 
@@ -34,11 +35,6 @@ typedef struct xaudio2 xaudio2_t;
 
 #define MAX_BUFFERS_MASK (MAX_BUFFERS - 1)
 
-#undef min
-#undef max
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
 typedef struct
 {
    xaudio2_t *xa;
diff --git a/audio/drivers_resampler/cc_resampler.c b/audio/drivers_resampler/cc_resampler.c
index 763fff04b9..87653f7869 100644
--- a/audio/drivers_resampler/cc_resampler.c
+++ b/audio/drivers_resampler/cc_resampler.c
@@ -15,13 +15,15 @@
 
 /* Convoluted Cosine Resampler */
 
-#include <math.h>
 #include <stdint.h>
 #include <stdlib.h>
+
 #ifdef __SSE__
 #include <xmmintrin.h>
 #endif
+
 #include <retro_inline.h>
+#include <retro_miscellaneous.h>
 #include <memalign.h>
 
 #include "../audio_resampler_driver.h"
@@ -44,10 +46,6 @@
 #define CC_RESAMPLER_PRECISION 1
 #endif
 
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
 typedef struct rarch_CC_resampler
 {
    audio_frame_float_t buffer[4];
diff --git a/audio/test/snr.c b/audio/test/snr.c
index 70910398d1..7e76ad990d 100644
--- a/audio/test/snr.c
+++ b/audio/test/snr.c
@@ -19,8 +19,11 @@
 #include <complex.h>
 #include <string.h>
 #include <assert.h>
+
 #include <stdbool.h>
 
+#include <retro_miscellaneous.h>
+
 #include "../audio_resampler_driver.h"
 #include "../audio_utils.h"
 
@@ -28,9 +31,6 @@
 #define RESAMPLER_IDENT "sinc"
 #endif
 
-#undef min
-#define min(a, b) (((a) < (b)) ? (a) : (b))
-
 static void gen_signal(float *out, double omega, double bias_samples, size_t samples)
 {
    size_t i;