diff --git a/src/add-ons/kernel/file_systems/bfs/cpp.cpp b/src/add-ons/kernel/file_systems/bfs/cpp.cpp
index 47d5ca110b..7278f4b57d 100644
--- a/src/add-ons/kernel/file_systems/bfs/cpp.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/cpp.cpp
@@ -8,9 +8,8 @@
 #include "cpp.h"
 
 
-nothrow_t _dontthrow;
-
-extern "C" void __pure_virtual()
+extern "C" void
+__pure_virtual()
 {
 	//printf("pure virtual function call");
 }
diff --git a/src/add-ons/kernel/file_systems/bfs/cpp.h b/src/add-ons/kernel/file_systems/bfs/cpp.h
index c9fd65fdf3..21c75d9e48 100644
--- a/src/add-ons/kernel/file_systems/bfs/cpp.h
+++ b/src/add-ons/kernel/file_systems/bfs/cpp.h
@@ -22,31 +22,38 @@
 //	- easier to maintain
 
 
-inline void *operator new(size_t size, const nothrow_t&) throw()
+inline void *
+operator new(size_t size, const nothrow_t&) throw()
 {
 	return malloc(size);
 } 
 
-inline void *operator new[](size_t size, const nothrow_t&) throw()
+
+inline void *
+operator new[](size_t size, const nothrow_t&) throw()
 {
 	return malloc(size);
 }
  
-inline void operator delete(void *ptr)
+
+inline void
+operator delete(void *ptr)
 {
 	free(ptr);
 } 
 
-inline void operator delete[](void *ptr)
+
+inline void
+operator delete[](void *ptr)
 {
 	free(ptr);
 }
 
-// now we're using virtuals
+// we're using virtuals
 extern "C" void __pure_virtual();
 
-extern nothrow_t _dontthrow;
-#define new new (_dontthrow)
+// we are only using the nothrow-version of new
+#define new new (nothrow)
 
 
 #endif	/* CPP_H */