diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index ca75b693d5..0438570c3d 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -1377,7 +1377,7 @@ if $(HAIKU_NO_WERROR) != 1 {
 	EnableWerror src kits interface ;
 	EnableWerror src kits locale ;
 	EnableWerror src kits mail ;
-#	EnableWerror src kits media ; # gcc2
+	EnableWerror src kits media ;
 	EnableWerror src kits midi ;
 	EnableWerror src kits midi2 ;
 	EnableWerror src kits network ;
diff --git a/src/kits/media/OldBufferStream.cpp b/src/kits/media/OldBufferStream.cpp
index 116393da91..248e595dd9 100644
--- a/src/kits/media/OldBufferStream.cpp
+++ b/src/kits/media/OldBufferStream.cpp
@@ -19,13 +19,6 @@
 /*************************************************************
  * public BAbstractBufferStream
  *************************************************************/
-#if __GNUC__ > 3
-BAbstractBufferStream::~BAbstractBufferStream()
-{
-}
-#endif
-
-
 status_t
 BAbstractBufferStream::GetStreamParameters(size_t *bufferSize,
 										   int32 *bufferCount,
@@ -186,7 +179,10 @@ void *
 BBufferStream::operator new(size_t size)
 {
 	UNIMPLEMENTED();
-	return NULL;
+
+	void *dummy = NULL;
+		// just to circumvent a warning that operator new should not return NULL
+	return dummy;
 }