diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp
index 33de72e0f..26aa52300 100644
--- a/code/Common/Assimp.cpp
+++ b/code/Common/Assimp.cpp
@@ -1079,7 +1079,7 @@ ASSIMP_API void aiMatrix4DecomposeIntoScalingAxisAnglePosition(
         const C_STRUCT aiMatrix4x4 *mat,
         C_STRUCT aiVector3D *scaling,
         C_STRUCT aiVector3D *axis,
-        float *angle,
+        ai_real *angle,
         C_STRUCT aiVector3D *position) {
     ai_assert(nullptr != mat);
     ai_assert(nullptr != scaling);
diff --git a/code/Common/SpatialSort.cpp b/code/Common/SpatialSort.cpp
index 86e22b242..3b8a64606 100644
--- a/code/Common/SpatialSort.cpp
+++ b/code/Common/SpatialSort.cpp
@@ -214,7 +214,7 @@ BinFloat ToBinary(const ai_real &pValue) {
     const bool OneComplement = ((-42 == ~42) && (binValue & 0x80000000));
 
     if (DefaultValue)
-        return BinFloat(1 << (CHAR_BIT * sizeof(BinFloat) - 1)) - binValue;
+        return BinFloat(BinFloat(1) << (CHAR_BIT * sizeof(BinFloat) - 1)) - binValue;
     // One's complement?
     else if (OneComplement)
         return BinFloat(-0) - binValue;
diff --git a/code/PostProcessing/ProcessHelper.h b/code/PostProcessing/ProcessHelper.h
index 660555ef0..8520b21ec 100644
--- a/code/PostProcessing/ProcessHelper.h
+++ b/code/PostProcessing/ProcessHelper.h
@@ -222,7 +222,7 @@ template <>
 struct MinMaxChooser<aiVertexWeight> {
     void operator()(aiVertexWeight &min, aiVertexWeight &max) {
         MinMaxChooser<unsigned int>()(min.mVertexId, max.mVertexId);
-        MinMaxChooser<float>()(min.mWeight, max.mWeight);
+        MinMaxChooser<ai_real>()(min.mWeight, max.mWeight);
     }
 };
 
diff --git a/include/assimp/cimport.h b/include/assimp/cimport.h
index a6ab93051..3e1b75a31 100644
--- a/include/assimp/cimport.h
+++ b/include/assimp/cimport.h
@@ -1044,7 +1044,7 @@ ASSIMP_API void aiMatrix4DecomposeIntoScalingAxisAnglePosition(
     const C_STRUCT aiMatrix4x4* mat,
     C_STRUCT aiVector3D* scaling,
     C_STRUCT aiVector3D* axis,
-    float* angle,
+    ai_real* angle,
     C_STRUCT aiVector3D* position);
 
 // --------------------------------------------------------------------------------
diff --git a/test/unit/AssimpAPITest_aiMatrix4x4.cpp b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
index 2c89726e0..89883dc0d 100644
--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
@@ -176,7 +176,7 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DecomposeIntoScalingAxisAnglePosition
     aiVector3D scaling_c, scaling_cpp,
         axis_c, axis_cpp,
         position_c, position_cpp;
-    float angle_c, angle_cpp;
+    ai_real angle_c, angle_cpp;
 
     result_c = result_cpp = get_predetermined_transformation_matrix_for_decomposition();
     result_cpp.Decompose(scaling_cpp, axis_cpp, angle_cpp, position_cpp);