diff --git a/headers/os/codec/MediaExtractor.h b/headers/os/codec/MediaExtractor.h
index fe9c5621b5..38360c091a 100644
--- a/headers/os/codec/MediaExtractor.h
+++ b/headers/os/codec/MediaExtractor.h
@@ -36,6 +36,8 @@ public:
 									media_file_format* fileFormat) const;
 
 			status_t			GetMetaData(BMetaData* data) const;
+			status_t			GetStreamMetaData(int32 stream,
+									BMetaData* data) const;
 
 			int32				CountStreams();
 
@@ -56,9 +58,8 @@ public:
 			status_t			CreateDecoder(int32 stream, Decoder** _decoder,
 									media_codec_info* codecInfo);
 
-			status_t			GetStreamMetaData(int32 stream,
-									BMetaData* data) const;
-
+			// TODO: Explore if would be better to add a Start/Stop
+			// methods pair to MediaExtractor.
 			void				StopProcessing();
 
 private:
diff --git a/headers/os/codec/MediaPlugin.h b/headers/os/codec/MediaPlugin.h
index 7aadd0369f..9d5d000d3b 100644
--- a/headers/os/codec/MediaPlugin.h
+++ b/headers/os/codec/MediaPlugin.h
@@ -9,6 +9,11 @@
 
 namespace BPrivate { namespace media {
 
+
+// TODO: Shouldn't this be a BReferenceable?
+// TODO: This will replace BMediaAddOn in media2,
+// see if we need some more accessor method and
+// add the needed padding.
 class MediaPlugin {
 public:
 								MediaPlugin();
diff --git a/headers/os/codec/MediaWriter.h b/headers/os/codec/MediaWriter.h
index 2b7e5ad7fb..30f9be51dd 100644
--- a/headers/os/codec/MediaWriter.h
+++ b/headers/os/codec/MediaWriter.h
@@ -32,7 +32,6 @@ public:
 									const media_codec_info* codecInfo,
 									media_format* format, uint32 flags = 0);
 
-			// TODO: One of those is probably misplaced here.
 			// TODO: Why pointers? Just copy it
 			status_t			SetMetaData(BMetaData* data);
 			status_t			SetMetaData(int32 streamIndex,
diff --git a/headers/os/codec/ReaderPlugin.h b/headers/os/codec/ReaderPlugin.h
index 5747179626..6eaa324f05 100644
--- a/headers/os/codec/ReaderPlugin.h
+++ b/headers/os/codec/ReaderPlugin.h
@@ -23,7 +23,10 @@ public:
 	virtual	status_t			Sniff(int32* streamCount) = 0;
 
 	virtual	void				GetFileFormatInfo(media_file_format* mff) = 0;
+
 	virtual	status_t			GetMetaData(BMetaData* data);
+	virtual	status_t			GetStreamMetaData(void* cookie,
+									BMetaData* data);
 
 	virtual	status_t			AllocateCookie(int32 streamNumber,
 									void** cookie) = 0;
@@ -43,9 +46,6 @@ public:
 									const void** chunkBuffer, size_t* chunkSize,
 									media_header* mediaHeader) = 0;
 
-	virtual	status_t			GetStreamMetaData(void* cookie,
-									BMetaData* data);
-
 			BDataIO*			Source() const;
 
 	virtual status_t			Perform(perform_code code, void* data);