diff -urN nv.old/usr/src/nv/conftest.sh nv.new/usr/src/nv/conftest.sh
--- nv.old/usr/src/nv/conftest.sh	2006-05-15 20:42:17.000000000 +0000
+++ nv.new/usr/src/nv/conftest.sh	2006-06-09 22:23:58.601508250 +0000
@@ -249,6 +249,7 @@
             # Determine the kernel version using a compile check.
             #
             echo "#include <linux/version.h>
+            #include <linux/autoconf.h>
             #include <linux/utsname.h>
             int main() {
               if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) {
@@ -562,7 +563,8 @@
         # Is 'rlim' a member of current->signal?
         #
 
-        echo "#include <linux/sched.h>
+         echo "#include <linux/autoconf.h>
+        #include <linux/sched.h>
         struct rlimit *conftest_signal_struct_rlim(void) {
             return current->signal->rlim;
         }" > conftest$$.c
@@ -608,7 +610,8 @@
         # it takes.
         #
 
-        echo "#include <linux/vmalloc.h>
+         echo "#include <linux/autoconf.h>
+        #include <linux/vmalloc.h>
         void conftest_vmap(void) {
             vmap();
         }" > conftest$$.c
@@ -621,7 +624,8 @@
             exit 1
         fi
 
-        echo "#include <linux/vmalloc.h>
+         echo "#include <linux/autoconf.h>
+        #include <linux/vmalloc.h>
         void *conftest_vmap(struct page **pg, int cnt) {
             return vmap(pg, cnt);
         }" > conftest$$.c
@@ -635,7 +639,8 @@
             exit 0
         fi
 
-        echo "#include <linux/vmalloc.h>
+         echo "#include <linux/autoconf.h>
+        #include <linux/vmalloc.h>
         #include <linux/mm.h>
         void *conftest_vmap(struct page **pg, int cnt) {
             return vmap(pg, cnt, 0, PAGE_KERNEL);
@@ -705,7 +710,8 @@
         # Does linux/pm.h declare the pm_message_t type?
         #
 
-        echo "#include <linux/pm.h>
+         echo "#include <linux/autoconf.h>
+        #include <linux/pm.h>
         void conftest_pm_message_t(pm_message_t state) {
             pm_message_t *p = &state;
         }" > conftest$$.c