diff --git a/src/Base/Tools2D.h b/src/Base/Tools2D.h
index 527793392d..1b1b07f6ef 100644
--- a/src/Base/Tools2D.h
+++ b/src/Base/Tools2D.h
@@ -25,7 +25,7 @@
 #define BASE_TOOLS2D_H
 
 
-#include <math.h>
+#include <cmath>
 #include <stdio.h>
 #include <list>
 #include <vector>
diff --git a/src/Base/Vector3D.h b/src/Base/Vector3D.h
index 9feb557367..96bd16ab36 100644
--- a/src/Base/Vector3D.h
+++ b/src/Base/Vector3D.h
@@ -25,7 +25,7 @@
 #define BASE_VECTOR3D_H
 
 
-#include <math.h>
+#include <cmath>
 
 #define FLOAT_EPS   1.0e-4f 
 
diff --git a/src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp b/src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp
index a8a0b0db56..c38b4fe428 100644
--- a/src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp
+++ b/src/Gui/3Dconnexion/GuiApplicationNativeEventAwareWin32.cpp
@@ -29,7 +29,7 @@ http://www.3dconnexion.com/forum/viewtopic.php?f=19&t=4968&sid=72c018bdcf0e6edc9
 
 #include <QApplication>
 #include <windows.h>
-#include <math.h>
+#include <cmath>
 
 #define LOGITECH_VENDOR_ID 0x46d
 #define _CONSTANT_INPUT_PERIOD 0
diff --git a/src/Gui/DlgSettingsColorGradientImp.cpp b/src/Gui/DlgSettingsColorGradientImp.cpp
index 22e3633bee..bf272fda63 100644
--- a/src/Gui/DlgSettingsColorGradientImp.cpp
+++ b/src/Gui/DlgSettingsColorGradientImp.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #ifndef _PreComp_
-#include <math.h>
+#include <cmath>
 #endif
 
 #include "DlgSettingsColorGradientImp.h"
diff --git a/src/Gui/DownloadItem.cpp b/src/Gui/DownloadItem.cpp
index 46d226967b..bfb79a515f 100644
--- a/src/Gui/DownloadItem.cpp
+++ b/src/Gui/DownloadItem.cpp
@@ -23,7 +23,7 @@
 
 #include "PreCompiled.h"
 #include <stdio.h>
-#include <math.h>
+#include <cmath>
 
 #include <QAuthenticator>
 #include <QContextMenuEvent>
diff --git a/src/Gui/DownloadManager.cpp b/src/Gui/DownloadManager.cpp
index 27931652f0..4158f85932 100644
--- a/src/Gui/DownloadManager.cpp
+++ b/src/Gui/DownloadManager.cpp
@@ -23,7 +23,7 @@
 
 #include "PreCompiled.h"
 #include <stdio.h>
-#include <math.h>
+#include <cmath>
 
 #include <QByteArray>
 #include <QDockWidget>
diff --git a/src/Gui/Inventor/SoAutoZoomTranslation.cpp b/src/Gui/Inventor/SoAutoZoomTranslation.cpp
index 7b5738c68e..977b101a4c 100644
--- a/src/Gui/Inventor/SoAutoZoomTranslation.cpp
+++ b/src/Gui/Inventor/SoAutoZoomTranslation.cpp
@@ -25,7 +25,7 @@
 #ifndef _PreComp_
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/misc/SoState.h>
-# include <math.h>
+# include <cmath>
 # include <cfloat>
 #endif
 
diff --git a/src/Mod/Assembly/Gui/PreCompiled.h b/src/Mod/Assembly/Gui/PreCompiled.h
index c0e020b5a0..04e8f4a46a 100644
--- a/src/Mod/Assembly/Gui/PreCompiled.h
+++ b/src/Mod/Assembly/Gui/PreCompiled.h
@@ -44,7 +44,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>
diff --git a/src/Mod/Complete/Gui/PreCompiled.h b/src/Mod/Complete/Gui/PreCompiled.h
index 9dc21b68ea..21382f75aa 100644
--- a/src/Mod/Complete/Gui/PreCompiled.h
+++ b/src/Mod/Complete/Gui/PreCompiled.h
@@ -44,7 +44,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>
diff --git a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h
index 7a25818c14..9eab34900c 100755
--- a/src/Mod/Fem/Gui/PreCompiled.h
+++ b/src/Mod/Fem/Gui/PreCompiled.h
@@ -49,7 +49,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>
diff --git a/src/Mod/Image/Gui/PreCompiled.h b/src/Mod/Image/Gui/PreCompiled.h
index b6d72e0b5c..5ef5efd0ff 100644
--- a/src/Mod/Image/Gui/PreCompiled.h
+++ b/src/Mod/Image/Gui/PreCompiled.h
@@ -51,7 +51,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>
diff --git a/src/Mod/Mesh/App/Core/Definitions.cpp b/src/Mod/Mesh/App/Core/Definitions.cpp
index 13ae369aa8..86938638af 100644
--- a/src/Mod/Mesh/App/Core/Definitions.cpp
+++ b/src/Mod/Mesh/App/Core/Definitions.cpp
@@ -23,7 +23,7 @@
 
 #include "PreCompiled.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "Definitions.h"
 
