diff --git a/headers/private/media/DecoderPlugin.h b/headers/private/media/DecoderPlugin.h
index b6e3373a3c..5d1f83face 100644
--- a/headers/private/media/DecoderPlugin.h
+++ b/headers/private/media/DecoderPlugin.h
@@ -5,7 +5,6 @@
 #include <MediaFormats.h>
 #include "MediaPlugin.h"
 
-class AddOnManager;
 
 namespace BPrivate { namespace media {
 
diff --git a/src/kits/media/AddOnManager.cpp b/src/kits/media/AddOnManager.cpp
index 5908100192..5f64abca5c 100644
--- a/src/kits/media/AddOnManager.cpp
+++ b/src/kits/media/AddOnManager.cpp
@@ -29,6 +29,10 @@
 #include "MetaFormat.h"
 
 
+namespace BPrivate {
+namespace media {
+
+
 //	#pragma mark - ImageLoader
 
 /*!	The ImageLoader class is a convenience class to temporarily load
@@ -556,3 +560,7 @@ AddOnManager::_GetReaders(const BPath& path, entry_ref* outRefs,
 		(*outCount)++;
 	}
 }
+
+
+} // namespace media
+} // namespace BPrivate
diff --git a/src/kits/media/AddOnManager.h b/src/kits/media/AddOnManager.h
index 32154d284b..964cdcefbc 100644
--- a/src/kits/media/AddOnManager.h
+++ b/src/kits/media/AddOnManager.h
@@ -25,6 +25,9 @@
 #include "WriterPlugin.h"
 
 
+namespace BPrivate {
+namespace media {
+
 class AddOnManager {
 public:
 								AddOnManager();
@@ -109,4 +112,7 @@ private:
 			static AddOnManager	sInstance;
 };
 
+} // namespace media
+} // namespace BPrivate
+
 #endif // _ADD_ON_MANAGER_H