diff --git a/audio/audio_filters/chorus.c b/audio/audio_filters/chorus.c
index 544d47340b..f6ad25612f 100644
--- a/audio/audio_filters/chorus.c
+++ b/audio/audio_filters/chorus.c
@@ -18,9 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef M_PI
-#define M_PI 3.1415926535897932384626433832795
-#endif
+#include <retro_miscellaneous.h>
 
 #define CHORUS_MAX_DELAY 4096
 #define CHORUS_DELAY_MASK (CHORUS_MAX_DELAY - 1)
diff --git a/audio/audio_filters/fft/fft.c b/audio/audio_filters/fft/fft.c
index aac3427ee9..1347955c07 100644
--- a/audio/audio_filters/fft/fft.c
+++ b/audio/audio_filters/fft/fft.c
@@ -17,9 +17,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-#ifndef M_PI
-#define M_PI 3.1415926535897932384626433832795
-#endif
+#include <retro_miscellaneous.h>
 
 struct fft
 {
diff --git a/audio/audio_filters/iir.c b/audio/audio_filters/iir.c
index 3bfbf52df5..0cf488721e 100644
--- a/audio/audio_filters/iir.c
+++ b/audio/audio_filters/iir.c
@@ -19,9 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef M_PI
-#define M_PI		3.1415926535897932384626433832795
-#endif
+#include <retro_miscellaneous.h>
+
 #define sqr(a) ((a) * (a))
 
 /* filter types */
diff --git a/audio/audio_filters/phaser.c b/audio/audio_filters/phaser.c
index 284d43710b..b484298f82 100644
--- a/audio/audio_filters/phaser.c
+++ b/audio/audio_filters/phaser.c
@@ -19,13 +19,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <retro_miscellaneous.h>
+
 #define phaserlfoshape 4.0
 #define phaserlfoskipsamples 20
 
-#ifndef M_PI
-#define M_PI		3.1415926535897932384626433832795
-#endif
-
 struct phaser_data
 {
    float freq;
diff --git a/audio/audio_filters/wahwah.c b/audio/audio_filters/wahwah.c
index bea58321ae..7b26596d6a 100644
--- a/audio/audio_filters/wahwah.c
+++ b/audio/audio_filters/wahwah.c
@@ -19,11 +19,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define WAHWAH_LFO_SKIP_SAMPLES 30
+#include <retro_miscellaneous.h>
 
-#ifndef M_PI
-#define M_PI		3.1415926535897932384626433832795
-#endif
+#define WAHWAH_LFO_SKIP_SAMPLES 30
 
 struct wahwah_data
 {
diff --git a/audio/audio_resampler_driver.h b/audio/audio_resampler_driver.h
index f5e052bb1b..12eda5c7cc 100644
--- a/audio/audio_resampler_driver.h
+++ b/audio/audio_resampler_driver.h
@@ -27,9 +27,7 @@ extern "C" {
 #include <math.h>
 #include <boolean.h>
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846264338327
-#endif
+#include <retro_miscellaneous.h>
 
 #define RESAMPLER_SIMD_SSE      (1 << 0)
 #define RESAMPLER_SIMD_SSE2     (1 << 1)
diff --git a/cores/libretro-test/libretro-test.c b/cores/libretro-test/libretro-test.c
index 1b336a14dd..7d519d825f 100644
--- a/cores/libretro-test/libretro-test.c
+++ b/cores/libretro-test/libretro-test.c
@@ -5,11 +5,9 @@
 #include <string.h>
 #include <math.h>
 
-#include "../../libretro.h"
+#include <retro_miscellaneous.h>
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
+#include "../../libretro.h"
 
 static uint16_t *frame_buf;
 static struct retro_log_callback logging;
diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp
index 7f23a30ba1..655e0b9d13 100644
--- a/gfx/d3d/render_chain_cg.cpp
+++ b/gfx/d3d/render_chain_cg.cpp
@@ -25,6 +25,7 @@
 #include <Cg/cgD3D9.h>
 
 #include <retro_inline.h>
+#include <retro_miscellaneous.h>
 #include <compat/strl.h>
 
 #include "render_chain_driver.h"
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 90a9cc9596..301033448f 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -25,13 +25,14 @@
 #include <string.h>
 
 #include <compat/strl.h>
-
-#include "../../driver.h"
-#include "../../performance.h"
 #include <gfx/scaler/scaler.h>
 #include <gfx/math/matrix_4x4.h>
 #include <formats/image.h>
 #include <retro_inline.h>
+#include <retro_miscellaneous.h>
+
+#include "../../driver.h"
+#include "../../performance.h"
 
 #include "../../libretro.h"
 #include "../../general.h"
diff --git a/input/drivers/gx_input.c b/input/drivers/gx_input.c
index dd4c80781a..0fcf95c552 100644
--- a/input/drivers/gx_input.c
+++ b/input/drivers/gx_input.c
@@ -21,10 +21,7 @@
 #include <math.h>
 
 #include <boolean.h>
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846264338327
-#endif
+#include <retro_miscellaneous.h>
 
 #include "../../driver.h"
 #include "../../libretro.h"
diff --git a/libretro-common/gfx/scaler/scaler_filter.c b/libretro-common/gfx/scaler/scaler_filter.c
index 756161df3f..50c290c8c3 100644
--- a/libretro-common/gfx/scaler/scaler_filter.c
+++ b/libretro-common/gfx/scaler/scaler_filter.c
@@ -30,10 +30,6 @@
 #include <retro_inline.h>
 #include <filters.h>
 
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
 static bool allocate_filters(struct scaler_ctx *ctx)
 {
    ctx->horiz.filter     = (int16_t*)scaler_alloc(sizeof(int16_t), ctx->horiz.filter_stride * ctx->out_width);
diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h
index 2fbd96799e..d83bbe29b5 100644
--- a/libretro-common/include/retro_miscellaneous.h
+++ b/libretro-common/include/retro_miscellaneous.h
@@ -59,6 +59,10 @@
 #define PATH_MAX_LENGTH 4096
 #endif
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846264338327
+#endif
+
 #ifndef max
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #endif