diff --git a/3d-viewer/3d_cache/3d_cache.cpp b/3d-viewer/3d_cache/3d_cache.cpp
index 70b9f95e0c..e69d92321b 100644
--- a/3d-viewer/3d_cache/3d_cache.cpp
+++ b/3d-viewer/3d_cache/3d_cache.cpp
@@ -38,9 +38,7 @@
 #include <boost/uuid/sha1.hpp>
 
 #include <glm/glm.hpp>
-#include <glm/gtx/transform.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
+#include <glm/ext.hpp>
 
 #include "3d_cache.h"
 #include "3d_info.h"
diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
index ede4187117..ec483e982d 100644
--- a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
+++ b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
@@ -32,8 +32,8 @@
 #include <wx/filename.h>
 #include <wx/glcanvas.h>
 #include <wx/dirctrl.h>
-#include <glm/gtx/transform.hpp>
-#include <glm/gtc/matrix_transform.hpp>
+#include <glm/glm.hpp>
+#include <glm/ext.hpp>
 
 #include "project.h"
 #include "3d_cache.h"
diff --git a/3d-viewer/3d_cache/sg/scenegraph.cpp b/3d-viewer/3d_cache/sg/scenegraph.cpp
index 69a9263125..b505b60252 100644
--- a/3d-viewer/3d_cache/sg/scenegraph.cpp
+++ b/3d-viewer/3d_cache/sg/scenegraph.cpp
@@ -25,9 +25,8 @@
 
 #include <iostream>
 #include <sstream>
-#include <glm/gtx/transform.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
+#include <glm/glm.hpp>
+#include <glm/ext.hpp>
 #include <wx/log.h>
 
 #include "3d_cache/sg/scenegraph.h"
diff --git a/include/plugins/3dapi/xv3d_types.h b/include/plugins/3dapi/xv3d_types.h
index aee572f7c2..630d0573a1 100644
--- a/include/plugins/3dapi/xv3d_types.h
+++ b/include/plugins/3dapi/xv3d_types.h
@@ -31,15 +31,13 @@
 #define XV3D_TYPES_H
 
 #define GLM_FORCE_RADIANS
+
+// Disable SIMD detection
+#define GLM_FORCE_PURE
+
 #include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtx/matrix_major_storage.hpp>
-#include <glm/gtx/matrix_decompose.hpp>
-#include <glm/gtx/quaternion.hpp>
-#include <glm/gtx/fast_square_root.hpp>
-#include <glm/gtx/rotate_vector.hpp>
-//#include <glm/gtx/simd_vec4.hpp>
+#include <glm/ext.hpp>
+#include <mm_malloc.h>
 
 typedef glm::uvec2  SFVEC2UI;
 typedef glm::ivec2  SFVEC2I;