diff --git a/headers/private/shared/Uuid.h b/headers/private/support/Uuid.h
similarity index 100%
rename from headers/private/shared/Uuid.h
rename to headers/private/support/Uuid.h
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index d4aca5381d..2459568ac7 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -33,7 +33,6 @@ StaticLibrary libshared.a :
 	ShakeTrackingFilter.cpp
 	StringForRate.cpp
 	StringForSize.cpp
-	Uuid.cpp
 	Variant.cpp
 ;
 
diff --git a/src/kits/support/Jamfile b/src/kits/support/Jamfile
index 40ecc11806..80b74f3fc9 100644
--- a/src/kits/support/Jamfile
+++ b/src/kits/support/Jamfile
@@ -23,6 +23,7 @@ MergeObject <libbe>support_kit.o :
 	String.cpp
 	StringList.cpp
 	Url.cpp
+	Uuid.cpp
 ;
 
 StaticLibrary libreferenceable.a : : [ FGristFiles Referenceable.o ] ;
diff --git a/src/kits/shared/Uuid.cpp b/src/kits/support/Uuid.cpp
similarity index 100%
rename from src/kits/shared/Uuid.cpp
rename to src/kits/support/Uuid.cpp