diff --git a/.gitmodules b/.gitmodules
index 0f5c437765..ae56f313ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,6 +73,6 @@
 	url = https://github.com/epezent/implot.git
 	ignore = untracked
 [submodule "hw/xbox/nv2a/xxHash"]
-	path = hw/xbox/nv2a/xxHash
+	path = util/xxHash
 	url = https://github.com/Cyan4973/xxHash.git
 	ignore = untracked
diff --git a/configure b/configure
index b327b22d61..e09a81e60d 100755
--- a/configure
+++ b/configure
@@ -261,7 +261,7 @@ else
     git_submodules_action="ignore"
 fi
 
-git_submodules="ui/keycodemapdb ui/imgui ui/implot hw/xbox/nv2a/xxHash"
+git_submodules="ui/keycodemapdb ui/imgui ui/implot util/xxHash"
 git="git"
 
 # Don't accept a target_list environment variable.
diff --git a/hw/xbox/nv2a/pgraph.c b/hw/xbox/nv2a/pgraph.c
index 821b2a8695..2a39ec01c2 100644
--- a/hw/xbox/nv2a/pgraph.c
+++ b/hw/xbox/nv2a/pgraph.c
@@ -20,7 +20,7 @@
  */
 
 #include "nv2a_int.h"
-#include "xxHash/xxh3.h"
+#include "util/xxHash/xxh3.h"
 #include "s3tc.h"
 #include "ui/xemu-settings.h"
 
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index 16331c8168..0bd9f9637c 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -28,7 +28,7 @@ sub_file="${sub_tdir}/submodule.tar"
 # different to the host OS.
 submodules="dtc slirp meson ui/keycodemapdb"
 submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"
-submodules="$submodules ui/imgui ui/implot hw/xbox/nv2a/xxHash" # xemu extras
+submodules="$submodules ui/imgui ui/implot util/xxHash" # xemu extras
 sub_deinit=""
 
 function cleanup() {
diff --git a/scripts/gen-license.py b/scripts/gen-license.py
index 84e7776ced..43d85b705e 100755
--- a/scripts/gen-license.py
+++ b/scripts/gen-license.py
@@ -206,7 +206,7 @@ Lib('inih', 'https://github.com/benhoyt/inih',
 Lib('xxHash', 'https://github.com/Cyan4973/xxHash.git',
 	bsd, 'https://raw.githubusercontent.com/Cyan4973/xxHash/dev/LICENSE', license_lines=(1,26),
 	ships_static=all_platforms,
-	submodule=Submodule('hw/xbox/nv2a/xxHash')
+	submodule=Submodule('util/xxHash')
 	),
 
 #
diff --git a/hw/xbox/nv2a/xxHash b/util/xxHash
similarity index 100%
rename from hw/xbox/nv2a/xxHash
rename to util/xxHash