diff --git a/headers/os/media/BufferConsumer.h b/headers/os/media/BufferConsumer.h
index 2bbff23361..26a99b92ae 100644
--- a/headers/os/media/BufferConsumer.h
+++ b/headers/os/media/BufferConsumer.h
@@ -14,6 +14,10 @@
 #include <MediaDefs.h>
 #include <MediaNode.h>
 
+namespace BPrivate { namespace media {
+	class BMediaRosterEx;
+}}
+
 class _buffer_id_cache;
 
 class BBufferConsumer :
@@ -187,9 +191,10 @@ virtual		status_t _Reserved_BufferConsumer_13(void *);
 virtual		status_t _Reserved_BufferConsumer_14(void *);
 virtual		status_t _Reserved_BufferConsumer_15(void *);
 
-	friend class BMediaRoster;
 	friend class BMediaNode;
 	friend class BBufferProducer;
+	friend class BMediaRoster;
+	friend class BPrivate::media::BMediaRosterEx;
 
 		media_type fConsumerType;
 		_buffer_id_cache * fBufferCache;
diff --git a/headers/os/media/BufferProducer.h b/headers/os/media/BufferProducer.h
index 7c0fbf0570..172bb9f742 100644
--- a/headers/os/media/BufferProducer.h
+++ b/headers/os/media/BufferProducer.h
@@ -14,6 +14,10 @@
 #include <MediaDefs.h>
 #include <MediaNode.h>
 
+namespace BPrivate { namespace media {
+	class BMediaRosterEx;
+}}
+
 
 class BBufferProducer :
 	public virtual BMediaNode
@@ -189,9 +193,10 @@ virtual	void LatencyChanged(					//	used to be Reserved 1
 
 private:
 
-	friend class BMediaRoster;
 	friend class BBufferConsumer;
 	friend class BMediaNode;
+	friend class BMediaRoster;
+	friend class BPrivate::media::BMediaRosterEx;
 
 		BBufferProducer();	/* private unimplemented */
 		BBufferProducer(