diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix
index 92e269306abf..7941f4432938 100644
--- a/pkgs/os-specific/linux/autofs/autofs-v5.nix
+++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     #make install SUBDIRS="samples" # impure!
   '';
 
-  buildInputs = [flex bison kernelHeaders];
+  buildInputs = [flex bison linuxHeaders];
 
   meta = { 
     description="Kernel based automounter";
diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix
index cdf06103f683..b810db2c1b53 100644
--- a/pkgs/os-specific/linux/cpufrequtils/default.nix
+++ b/pkgs/os-specific/linux/cpufrequtils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernelHeaders, glibc, libtool, gettext}:
+{stdenv, fetchurl, linuxHeaders, glibc, libtool, gettext}:
 
 assert stdenv.isLinux && stdenv.system != "powerpc-linux";
 
@@ -16,5 +16,5 @@ stdenv.mkDerivation {
       -i Makefile
   '';
 
-  buildInputs = [ kernelHeaders glibc libtool gettext ];
+  buildInputs = [ linuxHeaders glibc libtool gettext ];
 }
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 14bd1b2b3239..81433a313b9e 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernelHeaders, glibc}:
+{stdenv, fetchurl, linuxHeaders, glibc}:
 
 assert stdenv.isLinux && stdenv.system != "powerpc-linux";
 
@@ -10,6 +10,6 @@ stdenv.mkDerivation {
     md5 = "b5493f7a2997130a4f86c486c9993b86";
   };
 
-  inherit kernelHeaders glibc;
+  inherit linuxHeaders glibc;
   patches = [ ./open-max.patch ];
 }
diff --git a/pkgs/os-specific/linux/klibc/1.5.nix b/pkgs/os-specific/linux/klibc/1.5.nix
index 3a92c2f4d297..72b9c12698be 100644
--- a/pkgs/os-specific/linux/klibc/1.5.nix
+++ b/pkgs/os-specific/linux/klibc/1.5.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, bison, mktemp, kernelHeaders}:
+{stdenv, fetchurl, perl, bison, mktemp, linuxHeaders}:
 
 assert stdenv.isLinux;
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     makeFlags=$(eval "echo $makeFlags")
 
     mkdir linux
-    cp -prsd ${kernelHeaders}/include linux/
+    cp -prsd ${linuxHeaders}/include linux/
     chmod -R u+w linux/include/
   ''; # */
   
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index bfb76f32821f..8bd911ee0805 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, bison, mktemp, kernelHeaders}:
+{stdenv, fetchurl, perl, bison, mktemp, linuxHeaders}:
 
 assert stdenv.isLinux;
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     makeFlags=$(eval "echo $makeFlags")
 
     mkdir linux
-    cp -prsd ${kernelHeaders}/include linux/
+    cp -prsd ${linuxHeaders}/include linux/
     chmod -R u+w linux/include/
   ''; # */
   
diff --git a/pkgs/os-specific/linux/kvm/76.nix b/pkgs/os-specific/linux/kvm/76.nix
index e438f044c593..99d16b27a845 100644
--- a/pkgs/os-specific/linux/kvm/76.nix
+++ b/pkgs/os-specific/linux/kvm/76.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}:
+{stdenv, fetchurl, linuxHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}:
    
 assert stdenv.isLinux;
    
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     ./readonly-kernel-r2.patch
   ];
 
-  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
+  configureFlags = "--with-patched-kernel --kerneldir=${linuxHeaders}";
 
   # e2fsprogs is needed for libuuid.
   # rsync is a weird dependency used for copying kernel header files.
