diff --git a/headers/private/codec/FormatManager.h b/headers/private/media/FormatManager.h
similarity index 100%
rename from headers/private/codec/FormatManager.h
rename to headers/private/media/FormatManager.h
diff --git a/src/kits/codec/Jamfile b/src/kits/codec/Jamfile
index ddf4814fcb..41451f571d 100644
--- a/src/kits/codec/Jamfile
+++ b/src/kits/codec/Jamfile
@@ -36,11 +36,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			# Internal Functionality
 			ChunkCache.cpp
 			AddOnManager.cpp
-			FormatManager.cpp
 			PluginManager.cpp
 
 			# We need this to do not depend on libmedia
 			# will be removed when libmedia2 is introduced
+			FormatManager.cpp
 			MediaDefs.cpp
 			MediaFormats.cpp
 			RealtimeAlloc.cpp
diff --git a/src/kits/codec/FormatManager.cpp b/src/kits/media/FormatManager.cpp
similarity index 100%
rename from src/kits/codec/FormatManager.cpp
rename to src/kits/media/FormatManager.cpp
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index 40f3207a68..b5bc95de95 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -60,6 +60,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			DataExchange.cpp
 			DefaultMediaTheme.cpp
 			DormantNodeManager.cpp
+			FormatManager.cpp
 			MediaRecorderNode.cpp
 			Notifications.cpp
 			request_data.cpp