diff --git a/matrix/Euler.hpp b/matrix/Euler.hpp
index d16d307ed1..ec82cf1314 100644
--- a/matrix/Euler.hpp
+++ b/matrix/Euler.hpp
@@ -17,10 +17,6 @@
 
 #include "math.hpp"
 
-#ifndef M_PI
-#define M_PI (3.14159265358979323846f)
-#endif
-
 namespace matrix
 {
 
diff --git a/matrix/stdlib_imports.hpp b/matrix/stdlib_imports.hpp
index 6e98a0da7c..547b5fed75 100644
--- a/matrix/stdlib_imports.hpp
+++ b/matrix/stdlib_imports.hpp
@@ -13,6 +13,13 @@
 #include <cstdlib>
 #include <inttypes.h>
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+#ifndef M_TWOPI
+#define M_TWOPI (M_PI * 2.0)
+#endif
+
 namespace matrix {
 
 #if !defined(FLT_EPSILON)