diff --git a/headers/os/media/MediaNode.h b/headers/os/media/MediaNode.h
index b67b26af13..e5b18b2740 100644
--- a/headers/os/media/MediaNode.h
+++ b/headers/os/media/MediaNode.h
@@ -111,7 +111,11 @@ struct media_node_attribute
 };
 
 
-namespace BPrivate { namespace media { class TimeSourceObject; class SystemTimeSourceObject; } }
+namespace BPrivate { namespace media {
+	class TimeSourceObject;
+	class SystemTimeSourceObject;
+	class BMediaRosterEx;
+} } // BPrivate::media
 
 
 class BMediaNode
@@ -250,13 +254,11 @@ virtual	status_t RequestCompleted(	/* reserved 0 */
 
 private:
 	friend class BTimeSource;
-	friend class _BTimeSourceP;
 	friend class BMediaRoster;
-	friend class _BMediaRosterP;
-	friend class MNodeManager;
 	friend class BBufferProducer;	//	for getting _mNodeID
 	friend class BPrivate::media::TimeSourceObject;
 	friend class BPrivate::media::SystemTimeSourceObject;
+	friend class BPrivate::media::BMediaRosterEx;
 
 		// Deprecated in 4.1
 		int32 IncrementChangeTag();
diff --git a/headers/os/media/MediaRoster.h b/headers/os/media/MediaRoster.h
index d88932538d..817a5cc708 100644
--- a/headers/os/media/MediaRoster.h
+++ b/headers/os/media/MediaRoster.h
@@ -20,6 +20,11 @@ class BMimeType;
 struct dormant_flavor_info;
 class BMediaAddOn;
 
+namespace BPrivate { namespace media {
+	class DefaultDeleter;
+	class BMediaRosterEx;
+} } // BPrivate::media
+
 class BMediaRoster : public BLooper
 {
 public:
@@ -384,14 +389,8 @@ virtual		status_t _Reserved_MediaRoster_5(void *);
 virtual		status_t _Reserved_MediaRoster_6(void *);
 virtual		status_t _Reserved_MediaRoster_7(void *);
 
-friend class _DefaultDeleter;
-friend class _BMediaRosterP;
-friend class _HostApp;
-friend class MLatentManager;
-friend class BBufferProducer;
-friend class media_node;
-friend class BBuffer;
-friend class BMediaNode;
+friend class BPrivate::media::DefaultDeleter;
+friend class BPrivate::media::BMediaRosterEx;
 
 static	bool _isMediaServer;