diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 459b05e21b..d6d95b0717 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -230,25 +230,26 @@ rule CreateAsmStructOffsetsHeader header : source
 	local includesSeparator ;
 	local localIncludesOption ;
 	local systemIncludesOption ;
-	
+
 	on $(header) { # use on $(1) variable values
 		if ! $(PLATFORM) in $(SUPPORTED_PLATFORMS) {
 			return ;
 		}
 
 		# headers and defines
-		headers = $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ;
+		headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
+			$(HDRS) ;
 		sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
 		defines = $(DEFINES) ;
 
 		if $(PLATFORM) = host {
 			sysHeaders += $(HOST_HDRS) ;
 			defines += $(HOST_DEFINES) ;
-	
+
 			if $(USES_BE_API) {
 				sysHeaders += $(HOST_BE_API_HEADERS) ;
 			}
-	
+
 		} else {
 			sysHeaders += $(TARGET_HDRS) ;
 			defines += $(TARGET_DEFINES) ;
@@ -260,23 +261,23 @@ rule CreateAsmStructOffsetsHeader header : source
 		} else {
 			flags += -O0 ;
 		}
-	
+
 		if $(PLATFORM) = host {
 			# warning flags
 			if $(WARNINGS) != 0 {
 				flags += $(HOST_WARNING_C++FLAGS) ;
 			}
-	
+
 			# debug and other flags
 			flags += $(HOST_C++FLAGS) $(HOST_DEBUG_$(DEBUG)_C++FLAGS)
 				$(SUBDIRC++FLAGS) $(C++FLAGS) ;
-		
+
 			if $(USES_BE_API) {
 				flags += $(HOST_BE_API_C++FLAGS) ;
 			}
-	
+
 			C++ on $(header) = $(HOST_C++) ;
-		
+
 			includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
 			localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
 			systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
@@ -286,11 +287,11 @@ rule CreateAsmStructOffsetsHeader header : source
 			if $(WARNINGS) != 0 {
 				flags += $(TARGET_WARNING_C++FLAGS) ;
 			}
-	
+
 			# debug and other flags
 			flags += $(TARGET_C++FLAGS) $(TARGET_DEBUG_$(DEBUG)_C++FLAGS)
 				$(SUBDIRC++FLAGS) $(C++FLAGS) ;
-	
+
 			C++ on $(header) = $(TARGET_C++) ;
 
 			includesSeparator = $(TARGET_INCLUDES_SEPARATOR) ;