diff --git a/MappingGui.cpp b/MappingGui.cpp
index c170831..eeeb214 100644
--- a/MappingGui.cpp
+++ b/MappingGui.cpp
@@ -18,10 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "MapperGLCanvas.h"
-#include "ShapeGraphicsItem.h"
-#include "ShapeControlPainter.h"
-
 #include "MappingGui.h"
 
 MappingGui::MappingGui(Mapping::ptr mapping)
diff --git a/MappingGui.h b/MappingGui.h
index 5a35aa9..a68e903 100644
--- a/MappingGui.h
+++ b/MappingGui.h
@@ -37,6 +37,13 @@
 #include "Paint.h"
 #include "Mapping.h"
 
+#include "MapperGLCanvas.h"
+
+#include "ShapeGraphicsItem.h"
+#include "ShapeControlPainter.h"
+
+#include "Util.h"
+
 #include "qtpropertymanager.h"
 #include "qtvariantproperty.h"
 #include "qttreepropertybrowser.h"
diff --git a/Maths.h b/Maths.h
index 2852cd0..1993b05 100644
--- a/Maths.h
+++ b/Maths.h
@@ -25,10 +25,6 @@
 #include <QtGlobal>
 #include <cmath>
 
-#ifndef M_PI
-# define M_PI 3.14159265358979323846
-#endif
-
 /// Converts from degrees to radians.
 inline qreal degreesToRadians(qreal degrees) { return degrees / 180.0f * M_PI; }
 
diff --git a/Shape.h b/Shape.h
index ece450e..4c42528 100644
--- a/Shape.h
+++ b/Shape.h
@@ -21,6 +21,7 @@
 #define M_SHAPE_H_
 
 #include <iostream>
+#include <cmath>
 
 #include <QtGlobal>