diff --git a/src/add-ons/media/plugins/matroska/Jamfile b/src/add-ons/media/plugins/matroska/Jamfile
index 4df94862b8..700512e07b 100644
--- a/src/add-ons/media/plugins/matroska/Jamfile
+++ b/src/add-ons/media/plugins/matroska/Jamfile
@@ -8,17 +8,10 @@ UsePrivateHeaders media ;
 SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ;
 SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ogg libogg ] ;
 
-local r5_src = strlcpy.c ;
-
-if $(HAIKU_COMPATIBLE) {
-	r5_src = ;
-}
-
 Addon matroska : media plugins :
 	matroska_codecs.cpp
 	matroska_reader.cpp
 	matroska_util.cpp
-	$(r5_src)
 	:
 	false
 	:
@@ -26,19 +19,9 @@ Addon matroska : media plugins :
 #	libmatroska.a
 	libMatroskaParser.a
 	libz.a
-	libmedia.so
+	libmedia.so be $(TARGET_LIBSTDC++)
 ;
 
-if $(HAIKU_COMPATIBLE) {
-	LinkAgainst matroska : libbe.so libroot.so ;
-} else {
-	LinkAgainst matroska : be ;
-}
-
-SEARCH on [ FGristFiles
-                strlcpy.c
-        ] = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ;
-
 # SubInclude HAIKU_TOP src add-ons media plugins matroska libebml ;
 # SubInclude HAIKU_TOP src add-ons media plugins matroska libmatroska ;
 SubInclude HAIKU_TOP src add-ons media plugins matroska libMatroskaParser ;
diff --git a/src/apps/mediaplayer/Jamfile b/src/apps/mediaplayer/Jamfile
index a126281304..0de2f677f7 100644
--- a/src/apps/mediaplayer/Jamfile
+++ b/src/apps/mediaplayer/Jamfile
@@ -18,7 +18,7 @@ Application MediaPlayer :
 	VideoNode.cpp
 	VideoView.cpp
 	VolumeSlider.cpp
-	: be media tracker
+	: be media tracker $(TARGET_LIBSTDC++)
 	: MediaPlayer.rdef
 ;
 
diff --git a/src/apps/soundrecorder/Jamfile b/src/apps/soundrecorder/Jamfile
index 83c06bc845..7575178d38 100644
--- a/src/apps/soundrecorder/Jamfile
+++ b/src/apps/soundrecorder/Jamfile
@@ -17,7 +17,7 @@ Application SoundRecorder :
 	UpDownButton.cpp
 	VUView.cpp
 	VolumeSlider.cpp
-	: be media tracker
+	: be media tracker $(TARGET_LIBSTDC++)
 	: SoundRecorder.rdef
 ;