diff -urN kvm/configure kvm.new/configure
--- kvm/configure	2008-05-02 19:20:13.000000000 +0800
+++ kvm.new/configure	2008-05-07 19:15:05.000000000 +0800
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 prefix=/usr/local
-kerneldir=/lib/modules/$(uname -r)/build
+kerneldir=$(readlink -f /lib/modules/$(uname -r)/build)
+kernelsrcdir=$(readlink -f /lib/modules/$(uname -r)/source)
 cc=gcc
 ld=ld
 objcopy=objcopy
@@ -129,6 +130,7 @@
 ARCH=$arch
 PREFIX=$prefix
 KERNELDIR=$kerneldir
+KERNELSRCDIR=$kernelsrcdir
 LIBKVM_KERNELDIR=$libkvm_kerneldir
 WANT_MODULE=$want_module
 CROSS_COMPILE=$cross_prefix
diff -urN kvm/kernel/Makefile kvm.new/kernel/Makefile
--- kvm/kernel/Makefile	2008-05-02 19:20:13.000000000 +0800
+++ kvm.new/kernel/Makefile	2008-05-07 19:15:16.000000000 +0800
@@ -14,6 +14,12 @@
 
 LINUX = ../linux-2.6
 
+ifeq ($(KERNELDIR),$(KERNELSRCDIR))
+LINUXINC := 
+else
+LINUXINC := -Iinclude2 -I$(KERNELSRCDIR)/include
+endif
+
 version = $(shell cd $(LINUX); git describe)
 
 _hack = mv $1 $1.orig && \
@@ -33,7 +39,7 @@
 all::
 #	include header priority 1) $LINUX 2) $KERNELDIR 3) include-compat
 	$(MAKE) -C $(KERNELDIR) M=`pwd` \
-		LINUXINCLUDE="-I`pwd`/include -Iinclude -I`pwd`/include-compat \
+		LINUXINCLUDE="-I`pwd`/include -Iinclude $(LINUXINC) -I`pwd`/include-compat \
 		-include include/linux/autoconf.h" \
 		"$$@"