diff --git a/pkgs/os-specific/linux/kvm/86.nix b/pkgs/os-specific/linux/kvm/86.nix
index 1b468385f1fa..5989988d5aa1 100644
--- a/pkgs/os-specific/linux/kvm/86.nix
+++ b/pkgs/os-specific/linux/kvm/86.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernelHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
+{stdenv, fetchurl, linuxHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
    
 assert stdenv.isLinux;
    
diff --git a/pkgs/os-specific/linux/kvm/88.nix b/pkgs/os-specific/linux/kvm/88.nix
index bfbfbd8e47c1..2a8a1b0ef197 100644
--- a/pkgs/os-specific/linux/kvm/88.nix
+++ b/pkgs/os-specific/linux/kvm/88.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernelHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
+{stdenv, fetchurl, linuxHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
    
 assert stdenv.isLinux;
    
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index ea59af473829..3390469545f6 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernelHeaders, gccCross ? null}:
+{stdenv, fetchurl, linuxHeaders, gccCross ? null}:
 
 assert stdenv.isLinux;
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   configurePhase = ''
     make defconfig ${archMakeFlag}
-    sed -e s@/usr/include@${kernelHeaders}/include@ \
+    sed -e s@/usr/include@${linuxHeaders}/include@ \
       -e 's@^RUNTIME_PREFIX.*@RUNTIME_PREFIX="/"@' \
       -e 's@^DEVEL_PREFIX.*@DEVEL_PREFIX="/"@' \
       -e 's@.*UCLIBC_HAS_WCHAR.*@UCLIBC_HAS_WCHAR=y@' \
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
   installPhase = ''
     mkdir -p $out
     make PREFIX=$out VERBOSE=1 install ${crossMakeFlag}
-    (cd $out/include && ln -s ${kernelHeaders}/include/* .) || exit 1
+    (cd $out/include && ln -s ${linuxHeaders}/include/* .) || exit 1
     sed -i s@/lib/@$out/lib/@g $out/lib/libc.so
   '';
   
diff --git a/pkgs/os-specific/linux/uml-utilities/default.nix b/pkgs/os-specific/linux/uml-utilities/default.nix
index 4fb4ea553105..4ed7c6e8a3ad 100644
--- a/pkgs/os-specific/linux/uml-utilities/default.nix
+++ b/pkgs/os-specific/linux/uml-utilities/default.nix
@@ -1,8 +1,8 @@
-{lib, stdenv, fetchurl, kernelHeaders , readline, tunctl ? false, mconsole ? false}:
+{lib, stdenv, fetchurl, linuxHeaders , readline, tunctl ? false, mconsole ? false}:
 
 stdenv.mkDerivation {
   inherit tunctl mconsole;
-  buildInputs = lib.optional tunctl kernelHeaders
+  buildInputs = lib.optional tunctl linuxHeaders
             ++ lib.optional mconsole readline;
   name = "uml-utilities-20040114";
   builder = ./builder.sh;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e0aca5aa532..16d9f86e5623 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3502,48 +3502,53 @@ let
         glibc211);
 
   glibc25 = import ../development/libraries/glibc-2.5 {
-    inherit fetchurl stdenv kernelHeaders;
+    inherit fetchurl stdenv;
+    kernelHeaders = linuxHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
   };
 
   glibc27 = import ../development/libraries/glibc-2.7 {
-    inherit fetchurl stdenv kernelHeaders;
+    inherit fetchurl stdenv;
+    kernelHeaders = linuxHeaders;
     #installLocales = false;
   };
 
   glibc29 = makeOverridable (import ../development/libraries/glibc-2.9) {
-    inherit fetchurl stdenv kernelHeaders;
+    inherit fetchurl stdenv;
+    kernelHeaders = linuxHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
   };
 
   glibc29Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.9) {
     inherit stdenv fetchurl;
     gccCross = gccCrossStageStatic cross;
-    kernelHeaders = kernelHeadersCross cross;
+    kernelHeaders = linuxHeadersCross cross;
     installLocales = getPkgConfig "glibc" "locales" false;
   });
 
   glibc210 = makeOverridable (import ../development/libraries/glibc-2.10) {
-    inherit fetchurl stdenv kernelHeaders;
+    inherit fetchurl stdenv;
+    kernelHeaders = linuxHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
   };
 
   glibc210Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.10) {
     inherit stdenv fetchurl;
     gccCross = gccCrossStageStatic cross;
-    kernelHeaders = kernelHeadersCross cross;
+    kernelHeaders = linuxHeadersCross cross;
     installLocales = getPkgConfig "glibc" "locales" false;
   });
 
   glibc211 = makeOverridable (import ../development/libraries/glibc-2.11) {
-    inherit fetchurl stdenv kernelHeaders;
+    inherit fetchurl stdenv;
+    kernelHeaders = linuxHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
   };
 
   glibc211Cross = cross : forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) {
     inherit stdenv fetchurl;
     gccCross = gccCrossStageStatic cross;
-    kernelHeaders = kernelHeadersCross cross;
+    kernelHeaders = linuxHeadersCross cross;
     installLocales = getPkgConfig "glibc" "locales" false;
   });
 
@@ -3552,7 +3557,8 @@ let
   # libcCross = cross: uclibcCross cross;
 
   eglibc = import ../development/libraries/eglibc {
-    inherit fetchsvn stdenv kernelHeaders;
+    inherit fetchsvn stdenv;
+    kernelHeaders = linuxHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
   };
 
@@ -5296,7 +5302,7 @@ let
   };
 
   autofs5 = import ../os-specific/linux/autofs/autofs-v5.nix {
-    inherit sourceFromHead fetchurl stdenv flex bison kernelHeaders;
+    inherit sourceFromHead fetchurl stdenv flex bison linuxHeaders;
   };
 
   _915resolution = import ../os-specific/linux/915resolution {
@@ -5346,7 +5352,7 @@ let
     import ../os-specific/linux/cpufrequtils {
     inherit fetchurl stdenv libtool gettext;
     glibc = stdenv.gcc.libc;
-    kernelHeaders = stdenv.gcc.libc.kernelHeaders;
+    linuxHeaders = stdenv.gcc.libc.kernelHeaders;
   });
 
   cryopid = import ../os-specific/linux/cryopid {
@@ -5466,7 +5472,7 @@ let
     import ../os-specific/linux/iputils {
     inherit fetchurl stdenv;
     glibc = stdenv.gcc.libc;
-    kernelHeaders = stdenv.gcc.libc.kernelHeaders;
+    linuxHeaders = stdenv.gcc.libc.kernelHeaders;
   });
 
   iptables = import ../os-specific/linux/iptables {
@@ -5497,31 +5503,31 @@ let
     inherit fetchurl stdenv bison flex;
   };
 
-  kernelHeaders = kernelHeaders_2_6_28;
+  linuxHeaders = linuxHeaders_2_6_28;
 
-  kernelHeadersCross = cross : forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.28.nix {
+  linuxHeadersCross = cross : forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.28.nix {
     inherit stdenv fetchurl cross perl;
   });
 
-  kernelHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix {
+  linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix {
     inherit fetchurl stdenv unifdef;
   };
 
-  kernelHeaders_2_6_28 = import ../os-specific/linux/kernel-headers/2.6.28.nix {
+  linuxHeaders_2_6_28 = import ../os-specific/linux/kernel-headers/2.6.28.nix {
     inherit fetchurl stdenv perl;
   };
 
-  kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross {
+  linuxHeadersArm = import ../os-specific/linux/kernel-headers-cross {
     inherit fetchurl stdenv;
     cross = "arm-linux";
   };
 
-  kernelHeadersMips = import ../os-specific/linux/kernel-headers-cross {
+  linuxHeadersMips = import ../os-specific/linux/kernel-headers-cross {
     inherit fetchurl stdenv;
     cross = "mips-linux";
   };
 
-  kernelHeadersSparc = import ../os-specific/linux/kernel-headers-cross {
+  linuxHeadersSparc = import ../os-specific/linux/kernel-headers-cross {
     inherit fetchurl stdenv;
     cross = "sparc-linux";
   };
@@ -5766,14 +5772,14 @@ let
 
   klibc = makeOverridable (import ../os-specific/linux/klibc) {
     inherit fetchurl stdenv perl bison mktemp;
-    kernelHeaders = glibc.kernelHeaders;
+    linuxHeaders = glibc.kernelHeaders;
   };
 
   # Old version; needed in vmtools for insmod.  Should use
   # module_init_tools instead.
   klibc_15 = makeOverridable (import ../os-specific/linux/klibc/1.5.nix) {
     inherit fetchurl stdenv perl bison mktemp;
-    kernelHeaders = glibc.kernelHeaders;
+    linuxHeaders = glibc.kernelHeaders;
   };
 
   klibcShrunk = makeOverridable (import ../os-specific/linux/klibc/shrunk.nix) {
@@ -5784,17 +5790,17 @@ let
 
   kvm76 = import ../os-specific/linux/kvm/76.nix {
     inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync;
-    inherit (glibc) kernelHeaders;
+    linuxHeaders = glibc.kernelHeaders;
   };
 
   kvm86 = import ../os-specific/linux/kvm/86.nix {
     inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
-    inherit (glibc) kernelHeaders;
+    linuxHeaders = glibc.kernelHeaders;
   };
 
   kvm88 = import ../os-specific/linux/kvm/88.nix {
     inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
-    inherit (glibc) kernelHeaders;
+    linuxHeaders = glibc.kernelHeaders;
   };
 
   libcap = import ../os-specific/linux/libcap {
@@ -6005,12 +6011,12 @@ let
   };
 
   uclibc = import ../os-specific/linux/uclibc {
-    inherit fetchurl stdenv kernelHeaders;
+    inherit fetchurl stdenv linuxHeaders;
   };
 
   uclibcCross = target: import ../os-specific/linux/uclibc {
     inherit fetchurl stdenv;
-    kernelHeaders = kernelHeadersCross target;
+    linuxHeaders = linuxHeadersCross target;
     gccCross = gccCrossStageStatic target;
   };
 
@@ -6024,7 +6030,7 @@ let
   };
 
   umlutilities = import ../os-specific/linux/uml-utilities {
-    inherit fetchurl kernelHeaders stdenv readline lib;
+    inherit fetchurl linuxHeaders stdenv readline lib;
     tunctl = true; mconsole = true;
   };