diff --git a/MappingGui.h b/MappingGui.h
index 456009f..63d434a 100644
--- a/MappingGui.h
+++ b/MappingGui.h
@@ -39,6 +39,12 @@
 
 #include "MapperGLCanvas.h"
 
+#ifndef WIN32
+#include "ShapeGraphicsItem.h"
+#include "ShapeControlPainter.h"
+#include "Util.h"
+#endif
+
 #include "qtpropertymanager.h"
 #include "qtvariantproperty.h"
 #include "qttreepropertybrowser.h"
diff --git a/Maths.h b/Maths.h
index b4dcf94..2852cd0 100644
--- a/Maths.h
+++ b/Maths.h
@@ -23,7 +23,7 @@
 #define MATH_H_
 
 #include <QtGlobal>
-#include "math.h"
+#include <cmath>
 
 #ifndef M_PI
 # define M_PI 3.14159265358979323846
diff --git a/ShapeGraphicsItem.cpp b/ShapeGraphicsItem.cpp
index 90c1ce9..c3d656f 100644
--- a/ShapeGraphicsItem.cpp
+++ b/ShapeGraphicsItem.cpp
@@ -22,7 +22,9 @@
 
 #include "MainWindow.h"
 
+#ifdef WIN32
 #include "Util.h"
+#endif
 
 ShapeGraphicsItem::ShapeGraphicsItem(Mapping::ptr mapping, bool output)
   : _mapping(mapping), _output(output)
diff --git a/mapmap.pro b/mapmap.pro
index 6f29b22..6466a48 100644
--- a/mapmap.pro
+++ b/mapmap.pro
@@ -164,11 +164,11 @@ mac {
 win32 {
   DEFINES += WIN32
   INCLUDEPATH += \
-#    C:/gstreamer/include \
-#    C:/gstreamer/include/libxml2 \
-#    C:/gstreamer/include/glib-2.0 \
-#    C:/gstreamer/lib/glib-2.0/include \
-#    C:/gstreamer/include/gstreamer-0.10
+    C:/gstreamer/include \
+    C:/gstreamer/include/libxml2 \
+    C:/gstreamer/include/glib-2.0 \
+    C:/gstreamer/lib/glib-2.0/include \
+    C:/gstreamer/include/gstreamer-0.10
   LIBS += -L"C:/gstreamer/lib" \
     -L"C:/gstreamer/bin" \
     -lgstreamer-0.10 \