--- include/iprt/types.h.orig
+++ include/iprt/types.h
@@ -101,9 +101,6 @@ RT_C_DECLS_END
 #  define true linux_true
 #  define false linux_false
 #  define uintptr_t linux_uintptr_t
-#  ifndef AUTOCONF_INCLUDED
-#   include <linux/autoconf.h>
-#  endif
 #  include <linux/types.h>
 #  include <linux/stddef.h>
 #  undef uintptr_t
--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig
+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h
@@ -75,9 +75,6 @@
     RT_C_DECLS_END
 
 #elif defined(RT_OS_LINUX)
-#   ifndef AUTOCONF_INCLUDED
-#    include <linux/autoconf.h>
-#   endif
 #   include <linux/version.h>
 #   if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
 #       define MODVERSIONS
--- src/VBox/Runtime/r0drv/linux/the-linux-kernel.h.orig
+++ src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -34,9 +34,6 @@
 #include <iprt/types.h>
 #define bool linux_bool
 
-#ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
-#endif
 #include <linux/version.h>
 
 /* We only support 2.4 and 2.6 series kernels */
--- src/VBox/Runtime/include/internal/iprt.h.orig
+++ src/VBox/Runtime/include/internal/iprt.h
@@ -39,9 +39,6 @@
  && defined(MODULE) \
  && !defined(RT_NO_EXPORT_SYMBOL)
 # define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
-# ifndef AUTOCONF_INCLUDED
-#  include <linux/autoconf.h>
-# endif
 # if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
 #  include <linux/version.h>
 #  define MODVERSIONS
--- src/VBox/Additions/linux/drm/vboxvideo_drm.c.orig
+++ src/VBox/Additions/linux/drm/vboxvideo_drm.c
@@ -49,9 +49,6 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-#ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
-#endif
 #include <linux/version.h>
 #include <linux/module.h>
 #include "version-generated.h"