diff --git a/headers/private/media/MediaPlugin.h b/headers/private/media/MediaPlugin.h
index 6112195828..856faa141a 100644
--- a/headers/private/media/MediaPlugin.h
+++ b/headers/private/media/MediaPlugin.h
@@ -1,4 +1,5 @@
-#include <MediaTrack.h>
+#ifndef _MEDIA_PLUGIN_H
+#define _MEDIA_PLUGIN_H
 
 namespace BPrivate { namespace media {
 
@@ -16,3 +17,6 @@ class Reader;
 
 using namespace BPrivate::media;
 
+extern "C" MediaPlugin *instantiate_plugin();
+
+#endif
diff --git a/headers/private/media/ReaderPlugin.h b/headers/private/media/ReaderPlugin.h
index 05a6a7fd3c..38d6b7b254 100644
--- a/headers/private/media/ReaderPlugin.h
+++ b/headers/private/media/ReaderPlugin.h
@@ -1,8 +1,16 @@
+#ifndef _READER_PLUGIN_H
+#define _READER_PLUGIN_H
+
 #include <MediaTrack.h>
 #include "MediaPlugin.h"
 
 namespace BPrivate { namespace media {
 
+enum {
+	B_MEDIA_SEEK_TO_TIME	= 0x10000,
+	B_MEDIA_SEEK_TO_FRAME	= 0x20000
+};
+
 class Reader
 {
 public:
@@ -20,7 +28,7 @@ public:
 									  media_format *format, void **infoBuffer, int32 *infoSize) = 0;
 
 	virtual status_t	Seek(void *cookie,
-							 media_seek_type seekTo,
+							 uint32 seekTo,
 							 int64 *frame, bigtime_t *time) = 0;
 
 	virtual status_t	GetNextChunk(void *cookie,
@@ -30,6 +38,7 @@ public:
 	BDataIO *			Source();
 	
 private:
+public: // XXX for test programs only
 	void		Setup(BDataIO *source);
 
 	BDataIO * fSource;
@@ -42,9 +51,8 @@ public:
 	virtual Reader *NewReader() = 0;
 };
 
-MediaPlugin *instantiate_plugin();
-
 } } // namespace BPrivate::media
 
 using namespace BPrivate::media;
 
+#endif
diff --git a/src/kits/media/ReaderPlugin.cpp b/src/kits/media/ReaderPlugin.cpp
index 6f17aab365..b02e16da2e 100644
--- a/src/kits/media/ReaderPlugin.cpp
+++ b/src/kits/media/ReaderPlugin.cpp
@@ -1,6 +1,7 @@
 #include "ReaderPlugin.h"
 
 Reader::Reader()
+ :	fSource(0)
 {
 }