diff --git a/headers/private/interface/PicturePlayer.h b/headers/private/interface/PicturePlayer.h
index 2da9ce3b57..c3beac6c0c 100644
--- a/headers/private/interface/PicturePlayer.h
+++ b/headers/private/interface/PicturePlayer.h
@@ -85,8 +85,5 @@ private:
 		int32		fSize;
 		BList		*fPictures;
 };
-//------------------------------------------------------------------------------
-
-status_t do_playback(void *, long, BList *, void **, long, void *);
 
 #endif // _TPICTURE_H
diff --git a/src/kits/interface/Picture.cpp b/src/kits/interface/Picture.cpp
index 4edf21d9eb..5a29d6f4c6 100644
--- a/src/kits/interface/Picture.cpp
+++ b/src/kits/interface/Picture.cpp
@@ -241,8 +241,9 @@ BPicture::Play(void **callBackTable, int32 tableEntries, void *user)
 	if (!assert_local_copy())
 		return B_ERROR;
 
-	return do_playback(const_cast<void *>(extent->Data()), extent->Size(),
-			extent->Pictures(), callBackTable, tableEntries, user);
+	PicturePlayer player(extent->Data(), extent->Size(), extent->Pictures());
+
+	return player.Play(callBackTable, tableEntries, user);
 }
 
 
@@ -521,16 +522,6 @@ BPicture::operator=(const BPicture &)
 }
 
 
-status_t
-do_playback(void * data, int32 size, BList* pictures,
-	void **callBackTable, int32 tableEntries, void *user)
-{
-	PicturePlayer player(data, size, pictures);
-
-	return player.Play(callBackTable, tableEntries, user);
-}
-
-
 // _BPictureExtent_
 _BPictureExtent_::_BPictureExtent_(const int32 &size)
 	: