diff --git a/headers/private/kernel/tracing_config.h b/build/config_headers/tracing_config.h
similarity index 100%
rename from headers/private/kernel/tracing_config.h
rename to build/config_headers/tracing_config.h
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index c121f67b69..1f9cc57a4b 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -113,6 +113,10 @@ HAIKU_BONE_COMPATIBLE_PLATFORMS = haiku bone dano haiku_host ;
 HAIKU_DANO_COMPATIBLE_PLATFORMS = haiku dano haiku_host ;
 HAIKU_HAIKU_COMPATIBLE_PLATFORMS = haiku haiku_host ;
 
+# configuration header directories
+HAIKU_CONFIG_HEADERS = [ FDirName $(HAIKU_TOP) build user_config_headers ]
+	[ FDirName $(HAIKU_TOP) build config_headers ] ;
+
 
 #pragma mark -
 
diff --git a/build/jam/OverriddenJamRules b/build/jam/OverriddenJamRules
index 1712f81b69..c6ad7ce3cf 100644
--- a/build/jam/OverriddenJamRules
+++ b/build/jam/OverriddenJamRules
@@ -69,7 +69,8 @@ rule Object
 		# yacc, lex, etc) are located in $(LOCATE_TARGET), possibly
 		# different from $(SEARCH_SOURCE).
 
-		headers = $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ;
+		headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
+			$(HDRS) ;
 		sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
 		defines = $(DEFINES) ;
 
diff --git a/headers/private/kernel/tracing.h b/headers/private/kernel/tracing.h
index c31b15c1d3..3d0f8be8c5 100644
--- a/headers/private/kernel/tracing.h
+++ b/headers/private/kernel/tracing.h
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-#include <tracing_config.h>
+#include "tracing_config.h"
 
 
 struct trace_entry {
diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index 9bccbb6731..55efb1ddad 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <tracing_config.h>
+#include "tracing_config.h"
 	// kernel tracing configuration
 
 #define DEBUG_FUNCTION_ENTER	//debug_printf("thread: 0x%x; this: 0x%08x; header: 0x%08x; fields: 0x%08x; data: 0x%08x; line: %04ld; func: %s\n", find_thread(NULL), this, fHeader, fFields, fData, __LINE__, __PRETTY_FUNCTION__);
diff --git a/src/system/kernel/arch/x86/arch_interrupts.S b/src/system/kernel/arch/x86/arch_interrupts.S
index 185e4e0431..ace4dd59db 100644
--- a/src/system/kernel/arch/x86/arch_interrupts.S
+++ b/src/system/kernel/arch/x86/arch_interrupts.S
@@ -12,7 +12,8 @@
 #include <arch/x86/descriptors.h>
 #include <commpage.h>
 #include <thread_types.h>
-#include <tracing_config.h>
+
+#include "tracing_config.h"
 
 #include "asm_offsets.h"
 #include "syscall_numbers.h"
diff --git a/src/system/libroot/posix/malloc/wrapper.cpp b/src/system/libroot/posix/malloc/wrapper.cpp
index db4832b442..99ce9e64a1 100644
--- a/src/system/libroot/posix/malloc/wrapper.cpp
+++ b/src/system/libroot/posix/malloc/wrapper.cpp
@@ -24,13 +24,13 @@
 #include "processheap.h"
 #include "arch-specific.h"
 
-#include <tracing_config.h>
-
 #include <image.h>
 
 #include <errno.h>
 #include <string.h>
 
+#include "tracing_config.h"
+
 using namespace BPrivate;
 
 
diff --git a/src/system/runtime_loader/elf.cpp b/src/system/runtime_loader/elf.cpp
index 5480882fa6..56fc78ca2a 100644
--- a/src/system/runtime_loader/elf.cpp
+++ b/src/system/runtime_loader/elf.cpp
@@ -24,10 +24,11 @@
 #include <runtime_loader.h>
 #include <sem.h>
 #include <syscalls.h>
-#include <tracing_config.h>
 #include <user_runtime.h>
 #include <vm_types.h>
 
+#include "tracing_config.h"
+
 
 //#define TRACE_RLD
 #ifdef TRACE_RLD