diff --git a/src/modules/sound/lullaby/MP3Decoder.cpp b/src/modules/sound/lullaby/MP3Decoder.cpp
index 979c9cd6e..4c73da29c 100644
--- a/src/modules/sound/lullaby/MP3Decoder.cpp
+++ b/src/modules/sound/lullaby/MP3Decoder.cpp
@@ -30,37 +30,6 @@ namespace sound
 namespace lullaby
 {
 
-static size_t onRead(void *pUserData, void *pBufferOut, size_t bytesToRead)
-{
-	auto decoder = (MP3Decoder *) pUserData;
-	int64 read = decoder->stream->read(pBufferOut, bytesToRead);
-	return std::max<int64>(0, read);
-}
-
-static drmp3_bool32 onSeek(void *pUserData, int offset, drmp3_seek_origin origin)
-{
-	auto decoder = (MP3Decoder *) pUserData;
-	int64 pos = decoder->offset;
-
-	// Due to possible offsets, we have to calculate the position ourself.
-	switch (origin)
-	{
-	case drmp3_seek_origin_start:
-		pos += offset;
-		break;
-	case drmp3_seek_origin_current:
-		pos = decoder->stream->tell() + offset;
-		break;
-	default:
-		return false;
-	}
-
-	if (pos < decoder->offset)
-		return false;
-
-	return decoder->stream->seek(pos, Stream::SEEKORIGIN_BEGIN) ? DRMP3_TRUE : DRMP3_FALSE;
-}
-
 // Copied from dr_mp3 function drmp3_hdr_valid()
 static bool isMP3HeaderValid(const uint8 *h)
 {
@@ -135,6 +104,37 @@ static int64 findFirstValidHeader(Stream* stream)
 	return -1;
 }
 
+size_t MP3Decoder::onRead(void *pUserData, void *pBufferOut, size_t bytesToRead)
+{
+	auto decoder = (MP3Decoder *) pUserData;
+	int64 read = decoder->stream->read(pBufferOut, bytesToRead);
+	return std::max<int64>(0, read);
+}
+
+drmp3_bool32 MP3Decoder::onSeek(void *pUserData, int offset, drmp3_seek_origin origin)
+{
+	auto decoder = (MP3Decoder *) pUserData;
+	int64 pos = decoder->offset;
+
+	// Due to possible offsets, we have to calculate the position ourself.
+	switch (origin)
+	{
+	case drmp3_seek_origin_start:
+		pos += offset;
+		break;
+	case drmp3_seek_origin_current:
+		pos = decoder->stream->tell() + offset;
+		break;
+	default:
+		return false;
+	}
+
+	if (pos < decoder->offset)
+		return false;
+
+	return decoder->stream->seek(pos, Stream::SEEKORIGIN_BEGIN) ? DRMP3_TRUE : DRMP3_FALSE;
+}
+
 MP3Decoder::MP3Decoder(Stream *stream, int bufferSize)
 : Decoder(stream, bufferSize)
 {
diff --git a/src/modules/sound/lullaby/MP3Decoder.h b/src/modules/sound/lullaby/MP3Decoder.h
index bd1116b15..84c9444e6 100644
--- a/src/modules/sound/lullaby/MP3Decoder.h
+++ b/src/modules/sound/lullaby/MP3Decoder.h
@@ -54,8 +54,8 @@ public:
 	double getDuration() override;
 
 private:
-	friend size_t onRead(void *pUserData, void *pBufferOut, size_t bytesToRead);
-	friend drmp3_bool32 onSeek(void *pUserData, int offset, drmp3_seek_origin origin);
+	static size_t onRead(void *pUserData, void *pBufferOut, size_t bytesToRead);
+	static drmp3_bool32 onSeek(void *pUserData, int offset, drmp3_seek_origin origin);
 
 	// MP3 handle
 	drmp3 mp3;