diff --git a/include/assimp/matrix4x4.inl b/include/assimp/matrix4x4.inl
index 15edbf4ab..589129b10 100644
--- a/include/assimp/matrix4x4.inl
+++ b/include/assimp/matrix4x4.inl
@@ -53,7 +53,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <algorithm>
 #include <limits>
-#include <math.h>
+
+#ifdef __cplusplus
+#   include <cmath>
+#else
+#   include <math.h>
+#endif
 
 // ----------------------------------------------------------------------------------------
 template <typename TReal>
diff --git a/include/assimp/vector2.h b/include/assimp/vector2.h
index 46165ad54..f5e4b7c5e 100644
--- a/include/assimp/vector2.h
+++ b/include/assimp/vector2.h
@@ -44,7 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_VECTOR2D_H_INC
 #define AI_VECTOR2D_H_INC
 
-#include <math.h>
+#ifdef __cplusplus
+#   include <cmath>
+#else
+#   include <math.h>
+#endif
 
 #include "./Compiler/pushpack1.h"
 
diff --git a/include/assimp/vector3.h b/include/assimp/vector3.h
index cbdee264d..7b5269c9c 100644
--- a/include/assimp/vector3.h
+++ b/include/assimp/vector3.h
@@ -44,8 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_VECTOR3D_H_INC
 #define AI_VECTOR3D_H_INC
 
-#include <math.h>
-
+#ifdef __cplusplus
+#   include <cmath>
+#else
+#   include <math.h>
+#endif
 
 #include "./Compiler/pushpack1.h"
 
diff --git a/include/assimp/vector3.inl b/include/assimp/vector3.inl
index c03437980..63c91480a 100644
--- a/include/assimp/vector3.inl
+++ b/include/assimp/vector3.inl
@@ -90,7 +90,7 @@ AI_FORCE_INLINE TReal aiVector3t<TReal>::SquareLength() const {
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
 AI_FORCE_INLINE TReal aiVector3t<TReal>::Length() const {
-	return sqrt( SquareLength()); 
+	return ::sqrt( SquareLength()); 
 }
 // ------------------------------------------------------------------------------------------------
 template <typename TReal>
@@ -207,6 +207,7 @@ AI_FORCE_INLINE  aiVector3t<TReal> operator - ( const aiVector3t<TReal>& v)	{
 	return aiVector3t<TReal>( -v.x, -v.y, -v.z);
 }
 
+// ------------------------------------------------------------------------------------------------
 
 #endif // __cplusplus
 #endif // AI_VECTOR3D_INL_INC