diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h
index 95800cf3..e2332161 100644
--- a/src/Common/Game/T6/T6_Assets.h
+++ b/src/Common/Game/T6/T6_Assets.h
@@ -3814,7 +3814,8 @@ namespace T6
         uint16_t dynEntId;
     };
 
-    union gcc_align(8) __m128
+    // Usually __m128, but that is not portable
+    union gcc_align(8) custom_m128
     {
         float m128_f32[4];
         uint64_t m128_u64[2];
@@ -3827,19 +3828,12 @@ namespace T6
         unsigned int m128_u32[4];
     };
 
-    struct vector3
-    {
-        __m128 x;
-        __m128 y;
-        __m128 z;
-    };
-
     struct vector4
     {
-        __m128 x;
-        __m128 y;
-        __m128 z;
-        __m128 w;
+        custom_m128 x;
+        custom_m128 y;
+        custom_m128 z;
+        custom_m128 w;
     };
 
     struct type_align(16) SSkinInstance
diff --git a/thirdparty/catch2 b/thirdparty/catch2
index 914aeecf..76f70b14 160000
--- a/thirdparty/catch2
+++ b/thirdparty/catch2
@@ -1 +1 @@
-Subproject commit 914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a
+Subproject commit 76f70b1403dbc0781216f49e20e45b71f7eccdd8
diff --git a/thirdparty/eigen b/thirdparty/eigen
index 5fc6fc98..6579e36e 160000
--- a/thirdparty/eigen
+++ b/thirdparty/eigen
@@ -1 +1 @@
-Subproject commit 5fc6fc9881dd533fc21da10ed3f6d2f2536deac5
+Subproject commit 6579e36eb4f19e4a01d89277f927da8391a74c04
diff --git a/thirdparty/json b/thirdparty/json
index 8215dbaf..11a835df 160000
--- a/thirdparty/json
+++ b/thirdparty/json
@@ -1 +1 @@
-Subproject commit 8215dbafbdab7c166fad02db86d4ea2a82f851c7
+Subproject commit 11a835df85677002a8aadc5b4e945684c5b7f68b
diff --git a/thirdparty/libtomcrypt b/thirdparty/libtomcrypt
index d0326866..a6b9aff7 160000
--- a/thirdparty/libtomcrypt
+++ b/thirdparty/libtomcrypt
@@ -1 +1 @@
-Subproject commit d032686639224b3efd89b802edaff3c52d8592f7
+Subproject commit a6b9aff7aab857fe1b491710a5c5b9e2be49cb08
diff --git a/thirdparty/libtommath b/thirdparty/libtommath
index 5938524c..e823b0c3 160000
--- a/thirdparty/libtommath
+++ b/thirdparty/libtommath
@@ -1 +1 @@
-Subproject commit 5938524c60a7168ba5babb3e47b5cd4ee6eadb46
+Subproject commit e823b0c34cea291bdb94d672731e1c1f08525557