diff --git a/.gitmodules b/.gitmodules
index 9b3027eab7..2a72dbf6ba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -79,6 +79,3 @@
 [submodule "genconfig"]
 	path = genconfig
 	url = https://github.com/mborgerson/genconfig.git
-[submodule "ui/thirdparty/httplib"]
-	path = ui/thirdparty/httplib
-	url = https://github.com/yhirose/cpp-httplib
diff --git a/configure b/configure
index 04a8c1d7c9..c1084673fa 100755
--- a/configure
+++ b/configure
@@ -237,7 +237,7 @@ else
     git_submodules_action="ignore"
 fi
 
-git_submodules="ui/keycodemapdb ui/thirdparty/imgui ui/thirdparty/implot ui/thirdparty/httplib util/xxHash genconfig"
+git_submodules="ui/keycodemapdb ui/thirdparty/imgui ui/thirdparty/implot util/xxHash genconfig"
 git="git"
 
 # Don't accept a target_list environment variable.
diff --git a/licenses/httplib.license.txt b/licenses/cpp-httplib.license.txt
similarity index 100%
rename from licenses/httplib.license.txt
rename to licenses/cpp-httplib.license.txt
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index 0069d4d634..580a4b17a5 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -30,9 +30,9 @@ submodules="dtc meson ui/keycodemapdb"
 submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"
 
 # xemu extras
-submodules="$submodules ui/thirdparty/imgui ui/thirdparty/implot ui/thirdparty/httplib util/xxHash genconfig"
+submodules="$submodules ui/thirdparty/imgui ui/thirdparty/implot util/xxHash genconfig"
 
-subprojects="glslang SPIRV-Reflect volk VulkanMemoryAllocator nv2a_vsh_cpu tomlplusplus"
+subprojects="glslang SPIRV-Reflect volk VulkanMemoryAllocator nv2a_vsh_cpu tomlplusplus cpp-httplib"
 
 sub_deinit=""
 
diff --git a/scripts/gen-license.py b/scripts/gen-license.py
index 693bb3b3be..dd69073172 100755
--- a/scripts/gen-license.py
+++ b/scripts/gen-license.py
@@ -197,10 +197,10 @@ Lib('implot', 'https://github.com/epezent/implot',
 	submodule=Submodule('ui/thirdparty/implot')
 	),
 
-Lib('httplib', 'https://github.com/yhirose/cpp-httplib',
+Lib('cpp-httplib', 'https://github.com/yhirose/cpp-httplib',
 	mit, 'https://raw.githubusercontent.com/yhirose/cpp-httplib/master/LICENSE',
 	ships_static=all_platforms,
-	submodule=Submodule('ui/thirdparty/httplib')
+	submodule=Submodule('subprojects/cpp-httplib.wrap')
 	),
 
 Lib('noc', 'https://github.com/guillaumechereau/noc/blob/master/noc_file_dialog.h',
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index 9af33d8c00..4be0564261 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -4,3 +4,4 @@ volk
 VulkanMemoryAllocator
 nv2a_vsh_cpu
 tomlplusplus
+cpp-httplib
diff --git a/subprojects/cpp-httplib.wrap b/subprojects/cpp-httplib.wrap
new file mode 100644
index 0000000000..fc88d23ec5
--- /dev/null
+++ b/subprojects/cpp-httplib.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+url=https://github.com/yhirose/cpp-httplib
+revision=0f1b62c2b3d0898cbab7aa685c2593303ffdc1a2
+depth=1
diff --git a/ui/thirdparty/httplib b/ui/thirdparty/httplib
deleted file mode 160000
index 0f1b62c2b3..0000000000
--- a/ui/thirdparty/httplib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f1b62c2b3d0898cbab7aa685c2593303ffdc1a2
diff --git a/ui/thirdparty/meson.build b/ui/thirdparty/meson.build
index 90d348a34e..baa38cb771 100644
--- a/ui/thirdparty/meson.build
+++ b/ui/thirdparty/meson.build
@@ -61,7 +61,13 @@ libfpng = static_library('fpng', sources: 'fpng/fpng.cpp', cpp_args: libfpng_cpp
 fpng = declare_dependency(include_directories: 'fpng', link_with: libfpng)
 
 json = declare_dependency(include_directories: 'json')
-httplib = declare_dependency(include_directories: 'httplib', dependencies: targetos == 'windows' ? [crypt32] : [])
+
+httplib_proj = subproject('cpp-httplib', default_options: ['cpp-httplib_openssl=enabled'])
+httplib_deps = [httplib_proj.get_variable('cpp_httplib_dep')]
+if targetos == 'windows'
+  httplib_deps += [crypt32]
+endif
+httplib = declare_dependency(dependencies: httplib_deps)
 
 libfatx = static_library('fatx', sources: 'fatx/fatx.c')
 fatx = declare_dependency(include_directories: 'fatx', link_with: libfatx)
diff --git a/ui/xui/reporting.cc b/ui/xui/reporting.cc
index 992d5da0a7..c52bf00076 100644
--- a/ui/xui/reporting.cc
+++ b/ui/xui/reporting.cc
@@ -22,7 +22,6 @@
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include "reporting.hh"
-#define CPPHTTPLIB_OPENSSL_SUPPORT 1
 #include <httplib.h>
 #include <json.hpp>
 using json = nlohmann::json;
diff --git a/ui/xui/update.cc b/ui/xui/update.cc
index b29000fda2..7336e9fb10 100644
--- a/ui/xui/update.cc
+++ b/ui/xui/update.cc
@@ -40,7 +40,6 @@ const char *download_uri = "/xemu-project/xemu/releases/latest/download/xemu-win
 FIXME
 #endif
 
-#define CPPHTTPLIB_OPENSSL_SUPPORT 1
 #include <httplib.h>
 
 #define DPRINTF(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__);