diff --git a/src/add-ons/accelerants/intel_extreme/DisplayPipe.cpp b/src/add-ons/accelerants/intel_extreme/DisplayPipe.cpp
index d3a9669d46..779e6b5a91 100644
--- a/src/add-ons/accelerants/intel_extreme/DisplayPipe.cpp
+++ b/src/add-ons/accelerants/intel_extreme/DisplayPipe.cpp
@@ -216,8 +216,6 @@ DisplayPipe::_Enable(bool enable)
 
 	addr_t targetRegister = fPlaneBase + INTEL_PIPE_CONTROL;
 
-	TRACE("%s: @ %" B_PRIxADDR "\n", __func__, targetRegister);
-
 	write32(targetRegister, (read32(targetRegister) & ~INTEL_PIPE_ENABLED)
 		| (enable ? INTEL_PIPE_ENABLED : 0));
 	read32(targetRegister);
diff --git a/src/add-ons/accelerants/intel_extreme/PanelFitter.cpp b/src/add-ons/accelerants/intel_extreme/PanelFitter.cpp
index b52c835664..8357d61109 100644
--- a/src/add-ons/accelerants/intel_extreme/PanelFitter.cpp
+++ b/src/add-ons/accelerants/intel_extreme/PanelFitter.cpp
@@ -16,14 +16,17 @@
 #include <string.h>
 
 
+#undef TRACE
 #define TRACE_FITTER
 #ifdef TRACE_FITTER
-extern "C" void _sPrintf(const char* format, ...);
-#	define TRACE(x) _sPrintf x
+#   define TRACE(x...) _sPrintf("intel_extreme: " x)
 #else
-#	define TRACE(x) ;
+#   define TRACE(x...)
 #endif
 
+#define ERROR(x...) _sPrintf("intel_extreme: " x)
+#define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
+
 
 // #pragma mark - PanelFitter
 
diff --git a/src/add-ons/accelerants/intel_extreme/Ports.cpp b/src/add-ons/accelerants/intel_extreme/Ports.cpp
index 213a1673a5..ccb716554e 100644
--- a/src/add-ons/accelerants/intel_extreme/Ports.cpp
+++ b/src/add-ons/accelerants/intel_extreme/Ports.cpp
@@ -27,7 +27,7 @@
 #undef TRACE
 #define TRACE_PORTS
 #ifdef TRACE_PORTS
-#   define TRACE(x...) _sPrintf("intel_extreme:" x)
+#   define TRACE(x...) _sPrintf("intel_extreme: " x)
 #else
 #   define TRACE(x...)
 #endif
diff --git a/src/add-ons/accelerants/intel_extreme/accelerant.cpp b/src/add-ons/accelerants/intel_extreme/accelerant.cpp
index 8b54046e6c..04d65f0727 100644
--- a/src/add-ons/accelerants/intel_extreme/accelerant.cpp
+++ b/src/add-ons/accelerants/intel_extreme/accelerant.cpp
@@ -27,7 +27,7 @@
 #undef TRACE
 #define TRACE_ACCELERANT
 #ifdef TRACE_ACCELERANT
-#	define TRACE(x...) _sPrintf("intel_extreme:" x)
+#	define TRACE(x...) _sPrintf("intel_extreme: " x)
 #else
 #	define TRACE(x...)
 #endif
diff --git a/src/add-ons/accelerants/intel_extreme/dpms.cpp b/src/add-ons/accelerants/intel_extreme/dpms.cpp
index 8761f26422..513588c323 100644
--- a/src/add-ons/accelerants/intel_extreme/dpms.cpp
+++ b/src/add-ons/accelerants/intel_extreme/dpms.cpp
@@ -14,12 +14,12 @@
 #undef TRACE
 //#define TRACE_DPMS
 #ifdef TRACE_DPMS
-#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
+#	define TRACE(x...) _sPrintf("intel_extreme: " x)
 #else
 #	define TRACE(x...)
 #endif
 
-#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define ERROR(x...) _sPrintf("intel_extreme: " x)
 #define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
 
 
diff --git a/src/add-ons/accelerants/intel_extreme/engine.cpp b/src/add-ons/accelerants/intel_extreme/engine.cpp
index d6ca9af367..231fb78d80 100644
--- a/src/add-ons/accelerants/intel_extreme/engine.cpp
+++ b/src/add-ons/accelerants/intel_extreme/engine.cpp
@@ -17,12 +17,12 @@
 #undef TRACE
 //#define TRACE_ENGINE
 #ifdef TRACE_ENGINE
-#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
+#	define TRACE(x...) _sPrintf("intel_extreme: " x)
 #else
 #	define TRACE(x...)
 #endif
 
-#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define ERROR(x...) _sPrintf("intel_extreme: " x)
 #define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
 
 
diff --git a/src/add-ons/accelerants/intel_extreme/mode.cpp b/src/add-ons/accelerants/intel_extreme/mode.cpp
index 37ebc20f5d..a32795d02a 100644
--- a/src/add-ons/accelerants/intel_extreme/mode.cpp
+++ b/src/add-ons/accelerants/intel_extreme/mode.cpp
@@ -35,7 +35,7 @@
 #undef TRACE
 #define TRACE_MODE
 #ifdef TRACE_MODE
-#	define TRACE(x...) _sPrintf("intel_extreme:" x)
+#	define TRACE(x...) _sPrintf("intel_extreme: " x)
 #else
 #	define TRACE(x...)
 #endif
diff --git a/src/add-ons/accelerants/intel_extreme/overlay.cpp b/src/add-ons/accelerants/intel_extreme/overlay.cpp
index 5716577e0c..4eb12d0e44 100644
--- a/src/add-ons/accelerants/intel_extreme/overlay.cpp
+++ b/src/add-ons/accelerants/intel_extreme/overlay.cpp
@@ -25,12 +25,12 @@
 #undef TRACE
 //#define TRACE_OVERLAY
 #ifdef TRACE_OVERLAY
-#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
+#	define TRACE(x...) _sPrintf("intel_extreme: " x)
 #else
 #	define TRACE(x...)
 #endif
 
-#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define ERROR(x...) _sPrintf("intel_extreme: " x)
 #define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)
 
 
diff --git a/src/add-ons/accelerants/intel_extreme/pll.cpp b/src/add-ons/accelerants/intel_extreme/pll.cpp
index 9777a89b95..9eb0323ae6 100644
--- a/src/add-ons/accelerants/intel_extreme/pll.cpp
+++ b/src/add-ons/accelerants/intel_extreme/pll.cpp
@@ -29,12 +29,12 @@
 #undef TRACE
 #define TRACE_MODE
 #ifdef TRACE_MODE
-#	define TRACE(x...) _sPrintf("intel_extreme accelerant:" x)
+#	define TRACE(x...) _sPrintf("intel_extreme: " x)
 #else
 #	define TRACE(x...)
 #endif
 
-#define ERROR(x...) _sPrintf("intel_extreme accelerant: " x)
+#define ERROR(x...) _sPrintf("intel_extreme: " x)
 #define CALLED(x...) TRACE("CALLED %s\n", __PRETTY_FUNCTION__)