diff --git a/.gitmodules b/.gitmodules
index 35c6317dc8..82d1980279 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,10 +32,6 @@
 [submodule "External/Catch2"]
 	path = External/Catch2
 	url = https://github.com/catchorg/Catch2.git
-[submodule "External/robin-map"]
-	shallow = true
-	path = External/robin-map
-	url = https://github.com/FEX-Emu/robin-map.git
 [submodule "External/Vulkan-Headers"]
 	shallow = true
 	path = External/Vulkan-Headers
@@ -49,3 +45,6 @@
 [submodule "External/range-v3"]
 	path = External/range-v3
 	url = https://github.com/ericniebler/range-v3.git
+[submodule "External/unordered_dense"]
+	path = External/unordered_dense
+	url = https://github.com/martinus/unordered_dense.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15971ec255..4128bacf27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,7 +306,7 @@ set(CMAKE_LINKER_FLAGS_RELEASE "${CMAKE_LINKER_FLAGS_RELEASE} -fomit-frame-point
 ## Modules ##
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/)
 
-include_directories(External/robin-map/include/)
+include_directories(External/unordered_dense/include/)
 
 include(CTest)
 if (BUILD_TESTING OR ENABLE_VIXL_DISASSEMBLER OR ENABLE_VIXL_SIMULATOR)
diff --git a/External/robin-map b/External/robin-map
deleted file mode 160000
index d5683d9f18..0000000000
--- a/External/robin-map
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d5683d9f1891e5b04e3e3b2192b5349dc8d814ea
diff --git a/External/unordered_dense b/External/unordered_dense
new file mode 160000
index 0000000000..3234af2c03
--- /dev/null
+++ b/External/unordered_dense
@@ -0,0 +1 @@
+Subproject commit 3234af2c03549bc85656bfd3a86993bf1cd8aef1
diff --git a/FEXCore/include/FEXCore/fextl/robin_map.h b/FEXCore/include/FEXCore/fextl/robin_map.h
index a82bd3bf2e..528860af4d 100644
--- a/FEXCore/include/FEXCore/fextl/robin_map.h
+++ b/FEXCore/include/FEXCore/fextl/robin_map.h
@@ -2,9 +2,9 @@
 #pragma once
 #include <FEXCore/fextl/allocator.h>
 
-#include <tsl/robin_map.h>
+#include <ankerl/unordered_dense.h>
 
 namespace fextl {
-template<class Key, class T, class Hash = std::hash<Key>, class KeyEqual = std::equal_to<Key>, class Allocator = fextl::FEXAlloc<std::pair<const Key, T>>>
-using robin_map = tsl::robin_map<Key, T, Hash, KeyEqual, Allocator>;
+template<class Key, class T, class Hash = std::hash<Key>, class KeyEqual = std::equal_to<Key>, class Allocator = fextl::FEXAlloc<std::pair<Key, T>>>
+using robin_map = ankerl::unordered_dense::map<Key, T, Hash, KeyEqual, Allocator>;
 }
diff --git a/FEXCore/include/FEXCore/fextl/robin_set.h b/FEXCore/include/FEXCore/fextl/robin_set.h
index 9bdb935e50..f963cc441e 100644
--- a/FEXCore/include/FEXCore/fextl/robin_set.h
+++ b/FEXCore/include/FEXCore/fextl/robin_set.h
@@ -2,9 +2,9 @@
 #pragma once
 #include <FEXCore/fextl/allocator.h>
 
-#include <tsl/robin_set.h>
+#include <ankerl/unordered_dense.h>
 
 namespace fextl {
 template<class Key, class Hash = std::hash<Key>, class KeyEqual = std::equal_to<Key>, class Allocator = fextl::FEXAlloc<Key>>
-using robin_set = tsl::robin_set<Key, Hash, KeyEqual, Allocator>;
+using robin_set = ankerl::unordered_dense::set<Key, Hash, KeyEqual, Allocator>;
 }