---
 Config.kmk                    |    9 ++++++++-
 src/VBox/Runtime/Makefile.kmk |    1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

--- a/Config.kmk
+++ b/Config.kmk
@@ -1216,7 +1216,14 @@ ifneq ($(filter linux,$(BUILD_TARGET)),)
     kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
     VBOX_LINUX_INCS                 += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
    else
-    kernelpath := $(VBOX_LINUX_SRC)
+    # 2.6.25 format for splitted sources
+    kernelsrc := $(shell $(SED_EXT) -ne 's+^MAKEARGS := -C++p' $(VBOX_LINUX_SRC)/Makefile)
+    ifneq ($(kernelsrc),)
+     kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
+     VBOX_LINUX_INCS                 += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
+    else
+     kernelpath := $(VBOX_LINUX_SRC)
+    endif
    endif
    ifeq ($(BUILD_TARGET_ARCH),x86)
      VBOX_LINUX_INCS                += $(kernelpath)/include/asm-i386/mach-default \
--- a/src/VBox/Runtime/Makefile.kmk
+++ b/src/VBox/Runtime/Makefile.kmk
@@ -58,6 +58,7 @@ endif
 
 # global (for now at least)
 INCS += include
+INCS += /usr/include
 
 ifneq ($(wildcard ./kLdr/kLdrModMachO.c),)
  ifeq ($(filter-out darwin win os2,$(BUILD_TARGET)),)
