diff --git a/headers/private/media/Encoder.h b/headers/private/media/Encoder.h
deleted file mode 100644
index d4468ab29d..0000000000
--- a/headers/private/media/Encoder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-// this header is similar to functions found in libmedia.so 
-// and the media_kit encoder add-ons
-// we will use it as basic information, but are not trying to
-// create a binary compatible interface
-// this API will totally change, as we are creating our own API
-
-namespace media_kit_private {
-
-class Encoder
-{
-public:
-	virtual ~Encoder(void); /* this needs to be virtual */
-	Encoder(void);
-
-	/* not sure if all these need to be virtual */
-	virtual status_t Flush(void);
-	virtual status_t StartEncoder(void);
-	virtual status_t SetEncodeParameters(encode_parameters *);
-	virtual status_t GetEncodeParameters(encode_parameters *) const;
-	virtual status_t GetParameterView(void);
-	virtual status_t SetParameterValue(long, void const *, unsigned long);
-	virtual status_t GetParameterValue(long, void *, unsigned long *);
-	virtual status_t WriteChunk(void const *, unsigned long, media_encode_info *);
-	virtual status_t AddTrackInfo(unsigned long, char const *, unsigned long);
-	virtual status_t AddCopyright(char const *);
-	virtual status_t Web(void);
-	virtual status_t AttachedToTrack(void);
-	virtual status_t SetTrack(BMediaTrack *);
-	
-	virtual status_t GetCodecInfo(media_codec_info *) const = 0;
-	virtual status_t Encode(void const *, long long, media_encode_info *) = 0;
-	virtual status_t SetFormat(media_file_format *, media_format *, media_format *) = 0;
-
-private:
-	virtual status_t Perform(long, void *);
-	//virtual function and data stuffing will be done later
-};
-
-}; // namespace media_kit_private
-
-extern "C" status_t register_encoder();
-extern "C" BPrivate::Encoder *instantiate_nth_encoder();
-extern "C" BPrivate::Encoder *instantiate_encoder();
diff --git a/headers/private/media/Writer.h b/headers/private/media/Writer.h
deleted file mode 100644
index 1ed3363bb3..0000000000
--- a/headers/private/media/Writer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// this header is similar to functions found in libmedia.so 
-// and the media_kit writer add-ons
-// we will use it as basic information, but are not trying to
-// create a binary compatible interface
-// this API will totally change, as we are creating our own API
-
-
-namespace media_kit_private {
-
-class Writer
-{
-public:
-	Writer(void)
-	virtual ~Writer(void);
-	virtual status_t SetWriteBufferSize(unsigned long);
-
-	virtual status_t SetSource(BDataIO *) = 0;
-	virtual status_t AddTrack(BMediaTrack *) = 0;
-	virtual status_t CommitHeader(void) = 0;
-	virtual status_t WriteData(long, media_type, void const *, unsigned long, media_encode_info *) = 0;
-	virtual status_t CloseFile(void) = 0;
-	virtual status_t AddTrackInfo(long, unsigned long, char const *, unsigned long) = 0;
-	virtual status_t AddCopyright(char const *) = 0;
-	virtual status_t AddChunk(long, char const *, unsigned long) = 0;
-
-private:
-	virtual status_t Perform(long, void *);
-	//virtual function and data stuffing will be done later
-};
-
-}; // namespace media_kit_private
-
-extern "C" {
-	status_t accepts_format();
-	status_t get_mediawriter_info();
-	status_t instantiate_mediawriter();                  
-};