diff --git a/include/lmms_math.h b/include/lmms_math.h
index 78585d4c9..43f699718 100644
--- a/include/lmms_math.h
+++ b/include/lmms_math.h
@@ -31,7 +31,12 @@
 #include "lmmsconfig.h"
 #include <QtCore/QtGlobal>
 
-#include <math.h>
+#include <cmath>
+using namespace std;
+
+#ifndef M_PI
+#	define M_PI 3.14159265358979323846
+#endif
 
 #if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) 
 #ifndef isnanf
diff --git a/src/core/fft_helpers.cpp b/src/core/fft_helpers.cpp
index e1ebc648b..0f9444aa6 100644
--- a/src/core/fft_helpers.cpp
+++ b/src/core/fft_helpers.cpp
@@ -25,7 +25,7 @@
 
 #include "fft_helpers.h"
 
-#include <math.h>
+#include <lmms_math.h>
 
 
 /* returns biggest value from abs_spectrum[spec_size] array