diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e8d452d56..1c901d444 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1112,7 +1112,7 @@ set (PCH_SOURCES
 	scripting/zscript/ast.cpp
 	scripting/zscript/zcc_compile.cpp
 	scripting/zscript/zcc_parser.cpp
-	utility/sfmt/SFMT.cpp
+	common/thirdparty/sfmt/SFMT.cpp
 	sound/music/i_music.cpp
 	sound/music/i_soundfont.cpp
 	sound/backend/i_sound.cpp
@@ -1425,9 +1425,9 @@ source_group("Common\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/
 source_group("Common\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/.+")
 source_group("Common\\Third Party\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/math/.+")
 source_group("Common\\Third Party\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/rapidjson/.+")
+source_group("Common\\Third Party\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/sfmt/.+")
 source_group("Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/.+")
 source_group("Utility\\Node Builder" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/nodebuilder/.+")
-source_group("Utility\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/sfmt/.+")
 source_group("Statusbar" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_statusbar/.+")
 source_group("Versioning" FILES version.h win32/zdoom.rc)
 source_group("Xlat" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/xlat/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.h)
diff --git a/src/utility/sfmt/LICENSE.txt b/src/common/thirdparty/sfmt/LICENSE.txt
similarity index 100%
rename from src/utility/sfmt/LICENSE.txt
rename to src/common/thirdparty/sfmt/LICENSE.txt
diff --git a/src/utility/sfmt/SFMT-alti.h b/src/common/thirdparty/sfmt/SFMT-alti.h
similarity index 100%
rename from src/utility/sfmt/SFMT-alti.h
rename to src/common/thirdparty/sfmt/SFMT-alti.h
diff --git a/src/utility/sfmt/SFMT-params.h b/src/common/thirdparty/sfmt/SFMT-params.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params.h
rename to src/common/thirdparty/sfmt/SFMT-params.h
diff --git a/src/utility/sfmt/SFMT-params11213.h b/src/common/thirdparty/sfmt/SFMT-params11213.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params11213.h
rename to src/common/thirdparty/sfmt/SFMT-params11213.h
diff --git a/src/utility/sfmt/SFMT-params1279.h b/src/common/thirdparty/sfmt/SFMT-params1279.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params1279.h
rename to src/common/thirdparty/sfmt/SFMT-params1279.h
diff --git a/src/utility/sfmt/SFMT-params132049.h b/src/common/thirdparty/sfmt/SFMT-params132049.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params132049.h
rename to src/common/thirdparty/sfmt/SFMT-params132049.h
diff --git a/src/utility/sfmt/SFMT-params19937.h b/src/common/thirdparty/sfmt/SFMT-params19937.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params19937.h
rename to src/common/thirdparty/sfmt/SFMT-params19937.h
diff --git a/src/utility/sfmt/SFMT-params216091.h b/src/common/thirdparty/sfmt/SFMT-params216091.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params216091.h
rename to src/common/thirdparty/sfmt/SFMT-params216091.h
diff --git a/src/utility/sfmt/SFMT-params2281.h b/src/common/thirdparty/sfmt/SFMT-params2281.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params2281.h
rename to src/common/thirdparty/sfmt/SFMT-params2281.h
diff --git a/src/utility/sfmt/SFMT-params4253.h b/src/common/thirdparty/sfmt/SFMT-params4253.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params4253.h
rename to src/common/thirdparty/sfmt/SFMT-params4253.h
diff --git a/src/utility/sfmt/SFMT-params44497.h b/src/common/thirdparty/sfmt/SFMT-params44497.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params44497.h
rename to src/common/thirdparty/sfmt/SFMT-params44497.h
diff --git a/src/utility/sfmt/SFMT-params607.h b/src/common/thirdparty/sfmt/SFMT-params607.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params607.h
rename to src/common/thirdparty/sfmt/SFMT-params607.h
diff --git a/src/utility/sfmt/SFMT-params86243.h b/src/common/thirdparty/sfmt/SFMT-params86243.h
similarity index 100%
rename from src/utility/sfmt/SFMT-params86243.h
rename to src/common/thirdparty/sfmt/SFMT-params86243.h
diff --git a/src/utility/sfmt/SFMT-sse2.h b/src/common/thirdparty/sfmt/SFMT-sse2.h
similarity index 100%
rename from src/utility/sfmt/SFMT-sse2.h
rename to src/common/thirdparty/sfmt/SFMT-sse2.h
diff --git a/src/utility/sfmt/SFMT.cpp b/src/common/thirdparty/sfmt/SFMT.cpp
similarity index 99%
rename from src/utility/sfmt/SFMT.cpp
rename to src/common/thirdparty/sfmt/SFMT.cpp
index 7c905990e..ccfd61a29 100644
--- a/src/utility/sfmt/SFMT.cpp
+++ b/src/common/thirdparty/sfmt/SFMT.cpp
@@ -12,7 +12,7 @@
 */
 #include <string.h>
 #include <assert.h>
-#include "SFMT/SFMTObj.h"
+#include "SFMTObj.h"
 #include "SFMT-params.h"
 
 #if defined(__BIG_ENDIAN__) && !defined(__amd64) && !defined(BIG_ENDIAN64)
diff --git a/src/utility/sfmt/SFMT.h b/src/common/thirdparty/sfmt/SFMT.h
similarity index 100%
rename from src/utility/sfmt/SFMT.h
rename to src/common/thirdparty/sfmt/SFMT.h
diff --git a/src/utility/sfmt/SFMTObj.h b/src/common/thirdparty/sfmt/SFMTObj.h
similarity index 100%
rename from src/utility/sfmt/SFMTObj.h
rename to src/common/thirdparty/sfmt/SFMTObj.h