diff --git a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp
index 40a3f46df5..d81966ebb4 100644
--- a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp
+++ b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.cpp
@@ -40,14 +40,14 @@ HTTPStreamer::Sniff(const BUrl& url, BDataIO** source)
 }
 
 
-Streamer*
+BStreamer*
 HTTPStreamerPlugin::NewStreamer()
 {
 	return new HTTPStreamer();
 }
 
 
-MediaPlugin *instantiate_plugin()
+BMediaPlugin *instantiate_plugin()
 {
 	return new HTTPStreamerPlugin();
 }
diff --git a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h
index e044ec4692..63f4ba919e 100644
--- a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h
+++ b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h
@@ -6,9 +6,10 @@
 #define _HTTP_STREAMER_PLUGIN_H
 
 
-#include "StreamerPlugin.h"
+#include <Streamer.h>
 
-class HTTPStreamer : public Streamer
+
+class HTTPStreamer : public BStreamer
 {
 public:
 								HTTPStreamer();
@@ -18,10 +19,10 @@ public:
 };
 
 
-class HTTPStreamerPlugin : public StreamerPlugin
+class HTTPStreamerPlugin : public BStreamerPlugin
 {
 public:
-	virtual	Streamer*			NewStreamer();
+	virtual	BStreamer*			NewStreamer();
 };
 
 #endif // _HTTP_STREAMER_PLUGIN_H
diff --git a/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp b/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp
index d60c1fc86b..c129861255 100644
--- a/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp
+++ b/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.cpp
@@ -520,7 +520,7 @@ RawDecoder::Decode(void *buffer, int64 *frameCount,
 }
 
 
-Decoder *
+BDecoder *
 RawDecoderPlugin::NewDecoder(uint index)
 {
 	return new RawDecoder;
@@ -565,7 +565,7 @@ RawDecoderPlugin::GetSupportedFormats(media_format ** formats, size_t * count)
 	return B_OK;
 }
 
-MediaPlugin *instantiate_plugin()
+BMediaPlugin *instantiate_plugin()
 {
 	return new RawDecoderPlugin;
 }
diff --git a/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.h b/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.h
index 4b02002eb6..63d6de690d 100644
--- a/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.h
+++ b/src/add-ons/media/plugins/raw_decoder/RawDecoderPlugin.h
@@ -25,9 +25,10 @@
 #ifndef _RAW_DECODER_PLUGIN_H
 #define _RAW_DECODER_PLUGIN_H
 
-#include "DecoderPlugin.h"
+#include <Decoder.h>
 
-class RawDecoder : public Decoder
+
+class RawDecoder : public BDecoder
 {
 public:
 	void		GetCodecInfo(media_codec_info *info);