diff --git a/3d-viewer/3d_rendering/track_ball.cpp b/3d-viewer/3d_rendering/track_ball.cpp
index 09d8327049..901f6a3f20 100644
--- a/3d-viewer/3d_rendering/track_ball.cpp
+++ b/3d-viewer/3d_rendering/track_ball.cpp
@@ -35,6 +35,9 @@
 
 #include <glm/gtc/quaternion.hpp>
 
+// stdlib
+#include <algorithm>
+
 TRACK_BALL::TRACK_BALL( float aInitialDistance ) :
     CAMERA( aInitialDistance )
 {
diff --git a/thirdparty/3dxware_sdk/inc/navlib/navlib_defines.h b/thirdparty/3dxware_sdk/inc/navlib/navlib_defines.h
index c13251da0a..1f8a676eef 100644
--- a/thirdparty/3dxware_sdk/inc/navlib/navlib_defines.h
+++ b/thirdparty/3dxware_sdk/inc/navlib/navlib_defines.h
@@ -58,4 +58,9 @@
 #else
 #define _NAVLIB_DLLAPI
 #endif
+
+#if defined(__GNUC__) && !defined(__clang__)
+#define __cdecl __attribute__((__cdecl__))
+#endif
+
 #endif // NAVLIB_DEFINES_H_INCLUDED_
diff --git a/thirdparty/3dxware_sdk/inc/navlib/navlib_templates.h b/thirdparty/3dxware_sdk/inc/navlib/navlib_templates.h
index b26efc7dcc..8c481a7458 100644
--- a/thirdparty/3dxware_sdk/inc/navlib/navlib_templates.h
+++ b/thirdparty/3dxware_sdk/inc/navlib/navlib_templates.h
@@ -23,6 +23,7 @@
  * @file navlib_templates.h
  * @brief templates used in the 3dconnexion interface.
  */
+
 #if (defined _MSC_VER && _MSC_VER < 1900)
 #define CONSTEXPR const
 #else
diff --git a/thirdparty/3dxware_sdk/inc/navlib/navlib_types.h b/thirdparty/3dxware_sdk/inc/navlib/navlib_types.h
index a9a8daccd0..a79490aa87 100644
--- a/thirdparty/3dxware_sdk/inc/navlib/navlib_types.h
+++ b/thirdparty/3dxware_sdk/inc/navlib/navlib_types.h
@@ -26,7 +26,9 @@
 
 #include <navlib/navlib_defines.h>
 
+#include <errno.h>
 #if (defined(_MSC_VER) && _MSC_VER < 1600)
+typedef __int8 int8_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
 #if _WIN64
@@ -35,6 +37,7 @@ typedef unsigned __int64 size_t;
 typedef unsigned int size_t;
 #endif
 #else
+#include <stddef.h>
 #include <stdint.h>
 #endif
 
@@ -66,9 +69,7 @@ public:
   }
 };
 _NAVLIB_END
-#else //__cplusplus
-typedef __int8 bool;
-#endif
+#endif //__cplusplus
 
 _NAVLIB_BEGIN
 /// <summary>
@@ -1322,7 +1323,11 @@ typedef struct tagNlCreateOptions {
   /// true is to use multi-threading, false for single-threaded.
   /// </summary>
   /// <remarks>The default is false (single-threaded).</remarks>
+#if __cplusplus
   bool bMultiThreaded;
+#else
+  int8_t bMultiThreaded;
+#endif
   /// <inheritdoc/>
   nlOptions_t options;
 } nlCreateOptions_t;