diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2bca969c8..1231f49ba 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -455,7 +455,6 @@ set(common_SRCS
 	environment.cpp
 	filesys.cpp
 	gettext.cpp
-	guid.cpp
 	inventorymanager.cpp
 	itemdef.cpp
 	light.cpp
diff --git a/src/server/luaentity_sao.h b/src/server/luaentity_sao.h
index 2a46fbc4f..72ae8ffe3 100644
--- a/src/server/luaentity_sao.h
+++ b/src/server/luaentity_sao.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "unit_sao.h"
-#include "guid.h"
+#include "util/guid.h"
 
 class LuaEntitySAO : public UnitSAO
 {
diff --git a/src/serverenvironment.h b/src/serverenvironment.h
index b080e0a9f..5f0b9deaa 100644
--- a/src/serverenvironment.h
+++ b/src/serverenvironment.h
@@ -10,7 +10,7 @@
 #include "activeobject.h"
 #include "environment.h"
 #include "servermap.h"
-#include "guid.h"
+#include "util/guid.h"
 #include "map.h"
 #include "settings.h"
 #include "server/activeobjectmgr.h"
diff --git a/src/unittest/mock_serveractiveobject.h b/src/unittest/mock_serveractiveobject.h
index 613c2c420..01dcc6469 100644
--- a/src/unittest/mock_serveractiveobject.h
+++ b/src/unittest/mock_serveractiveobject.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 // Copyright (C) 2022 Minetest core developers & community
 
-#include "guid.h"
+#include "util/guid.h"
 #include "serverenvironment.h"
 #include <server/serveractiveobject.h>
 #include <string>
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 7d5ac48fb..7fc662571 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -5,6 +5,7 @@ set(util_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/colorize.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/enriched_string.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/guid.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/hashing.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/ieee_float.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/metricsbackend.cpp
diff --git a/src/guid.cpp b/src/util/guid.cpp
similarity index 100%
rename from src/guid.cpp
rename to src/util/guid.cpp
diff --git a/src/guid.h b/src/util/guid.h
similarity index 100%
rename from src/guid.h
rename to src/util/guid.h