diff --git a/headers/os/codec/DecoderPlugin.h b/headers/os/codec/DecoderPlugin.h
index 5d1f83face..8981c24376 100644
--- a/headers/os/codec/DecoderPlugin.h
+++ b/headers/os/codec/DecoderPlugin.h
@@ -1,6 +1,7 @@
 #ifndef _DECODER_PLUGIN_H
 #define _DECODER_PLUGIN_H
 
+
 #include <MediaTrack.h>
 #include <MediaFormats.h>
 #include "MediaPlugin.h"
@@ -48,18 +49,18 @@ public:
 	virtual status_t			Perform(perform_code code, void* data);
 
 private:
-	virtual void				_ReservedDecoder1();
-	virtual void				_ReservedDecoder2();
-	virtual void				_ReservedDecoder3();
-	virtual void				_ReservedDecoder4();
-	virtual void				_ReservedDecoder5();
-
 			ChunkProvider*		fChunkProvider;
 
 	// needed for plug-in reference count management
 	friend class PluginManager;
 			MediaPlugin*		fMediaPlugin;
 
+	virtual void				_ReservedDecoder1();
+	virtual void				_ReservedDecoder2();
+	virtual void				_ReservedDecoder3();
+	virtual void				_ReservedDecoder4();
+	virtual void				_ReservedDecoder5();
+
 			uint32				fReserved[5];
 };
 
diff --git a/headers/os/codec/EncoderPlugin.h b/headers/os/codec/EncoderPlugin.h
index 8aa655a33d..8500fa5748 100644
--- a/headers/os/codec/EncoderPlugin.h
+++ b/headers/os/codec/EncoderPlugin.h
@@ -88,10 +88,6 @@ private:
 	friend class PluginManager;
 			MediaPlugin*		fMediaPlugin;
 
-private:
-	// FBC padding
-			uint32				fReserved[20];
-
 	virtual void				_ReservedEncoder1();
 	virtual void				_ReservedEncoder2();
 	virtual void				_ReservedEncoder3();
@@ -112,6 +108,9 @@ private:
 	virtual void				_ReservedEncoder18();
 	virtual void				_ReservedEncoder19();
 	virtual void				_ReservedEncoder20();
+
+	// FBC padding
+			uint32				fReserved[20];
 };
 
 
diff --git a/headers/os/codec/MediaExtractor.h b/headers/os/codec/MediaExtractor.h
index eeefca70bb..5612f4251b 100644
--- a/headers/os/codec/MediaExtractor.h
+++ b/headers/os/codec/MediaExtractor.h
@@ -74,7 +74,6 @@ public:
 
 			void				StopProcessing();
 
-
 private:
 			void				_Init(BDataIO* source, int32 flags);
 
@@ -82,7 +81,6 @@ private:
 	static	int32				_ExtractorEntry(void* arg);
 			void				_ExtractorThread();
 
-private:
 			status_t			fInitStatus;
 
 			sem_id				fExtractorWaitSem;
diff --git a/headers/os/codec/MediaWriter.h b/headers/os/codec/MediaWriter.h
index ce5e05fd7c..a4fe3f725e 100644
--- a/headers/os/codec/MediaWriter.h
+++ b/headers/os/codec/MediaWriter.h
@@ -51,7 +51,6 @@ private:
 				void*			cookie;
 			};
 
-private:
 			BDataIO*			fTarget;
 			Writer*				fWriter;
 
diff --git a/headers/os/codec/ReaderPlugin.h b/headers/os/codec/ReaderPlugin.h
index 9991ef7135..92d02e61af 100644
--- a/headers/os/codec/ReaderPlugin.h
+++ b/headers/os/codec/ReaderPlugin.h
@@ -1,9 +1,11 @@
 #ifndef _READER_PLUGIN_H
 #define _READER_PLUGIN_H
 
+
 #include <MediaTrack.h>
 #include "MediaPlugin.h"
 
+
 namespace BPrivate { namespace media {
 
 class PluginManager;
@@ -13,6 +15,7 @@ enum {
 	B_MEDIA_SEEK_TO_FRAME	= 0x20000
 };
 
+
 class Reader {
 public:
 								Reader();
@@ -51,12 +54,6 @@ public:
 	virtual status_t			Perform(perform_code code, void* data);
 
 private:
-	virtual void				_ReservedReader1();
-	virtual void				_ReservedReader2();
-	virtual void				_ReservedReader3();
-	virtual void				_ReservedReader4();
-	virtual void				_ReservedReader5();
-
 			void				Setup(BDataIO* source);
 
 			BDataIO*			fSource;
@@ -65,6 +62,12 @@ private:
 	friend class PluginManager;
 			MediaPlugin*		fMediaPlugin;
 
+	virtual void				_ReservedReader1();
+	virtual void				_ReservedReader2();
+	virtual void				_ReservedReader3();
+	virtual void				_ReservedReader4();
+	virtual void				_ReservedReader5();
+
 			uint32				fReserved[5];
 };
 
diff --git a/headers/os/codec/StreamerPlugin.h b/headers/os/codec/StreamerPlugin.h
index e16b3ee275..27bf2b8381 100644
--- a/headers/os/codec/StreamerPlugin.h
+++ b/headers/os/codec/StreamerPlugin.h
@@ -13,23 +13,26 @@ namespace BPrivate { namespace media {
 
 class PluginManager;
 
+
 class Streamer {
 public:
 								Streamer();
 	virtual						~Streamer();
 
 	virtual status_t			Sniff(const BUrl& url, BDataIO** source) = 0;
+
 private:
+	friend class PluginManager;
+
+			MediaPlugin*		fMediaPlugin;
+
 	virtual void				_ReservedStreamer1();
 	virtual void				_ReservedStreamer2();
 	virtual void				_ReservedStreamer3();
 	virtual void				_ReservedStreamer4();
 	virtual void				_ReservedStreamer5();
 
-			MediaPlugin*		fMediaPlugin;
 			uint32				fReserved[5];
-
-	friend class PluginManager;
 };
 
 
diff --git a/headers/os/codec/WriterPlugin.h b/headers/os/codec/WriterPlugin.h
index 3112d19cf8..63e028831e 100644
--- a/headers/os/codec/WriterPlugin.h
+++ b/headers/os/codec/WriterPlugin.h
@@ -41,12 +41,6 @@ public:
 	virtual status_t			Perform(perform_code code, void* data);
 
 private:
-	virtual void				_ReservedWriter1();
-	virtual void				_ReservedWriter2();
-	virtual void				_ReservedWriter3();
-	virtual void				_ReservedWriter4();
-	virtual void				_ReservedWriter5();
-
 			void				Setup(BDataIO* target);
 
 			BDataIO*			fTarget;
@@ -55,6 +49,12 @@ private:
 	friend class PluginManager;
 			MediaPlugin*		fMediaPlugin;
 
+	virtual void				_ReservedWriter1();
+	virtual void				_ReservedWriter2();
+	virtual void				_ReservedWriter3();
+	virtual void				_ReservedWriter4();
+	virtual void				_ReservedWriter5();
+
 			uint32				fReserved[5];
 };