diff --git a/headers/build/HaikuBuildCompatibility.h b/headers/build/HaikuBuildCompatibility.h
index 3536e0f26a..f574a3ee17 100644
--- a/headers/build/HaikuBuildCompatibility.h
+++ b/headers/build/HaikuBuildCompatibility.h
@@ -36,6 +36,8 @@ extern size_t   strlcpy(char *dest, const char *source, size_t length);
 
 extern char		*strcasestr(const char *string, const char *searchString);
 
+extern float	roundf(float value);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index fde89b3563..d01463c5cf 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -49,22 +49,14 @@
 #include <math.h>
 #include <stdio.h>
 
-// TODO: I have no idea why this is, but the libbe_test target needs this
-#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
-extern "C" float roundf(float x);
-#endif
 
 //#define DEBUG_BVIEW
 #ifdef DEBUG_BVIEW
 #	include <stdio.h>
 #	define STRACE(x) printf x
-#else
-#	define STRACE(x) ;
-#endif
-
-#ifdef DEBUG_BVIEW
 #	define BVTRACE PrintToStream()
 #else
+#	define STRACE(x) ;
 #	define BVTRACE ;
 #endif
 
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index c6b3c6d9b6..665a43392d 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -42,10 +42,6 @@
 #include <stdio.h>
 #include <math.h>
 
-// TODO: I have no idea why this is, but the libbe_test target needs this
-#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
-extern "C" float roundf(float x);
-#endif
 
 //#define DEBUG_WIN
 #ifdef DEBUG_WIN
diff --git a/src/servers/app/drawing/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp
index 755237eb29..2f524a76a1 100644
--- a/src/servers/app/drawing/Painter/Painter.cpp
+++ b/src/servers/app/drawing/Painter/Painter.cpp
@@ -39,11 +39,6 @@
 #include "Painter.h"
 
 
-// TODO: I have no idea why this is, but the libbe_test target needs this
-#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
-extern "C" float roundf(float x);
-#endif
-
 #if ALIASED_DRAWING
 // in this case, we _cannot_ use the outline rasterizer.
 # define USE_OUTLINE_RASTERIZER 0