diff --git a/headers/os/codec/DecoderPlugin.h b/headers/os/codec/DecoderPlugin.h
index 1f09a6caf3..8d9267170a 100644
--- a/headers/os/codec/DecoderPlugin.h
+++ b/headers/os/codec/DecoderPlugin.h
@@ -4,6 +4,7 @@
 
 #include <MediaTrack.h>
 #include <MediaFormats.h>
+
 #include "MediaPlugin.h"
 
 
@@ -52,9 +53,10 @@ public:
 private:
 			ChunkProvider*		fChunkProvider;
 
+			MediaPlugin*		fMediaPlugin;
+
 	// needed for plug-in reference count management
 	friend class PluginManager;
-			MediaPlugin*		fMediaPlugin;
 
 	virtual void				_ReservedDecoder1();
 	virtual void				_ReservedDecoder2();
diff --git a/headers/os/codec/EncoderPlugin.h b/headers/os/codec/EncoderPlugin.h
index 8500fa5748..3021f3130d 100644
--- a/headers/os/codec/EncoderPlugin.h
+++ b/headers/os/codec/EncoderPlugin.h
@@ -9,6 +9,7 @@
 #include <MediaTrack.h>
 #include <MediaFormats.h>
 #include <View.h>
+
 #include "MediaPlugin.h"
 
 
@@ -84,9 +85,10 @@ public:
 private:
 			ChunkWriter*		fChunkWriter;
 
+			MediaPlugin*		fMediaPlugin;
+
 	// needed for plug-in reference count management
 	friend class PluginManager;
-			MediaPlugin*		fMediaPlugin;
 
 	virtual void				_ReservedEncoder1();
 	virtual void				_ReservedEncoder2();
diff --git a/headers/os/codec/MediaPlugin.h b/headers/os/codec/MediaPlugin.h
index 9eee20d7dd..7aadd0369f 100644
--- a/headers/os/codec/MediaPlugin.h
+++ b/headers/os/codec/MediaPlugin.h
@@ -15,11 +15,11 @@ public:
 	virtual						~MediaPlugin();
 
 private:
+			int32				fRefCount;
+
 	// needed for plug-in reference count management
 	friend class PluginManager;
 
-			int32				fRefCount;
-
 	virtual void				_ReservedMediaPlugin1();
 	virtual void				_ReservedMediaPlugin2();
 
diff --git a/headers/os/codec/ReaderPlugin.h b/headers/os/codec/ReaderPlugin.h
index 92d02e61af..293c3de1e0 100644
--- a/headers/os/codec/ReaderPlugin.h
+++ b/headers/os/codec/ReaderPlugin.h
@@ -3,6 +3,7 @@
 
 
 #include <MediaTrack.h>
+
 #include "MediaPlugin.h"
 
 
@@ -54,13 +55,14 @@ public:
 	virtual status_t			Perform(perform_code code, void* data);
 
 private:
-			void				Setup(BDataIO* source);
+			void				_Setup(BDataIO* source);
 
 			BDataIO*			fSource;
 
+			MediaPlugin*		fMediaPlugin;
+
 	// needed for plug-in reference count management
 	friend class PluginManager;
-			MediaPlugin*		fMediaPlugin;
 
 	virtual void				_ReservedReader1();
 	virtual void				_ReservedReader2();
diff --git a/headers/os/codec/StreamerPlugin.h b/headers/os/codec/StreamerPlugin.h
index 27bf2b8381..2c951b382a 100644
--- a/headers/os/codec/StreamerPlugin.h
+++ b/headers/os/codec/StreamerPlugin.h
@@ -22,10 +22,10 @@ public:
 	virtual status_t			Sniff(const BUrl& url, BDataIO** source) = 0;
 
 private:
-	friend class PluginManager;
-
 			MediaPlugin*		fMediaPlugin;
 
+	friend class PluginManager;
+
 	virtual void				_ReservedStreamer1();
 	virtual void				_ReservedStreamer2();
 	virtual void				_ReservedStreamer3();
diff --git a/headers/os/codec/WriterPlugin.h b/headers/os/codec/WriterPlugin.h
index 63e028831e..3b8457a433 100644
--- a/headers/os/codec/WriterPlugin.h
+++ b/headers/os/codec/WriterPlugin.h
@@ -2,6 +2,7 @@
 #define _WRITER_PLUGIN_H
 
 #include <MediaTrack.h>
+
 #include "MediaPlugin.h"
 
 namespace BPrivate { namespace media {
@@ -41,13 +42,14 @@ public:
 	virtual status_t			Perform(perform_code code, void* data);
 
 private:
-			void				Setup(BDataIO* target);
+			void				_Setup(BDataIO* target);
 
 			BDataIO*			fTarget;
 
+			MediaPlugin*		fMediaPlugin;
+
 	// needed for plug-in reference count management
 	friend class PluginManager;
-			MediaPlugin*		fMediaPlugin;
 
 	virtual void				_ReservedWriter1();
 	virtual void				_ReservedWriter2();
diff --git a/src/kits/codec/PluginManager.cpp b/src/kits/codec/PluginManager.cpp
index a6828eefae..465e0690f8 100644
--- a/src/kits/codec/PluginManager.cpp
+++ b/src/kits/codec/PluginManager.cpp
@@ -276,7 +276,7 @@ PluginManager::CreateReader(Reader** reader, int32* streamCount,
 		}
 
 		buffered_source->Seek(0, SEEK_SET);
-		(*reader)->Setup(buffered_source);
+		(*reader)->_Setup(buffered_source);
 		(*reader)->fMediaPlugin = plugin;
 
 		if ((*reader)->Sniff(streamCount) == B_OK) {
@@ -466,7 +466,7 @@ PluginManager::CreateWriter(Writer** writer, const media_file_format& mff,
 		return B_ERROR;
 	}
 
-	(*writer)->Setup(target);
+	(*writer)->_Setup(target);
 	(*writer)->fMediaPlugin = plugin;
 
 	TRACE("PluginManager::CreateWriter leave\n");
diff --git a/src/kits/codec/ReaderPlugin.cpp b/src/kits/codec/ReaderPlugin.cpp
index d4799ea6f6..7f48cfcda8 100644
--- a/src/kits/codec/ReaderPlugin.cpp
+++ b/src/kits/codec/ReaderPlugin.cpp
@@ -61,7 +61,7 @@ Reader::Source() const
 
 
 void
-Reader::Setup(BDataIO *source)
+Reader::_Setup(BDataIO *source)
 {
 	fSource = source;
 }
diff --git a/src/kits/codec/WriterPlugin.cpp b/src/kits/codec/WriterPlugin.cpp
index 5455384666..fc2d127c75 100644
--- a/src/kits/codec/WriterPlugin.cpp
+++ b/src/kits/codec/WriterPlugin.cpp
@@ -31,7 +31,7 @@ Writer::Target() const
 
 
 void
-Writer::Setup(BDataIO* target)
+Writer::_Setup(BDataIO* target)
 {
 	fTarget = target;
 }