--- kernel/conftest.sh
+++ kernel/conftest.sh
@@ -162,10 +162,14 @@
         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
+        CFLAGS="$CFLAGS -I$OUTPUT/include/uapi"
+        CFLAGS="$CFLAGS -I$OUTPUT/include/generated/uapi"
     elif [ "$ARCH" = "arm" ]; then
         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include"
         CFLAGS="$CFLAGS -I$OUTPUT/arch/arm/include/generated"
         CFLAGS="$CFLAGS -I$OUTPUT/arch/arm/include/generated/uapi"
+        CFLAGS="$CFLAGS -I$OUTPUT/include/generated"
+        CFLAGS="$CFLAGS -I$OUTPUT/include/generated/uapi"
     fi
     if [ -n "$BUILD_PARAMS" ]; then
         CFLAGS="$CFLAGS -D$BUILD_PARAMS"
@@ -1647,7 +1651,7 @@
         FILE="linux/version.h"
         SELECTED_MAKEFILE=""
 
-        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
+        if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE -o -f $OUTPUT/include/generated/uapi/$FILE ]; then
             #
             # We are either looking at a configured kernel source
             # tree or at headers shipped for a specific kernel.