diff --git a/src/Mod/Mesh/App/Core/Evaluation.h b/src/Mod/Mesh/App/Core/Evaluation.h
index cde501e647..2444021dc8 100644
--- a/src/Mod/Mesh/App/Core/Evaluation.h
+++ b/src/Mod/Mesh/App/Core/Evaluation.h
@@ -25,7 +25,7 @@
 #define MESH_EVALUATION_H
 
 #include <list>
-#include <math.h>
+#include <cmath>
 
 #include "MeshKernel.h"
 #include "Visitor.h"
diff --git a/src/Mod/Mesh/App/Core/MeshIO.cpp b/src/Mod/Mesh/App/Core/MeshIO.cpp
index 841f0c7435..1a4a31f6ae 100644
--- a/src/Mod/Mesh/App/Core/MeshIO.cpp
+++ b/src/Mod/Mesh/App/Core/MeshIO.cpp
@@ -39,7 +39,7 @@
 #include <Base/Placement.h>
 #include <zipios++/gzipoutputstream.h>
 
-#include <math.h>
+#include <cmath>
 #include <sstream>
 #include <iomanip>
 #include <boost/regex.hpp>
diff --git a/src/Mod/Mesh/App/PreCompiled.h b/src/Mod/Mesh/App/PreCompiled.h
index 6db3051951..964b92d87d 100644
--- a/src/Mod/Mesh/App/PreCompiled.h
+++ b/src/Mod/Mesh/App/PreCompiled.h
@@ -49,7 +49,7 @@
 // standard
 #include <stdio.h>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 #include <float.h>
 #include <fcntl.h>
 #include <ios>
diff --git a/src/Mod/MeshPart/Gui/PreCompiled.h b/src/Mod/MeshPart/Gui/PreCompiled.h
index 0966f935cd..30780015c8 100644
--- a/src/Mod/MeshPart/Gui/PreCompiled.h
+++ b/src/Mod/MeshPart/Gui/PreCompiled.h
@@ -52,7 +52,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>
diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h
index c99740398b..bbe10c1366 100644
--- a/src/Mod/PartDesign/Gui/PreCompiled.h
+++ b/src/Mod/PartDesign/Gui/PreCompiled.h
@@ -52,7 +52,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // OCC
 #include <Standard_math.hxx>
diff --git a/src/Mod/Points/App/Points.cpp b/src/Mod/Points/App/Points.cpp
index ebc38ecb41..2a593e4188 100644
--- a/src/Mod/Points/App/Points.cpp
+++ b/src/Mod/Points/App/Points.cpp
@@ -23,7 +23,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <math.h>
+# include <cmath>
 # include <iostream>
 #endif
 
diff --git a/src/Mod/Points/App/PreCompiled.h b/src/Mod/Points/App/PreCompiled.h
index daf31cbfe1..9ce09439b8 100644
--- a/src/Mod/Points/App/PreCompiled.h
+++ b/src/Mod/Points/App/PreCompiled.h
@@ -61,7 +61,7 @@
 #include <vector>
 #include <bitset>
 #include <float.h>
-#include <math.h>
+#include <cmath>
 #include <stdlib.h>
 
 #endif //_PreComp_
diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.h b/src/Mod/ReverseEngineering/Gui/PreCompiled.h
index 66d6f3c841..88cedeb217 100644
--- a/src/Mod/ReverseEngineering/Gui/PreCompiled.h
+++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.h
@@ -52,7 +52,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>
diff --git a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h
index f4ff711f34..51231c7f7d 100644
--- a/src/Mod/Robot/Gui/PreCompiled.h
+++ b/src/Mod/Robot/Gui/PreCompiled.h
@@ -49,7 +49,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>
diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp
index da0c334f62..0d1ca669ad 100644
--- a/src/Mod/Sketcher/App/Sketch.cpp
+++ b/src/Mod/Sketcher/App/Sketch.cpp
@@ -50,7 +50,7 @@
 
 #include "Sketch.h"
 #include "Constraint.h"
-#include <math.h>
+#include <cmath>
 
 #include <iostream>
 
diff --git a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp
index 0daf175beb..362264eb6c 100644
--- a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp
+++ b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp
@@ -42,7 +42,7 @@
 # include <Inventor/SoPrimitiveVertex.h>
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/misc/SoState.h>
-# include <math.h>
+# include <cmath>
 #endif
 #include <Inventor/actions/SoGetMatrixAction.h>
 #include <Inventor/elements/SoFontNameElement.h>
diff --git a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
index 3a89fd213f..81d72bac91 100644
--- a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
+++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
@@ -25,7 +25,7 @@
 #ifndef _PreComp_
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/misc/SoState.h>
-# include <math.h>
+# include <cmath>
 # include <cfloat>
 #endif
 
diff --git a/src/Mod/Start/Gui/PreCompiled.h b/src/Mod/Start/Gui/PreCompiled.h
index 79a4536769..87c3f030a4 100644
--- a/src/Mod/Start/Gui/PreCompiled.h
+++ b/src/Mod/Start/Gui/PreCompiled.h
@@ -44,7 +44,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>
diff --git a/src/Mod/Web/Gui/PreCompiled.h b/src/Mod/Web/Gui/PreCompiled.h
index bee123fcf3..7363dfe85a 100644
--- a/src/Mod/Web/Gui/PreCompiled.h
+++ b/src/Mod/Web/Gui/PreCompiled.h
@@ -42,7 +42,7 @@
 // standard
 #include <iostream>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 // STL
 #include <vector>