diff --git a/Extras/InverseDynamics/DillCreator.cpp b/Extras/InverseDynamics/DillCreator.cpp
index 8463ab887..a1ddf00c2 100644
--- a/Extras/InverseDynamics/DillCreator.cpp
+++ b/Extras/InverseDynamics/DillCreator.cpp
@@ -79,7 +79,7 @@ int DillCreator::recurseDill(const int level, const int parent, const idScalar d
         return -1;
     }
 
-    idScalar size = std::max(level, 1);
+    idScalar size = BT_ID_MAX(level, 1);
     const int body = m_current_body;
     //  length = 0.1 * size;
     //  with = 2 * 0.01 * size;
diff --git a/src/BulletInverseDynamics/IDConfig.hpp b/src/BulletInverseDynamics/IDConfig.hpp
index 97646dc43..dadbd8235 100644
--- a/src/BulletInverseDynamics/IDConfig.hpp
+++ b/src/BulletInverseDynamics/IDConfig.hpp
@@ -28,12 +28,20 @@
 #ifndef btInverseDynamics 
 #error "custom inverse dynamics config, but no custom namespace defined"
 #endif
+
+#define BT_ID_MAX(a,b) std::max(a,b)
+#define BT_ID_MIN(a,b) std::min(a,b)
+
 #else
 #define btInverseDynamics btInverseDynamicsBullet3
 // Use default configuration with bullet's types
 // Use the same scalar type as rest of bullet library
 #include "LinearMath/btScalar.h"
 typedef btScalar idScalar;
+#include "LinearMath/btMinMax.h"
+#define BT_ID_MAX(a,b) btMax(a,b)
+#define BT_ID_MIN(a,b) btMin(a,b)
+
 #ifdef BT_USE_DOUBLE_PRECISION
 #define BT_ID_USE_DOUBLE_PRECISION
 #endif