diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a46890fac..6d0151c37 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -611,6 +611,7 @@ file( GLOB HEADER_FILES
 	r_data/*.h
 	r_data/models/*.h
 	common/utility/*.h
+	common/engine/*.h
 	common/filesystem/*.h
 	common/thirdparty/*.h
 	common/thirdparty/rapidjson/*.h
@@ -1125,6 +1126,7 @@ set (PCH_SOURCES
 	common/utility/m_argv.cpp
 	common/utility/s_playlist.cpp
 	common/utility/zstrformat.cpp
+	common/utility/name.cpp
 	common/thirdparty/md5.cpp
  	common/thirdparty/superfasthash.cpp
 	common/filesystem/filesystem.cpp
@@ -1151,7 +1153,6 @@ set (PCH_SOURCES
 	utility/sc_man.cpp
 	utility/stats.cpp
 	utility/m_bbox.cpp
-	utility/name.cpp
 	utility/v_collection.cpp
 )
 
@@ -1224,6 +1225,7 @@ include_directories( .
 	common/thirdparty
 	common/filesystem
 	common/utility
+	common/engine
 	g_statusbar
 	console
 	playsim
diff --git a/src/utility/namedef.h b/src/common/engine/namedef.h
similarity index 100%
rename from src/utility/namedef.h
rename to src/common/engine/namedef.h
diff --git a/src/utility/name.cpp b/src/common/utility/name.cpp
similarity index 100%
rename from src/utility/name.cpp
rename to src/common/utility/name.cpp
diff --git a/src/utility/name.h b/src/common/utility/name.h
similarity index 100%
rename from src/utility/name.h
rename to src/common/utility/name.h