diff --git a/3rdparty/rcheevos/CMakeLists.txt b/3rdparty/rcheevos/CMakeLists.txt
index 5e570a4ee2..9209cbec15 100644
--- a/3rdparty/rcheevos/CMakeLists.txt
+++ b/3rdparty/rcheevos/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_library(rcheevos
+	rcheevos/include/rcheevos.h
 	rcheevos/include/rc_api_editor.h
 	rcheevos/include/rc_api_info.h
 	rcheevos/include/rc_api_request.h
@@ -8,7 +9,6 @@ add_library(rcheevos
 	rcheevos/include/rc_consoles.h
 	rcheevos/include/rc_error.h
 	rcheevos/include/rc_hash.h
-	rcheevos/include/rcheevos.h
 	rcheevos/include/rc_runtime.h
 	rcheevos/include/rc_runtime_types.h
 	rcheevos/include/rc_url.h
@@ -19,7 +19,6 @@ add_library(rcheevos
 	rcheevos/src/rapi/rc_api_runtime.c
 	rcheevos/src/rapi/rc_api_user.c
 	rcheevos/src/rcheevos/alloc.c
-	rcheevos/src/rcheevos/compat.c
 	rcheevos/src/rcheevos/condition.c
 	rcheevos/src/rcheevos/condset.c
 	rcheevos/src/rcheevos/consoleinfo.c
@@ -27,9 +26,6 @@ add_library(rcheevos
 	rcheevos/src/rcheevos/lboard.c
 	rcheevos/src/rcheevos/memref.c
 	rcheevos/src/rcheevos/operand.c
-	rcheevos/src/rcheevos/rc_client.c
-	rcheevos/src/rcheevos/rc_client_internal.h
-	rcheevos/src/rcheevos/rc_compat.h
 	rcheevos/src/rcheevos/rc_internal.h
 	rcheevos/src/rcheevos/rc_validate.c
 	rcheevos/src/rcheevos/rc_validate.h
@@ -38,6 +34,14 @@ add_library(rcheevos
 	rcheevos/src/rcheevos/runtime_progress.c
 	rcheevos/src/rcheevos/trigger.c
 	rcheevos/src/rcheevos/value.c
+	rcheevos/src/rc_client.c
+	rcheevos/src/rc_client_internal.h
+	rcheevos/src/rc_compat.c
+	rcheevos/src/rc_compat.h
+	rcheevos/src/rc_util.c
+	rcheevos/src/rc_util.h
+	rcheevos/src/rc_version.h
+	rcheevos/src/rhash/cdreader.c
 	rcheevos/src/rhash/hash.c
 	rcheevos/src/rhash/md5.c
 	rcheevos/src/rhash/md5.h
diff --git a/3rdparty/rcheevos/rcheevos b/3rdparty/rcheevos/rcheevos
index 43f8c2a2a0..8a717b1b30 160000
--- a/3rdparty/rcheevos/rcheevos
+++ b/3rdparty/rcheevos/rcheevos
@@ -1 +1 @@
-Subproject commit 43f8c2a2a0750561786f17dd35af8755716705aa
+Subproject commit 8a717b1b303be636213a3e6612b059c1c0e98102
diff --git a/3rdparty/rcheevos/rcheevos.vcxproj b/3rdparty/rcheevos/rcheevos.vcxproj
index e22e6bd17c..925225ce4c 100644
--- a/3rdparty/rcheevos/rcheevos.vcxproj
+++ b/3rdparty/rcheevos/rcheevos.vcxproj
@@ -36,7 +36,6 @@
     <ClCompile Include="rcheevos\src\rapi\rc_api_runtime.c" />
     <ClCompile Include="rcheevos\src\rapi\rc_api_user.c" />
     <ClCompile Include="rcheevos\src\rcheevos\alloc.c" />
-    <ClCompile Include="rcheevos\src\rcheevos\compat.c" />
     <ClCompile Include="rcheevos\src\rcheevos\condition.c" />
     <ClCompile Include="rcheevos\src\rcheevos\condset.c" />
     <ClCompile Include="rcheevos\src\rcheevos\consoleinfo.c" />
@@ -44,13 +43,15 @@
     <ClCompile Include="rcheevos\src\rcheevos\lboard.c" />
     <ClCompile Include="rcheevos\src\rcheevos\memref.c" />
     <ClCompile Include="rcheevos\src\rcheevos\operand.c" />
-    <ClCompile Include="rcheevos\src\rcheevos\rc_client.c" />
     <ClCompile Include="rcheevos\src\rcheevos\rc_validate.c" />
     <ClCompile Include="rcheevos\src\rcheevos\richpresence.c" />
     <ClCompile Include="rcheevos\src\rcheevos\runtime.c" />
     <ClCompile Include="rcheevos\src\rcheevos\runtime_progress.c" />
     <ClCompile Include="rcheevos\src\rcheevos\trigger.c" />
     <ClCompile Include="rcheevos\src\rcheevos\value.c" />
+    <ClCompile Include="rcheevos\src\rc_client.c" />
+    <ClCompile Include="rcheevos\src\rc_compat.c" />
+    <ClCompile Include="rcheevos\src\rc_util.c" />
     <ClCompile Include="rcheevos\src\rhash\hash.c" />
     <ClCompile Include="rcheevos\src\rhash\md5.c" />
     <ClCompile Include="rcheevos\src\rurl\url.c" />
@@ -70,10 +71,12 @@
     <ClInclude Include="rcheevos\include\rc_runtime_types.h" />
     <ClInclude Include="rcheevos\include\rc_url.h" />
     <ClInclude Include="rcheevos\src\rapi\rc_api_common.h" />
-    <ClInclude Include="rcheevos\src\rcheevos\rc_client_internal.h" />
-    <ClInclude Include="rcheevos\src\rcheevos\rc_compat.h" />
     <ClInclude Include="rcheevos\src\rcheevos\rc_internal.h" />
     <ClInclude Include="rcheevos\src\rcheevos\rc_validate.h" />
+    <ClInclude Include="rcheevos\src\rc_client_internal.h" />
+    <ClInclude Include="rcheevos\src\rc_compat.h" />
+    <ClInclude Include="rcheevos\src\rc_util.h" />
+    <ClInclude Include="rcheevos\src\rc_version.h" />
     <ClInclude Include="rcheevos\src\rhash\md5.h" />
   </ItemGroup>
   <ItemDefinitionGroup>
diff --git a/3rdparty/rcheevos/rcheevos.vcxproj.filters b/3rdparty/rcheevos/rcheevos.vcxproj.filters
index cc1ec516de..7a8c1f3552 100644
--- a/3rdparty/rcheevos/rcheevos.vcxproj.filters
+++ b/3rdparty/rcheevos/rcheevos.vcxproj.filters
@@ -33,21 +33,18 @@
     <ClCompile Include="rcheevos\src\rapi\rc_api_common.c">
       <Filter>rapi</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\format.c">
-      <Filter>rcheevos</Filter>
+    <ClCompile Include="rcheevos\src\rhash\hash.c">
+      <Filter>rhash</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\lboard.c">
-      <Filter>rcheevos</Filter>
+    <ClCompile Include="rcheevos\src\rhash\md5.c">
+      <Filter>rhash</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\memref.c">
-      <Filter>rcheevos</Filter>
-    </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\operand.c">
-      <Filter>rcheevos</Filter>
-    </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\rc_validate.c">
-      <Filter>rcheevos</Filter>
+    <ClCompile Include="rcheevos\src\rurl\url.c">
+      <Filter>rurl</Filter>
     </ClCompile>
+    <ClCompile Include="rcheevos\src\rc_client.c" />
+    <ClCompile Include="rcheevos\src\rc_compat.c" />
+    <ClCompile Include="rcheevos\src\rc_util.c" />
     <ClCompile Include="rcheevos\src\rcheevos\richpresence.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
@@ -66,9 +63,6 @@
     <ClCompile Include="rcheevos\src\rcheevos\alloc.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\compat.c">
-      <Filter>rcheevos</Filter>
-    </ClCompile>
     <ClCompile Include="rcheevos\src\rcheevos\condition.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
@@ -78,16 +72,19 @@
     <ClCompile Include="rcheevos\src\rcheevos\consoleinfo.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rhash\hash.c">
-      <Filter>rhash</Filter>
+    <ClCompile Include="rcheevos\src\rcheevos\format.c">
+      <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rhash\md5.c">
-      <Filter>rhash</Filter>
+    <ClCompile Include="rcheevos\src\rcheevos\lboard.c">
+      <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rurl\url.c">
-      <Filter>rurl</Filter>
+    <ClCompile Include="rcheevos\src\rcheevos\memref.c">
+      <Filter>rcheevos</Filter>
     </ClCompile>
-    <ClCompile Include="rcheevos\src\rcheevos\rc_client.c">
+    <ClCompile Include="rcheevos\src\rcheevos\operand.c">
+      <Filter>rcheevos</Filter>
+    </ClCompile>
+    <ClCompile Include="rcheevos\src\rcheevos\rc_validate.c">
       <Filter>rcheevos</Filter>
     </ClCompile>
   </ItemGroup>
@@ -95,15 +92,6 @@
     <ClInclude Include="rcheevos\src\rapi\rc_api_common.h">
       <Filter>rapi</Filter>
     </ClInclude>
-    <ClInclude Include="rcheevos\src\rcheevos\rc_compat.h">
-      <Filter>rcheevos</Filter>
-    </ClInclude>
-    <ClInclude Include="rcheevos\src\rcheevos\rc_internal.h">
-      <Filter>rcheevos</Filter>
-    </ClInclude>
-    <ClInclude Include="rcheevos\src\rcheevos\rc_validate.h">
-      <Filter>rcheevos</Filter>
-    </ClInclude>
     <ClInclude Include="rcheevos\src\rhash\md5.h">
       <Filter>rhash</Filter>
     </ClInclude>
@@ -146,7 +134,14 @@
     <ClInclude Include="rcheevos\include\rc_client.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="rcheevos\src\rcheevos\rc_client_internal.h">
+    <ClInclude Include="rcheevos\src\rc_client_internal.h" />
+    <ClInclude Include="rcheevos\src\rc_compat.h" />
+    <ClInclude Include="rcheevos\src\rc_util.h" />
+    <ClInclude Include="rcheevos\src\rc_version.h" />
+    <ClInclude Include="rcheevos\src\rcheevos\rc_validate.h">
+      <Filter>rcheevos</Filter>
+    </ClInclude>
+    <ClInclude Include="rcheevos\src\rcheevos\rc_internal.h">
       <Filter>rcheevos</Filter>
     </ClInclude>
   </ItemGroup>