diff --git a/headers/private/shared/FunctionTracer.h b/headers/private/shared/FunctionTracer.h
index e8d26930c6..f375c65f4f 100644
--- a/headers/private/shared/FunctionTracer.h
+++ b/headers/private/shared/FunctionTracer.h
@@ -1,33 +1,40 @@
 /*
- * Copyright © 2008 Stephan Aßmus <superstippi@gmx.de>
- * All rights reserved. Distributed under the terms of the MIT/X11 license.
+ * Copyright 2008 Stephan Aßmus <superstippi@gmx.de>
+ * Distributed under the terms of the MIT/X11 license.
  */
 #ifndef FUNCTION_TRACER_H
 #define FUNCTION_TRACER_H
 
+
 #include <stdio.h>
 
 #include <String.h>
 
+
 namespace BPrivate {
 
 class FunctionTracer {
 public:
-	FunctionTracer(const char* functionName, int32& depth)
+	typedef int (*PrintFunction)(const char * fmt, ...);
+
+	FunctionTracer(PrintFunction printFunction, const void* pointer, const char* functionName,
+		int32& depth)
 		: fFunctionName(functionName),
 		  fPrepend(),
-		  fFunctionDepth(depth)
+		  fFunctionDepth(depth),
+		  fPrintFunction(printFunction)
 	{
 		fFunctionDepth++;
+		if (pointer != NULL)
+			fPrepend.SetToFormat("%p ->", pointer);
 		fPrepend.Append(' ', fFunctionDepth * 2);
 
-		printf("%s%s {\n", fPrepend.String(), fFunctionName.String());
+		fPrintFunction("%s%s {\n", fPrepend.String(), fFunctionName.String());
 	}
 
 	 ~FunctionTracer()
 	{
-//		printf("%s - leave\n", fFunctionName.String());
-		printf("%s}\n", fPrepend.String());
+		fPrintFunction("%s}\n", fPrepend.String());
 		fFunctionDepth--;
 	}
 
@@ -35,6 +42,12 @@ private:
 	BString	fFunctionName;
 	BString	fPrepend;
 	int32&	fFunctionDepth;
+#if __GNUC__ < 3
+	// gcc2 doesn't support function attributes on function pointers
+	PrintFunction fPrintFunction;
+#else
+	PrintFunction _PRINTFLIKE(1, 2) fPrintFunction;
+#endif
 };
 
 }	// namespace BPrivate
diff --git a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
index 9e07aa423b..2b6ae6bf60 100644
--- a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
+++ b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
@@ -50,7 +50,7 @@ using std::nothrow;
 #ifdef TRACE_OSS_NODE
 static int32 sDepth;
 #	define TRACE(x...)		printf(x)
-#	define CALLED(x...)		FunctionTracer _ft(__PRETTY_FUNCTION__, sDepth)
+#	define CALLED(x...)		FunctionTracer _ft(printf, NULL, __PRETTY_FUNCTION__, sDepth)
 #	define PRINTING
 #else
 #	define TRACE(x...)
diff --git a/src/apps/text_search/GrepWindow.cpp b/src/apps/text_search/GrepWindow.cpp
index 7dc99d483b..f8e8f4c4b5 100644
--- a/src/apps/text_search/GrepWindow.cpp
+++ b/src/apps/text_search/GrepWindow.cpp
@@ -56,7 +56,7 @@ static const bigtime_t kChangesPulseInterval = 150000;
 
 static int32 sDepth;
 
-# define CALLED()	FunctionTracer functionTracer(__PRETTY_FUNCTION__, sDepth)
+# define CALLED()	FunctionTracer functionTracer(printf, this, __PRETTY_FUNCTION__, sDepth)
 #else
 # define CALLED()
 #endif // TRACE_FUNCTIONS
diff --git a/src/kits/interface/MenuField.cpp b/src/kits/interface/MenuField.cpp
index 5197db3add..1bddb26e30 100644
--- a/src/kits/interface/MenuField.cpp
+++ b/src/kits/interface/MenuField.cpp
@@ -47,7 +47,7 @@
 #ifdef TRACE_MENU_FIELD
 #	include <FunctionTracer.h>
 	static int32 sFunctionDepth = -1;
-#	define CALLED(x...)	FunctionTracer _ft(__PRETTY_FUNCTION__, sFunctionDepth)
+#	define CALLED(x...)	FunctionTracer _ft(printf, this, __PRETTY_FUNCTION__, sFunctionDepth)
 #	define TRACE(x...)	{ BString _to; \
 							_to.Append(' ', (sFunctionDepth + 1) * 2); \
 							printf("%s", _to.String()); printf(x); }
diff --git a/src/kits/interface/TextControl.cpp b/src/kits/interface/TextControl.cpp
index 4696779dfb..ea12187197 100644
--- a/src/kits/interface/TextControl.cpp
+++ b/src/kits/interface/TextControl.cpp
@@ -37,7 +37,7 @@
 #	include <stdio.h>
 #	include <FunctionTracer.h>
 	static int32 sFunctionDepth = -1;
-#	define CALLED(x...)	FunctionTracer _ft(__PRETTY_FUNCTION__, sFunctionDepth)
+#	define CALLED(x...)	FunctionTracer _ft(printf, this, __PRETTY_FUNCTION__, sFunctionDepth)
 #	define TRACE(x...)	{ BString _to; \
 							_to.Append(' ', (sFunctionDepth + 1) * 2); \
 							printf("%s", _to.String()); printf(x); }
diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index 22969420aa..73efc39e85 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -78,7 +78,7 @@ using BPrivate::gSystemCatalog;
 #ifdef TRACE_TEXT_VIEW
 #	include <FunctionTracer.h>
 	static int32 sFunctionDepth = -1;
-#	define CALLED(x...)	FunctionTracer _ft(__PRETTY_FUNCTION__, sFunctionDepth)
+#	define CALLED(x...)	FunctionTracer _ft(printf, NULL, __PRETTY_FUNCTION__, sFunctionDepth)
 #	define TRACE(x...)	{ BString _to; \
 							_to.Append(' ', (sFunctionDepth + 1) * 2); \
 							printf("%s", _to.String()); printf(x); }