diff -urNp work.old/common/lib/modules/fglrx/build_mod/agp3.c work/common/lib/modules/fglrx/build_mod/agp3.c
--- work.old/common/lib/modules/fglrx/build_mod/agp3.c	2006-12-28 17:10:18.000000000 +0100
+++ work/common/lib/modules/fglrx/build_mod/agp3.c	2006-12-28 17:15:30.000000000 +0100
@@ -61,7 +61,6 @@
 #include <linux/modversions.h>
 #endif
 #endif
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
diff -urNp work.old/common/lib/modules/fglrx/build_mod/agpgart_be.c work/common/lib/modules/fglrx/build_mod/agpgart_be.c
--- work.old/common/lib/modules/fglrx/build_mod/agpgart_be.c	2006-12-28 17:10:18.000000000 +0100
+++ work/common/lib/modules/fglrx/build_mod/agpgart_be.c	2006-12-28 17:16:12.000000000 +0100
@@ -99,9 +99,6 @@
 #endif
 #endif
 
-#include <linux/config.h>
-
-
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff -urNp work.old/common/lib/modules/fglrx/build_mod/drm.h work/common/lib/modules/fglrx/build_mod/drm.h
--- work.old/common/lib/modules/fglrx/build_mod/drm.h	2006-12-28 17:10:18.000000000 +0100
+++ work/common/lib/modules/fglrx/build_mod/drm.h	2006-12-28 17:15:49.000000000 +0100
@@ -38,7 +38,6 @@
 #define _DRM_H_
 
 #if defined(__linux__)
-#include <linux/config.h>
 #include <asm/ioctl.h>		/* For _IO* macros */
 #define DRM_IOCTL_NR(n)		_IOC_NR(n)
 #define DRM_IOC_VOID		_IOC_NONE
diff -urNp work.old/common/lib/modules/fglrx/build_mod/drmP.h work/common/lib/modules/fglrx/build_mod/drmP.h
--- work.old/common/lib/modules/fglrx/build_mod/drmP.h	2006-12-28 17:10:18.000000000 +0100
+++ work/common/lib/modules/fglrx/build_mod/drmP.h	2006-12-28 17:16:36.000000000 +0100
@@ -42,7 +42,6 @@
  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
 #include <asm/current.h>
 #endif /* __alpha__ */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
diff -urNp work.old/common/lib/modules/fglrx/build_mod/firegl_public.c work/common/lib/modules/fglrx/build_mod/firegl_public.c
--- work.old/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-12-28 17:10:18.000000000 +0100
+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-12-28 17:11:47.000000000 +0100
@@ -23,6 +23,11 @@
 
 // ============================================================
 #include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+/* No longer valid */
+#define VM_SHM 0
+#include <linux/utsrelease.h>
+#endif
 #ifdef MODVERSIONS
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71)
 #include <linux/modversions.h>
@@ -86,7 +91,6 @@
 #include <asm/unistd.h> /* for installing the patch wrapper */
 #include <linux/module.h>
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/proc_fs.h>