15 files changed, 0 insertions, 20 deletions

diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.c b/src/northbridge/intel/fsp_rangeley/northbridge.c
index af652ee16fe3..27153f89e03f 100644
--- a/src/northbridge/intel/fsp_rangeley/northbridge.c
+++ b/src/northbridge/intel/fsp_rangeley/northbridge.c
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <delay.h>
 #include <cpu/intel/fsp_model_406dx/model_406dx.h>
-#include <cpu/x86/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/northbridge/intel/fsp_sandybridge/northbridge.c b/src/northbridge/intel/fsp_sandybridge/northbridge.c
index 1016c8bb1ea8..24969d44080f 100644
--- a/src/northbridge/intel/fsp_sandybridge/northbridge.c
+++ b/src/northbridge/intel/fsp_sandybridge/northbridge.c
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <delay.h>
 #include <cpu/intel/fsp_model_206ax/model_206ax.h>
-#include <cpu/x86/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 237071cc9c5c..f0171e613301 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -22,8 +22,6 @@
 #include <device/pci_ids.h>
 #include <string.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
 #include <commonlib/helpers.h>
 #include <cbmem.h>
 #include <southbridge/intel/i82801ix/nvs.h>
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 613e982d1c78..f61a478431ba 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -20,7 +20,6 @@
 #include <stdint.h>
 #include <delay.h>
 #include <cpu/intel/haswell/haswell.h>
-#include <cpu/x86/msr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c
index 483d5d3d70bc..67199612b367 100644
--- a/src/northbridge/intel/i945/raminit.c
+++ b/src/northbridge/intel/i945/raminit.c
@@ -15,7 +15,6 @@
  */
 
 #include <console/console.h>
-#include <cpu/x86/mtrr.h>
 #include <cpu/x86/cache.h>
 #include <device/pci_def.h>
 #include <device/device.h>
diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c
index 6b8b98e1d568..aeff69a475c2 100644
--- a/src/northbridge/intel/nehalem/gma.c
+++ b/src/northbridge/intel/nehalem/gma.c
@@ -22,8 +22,6 @@
 #include <device/pci_ids.h>
 #include <string.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
 #include <drivers/intel/gma/edid.h>
 #include <drivers/intel/gma/i915.h>
 #include <drivers/intel/gma/intel_bios.h>
diff --git a/src/northbridge/intel/nehalem/northbridge.c b/src/northbridge/intel/nehalem/northbridge.c
index 0303e92f6794..6fc61c3746d6 100644
--- a/src/northbridge/intel/nehalem/northbridge.c
+++ b/src/northbridge/intel/nehalem/northbridge.c
@@ -22,7 +22,6 @@
 #include <delay.h>
 #include <cpu/intel/model_2065x/model_2065x.h>
 #include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c
index ec332e62305d..8cf4d22554c2 100644
--- a/src/northbridge/intel/pineview/gma.c
+++ b/src/northbridge/intel/pineview/gma.c
@@ -23,8 +23,6 @@
 #include <device/pci_ids.h>
 #include <string.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
 
 #include <drivers/intel/gma/i915_reg.h>
 #include "chip.h"
diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c
index 1f038206e9c5..356c73004fd5 100644
--- a/src/northbridge/intel/pineview/raminit.c
+++ b/src/northbridge/intel/pineview/raminit.c
@@ -17,7 +17,6 @@
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/cache.h>
-#include <cpu/x86/mtrr.h>
 #include <delay.h>
 #include <halt.h>
 #include <lib.h>
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index 201498aa006e..73546ce98585 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -22,8 +22,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
 #include <drivers/intel/gma/libgfxinit.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include <drivers/intel/gma/opregion.h>
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index eb8ce26476e4..8c2aaf34e71c 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -21,7 +21,6 @@
 #include <delay.h>
 #include <cpu/intel/model_206ax/model_206ax.h>
 #include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c
index 5f6753fefc90..b82075e58bd4 100644
--- a/src/northbridge/intel/sandybridge/raminit_common.c
+++ b/src/northbridge/intel/sandybridge/raminit_common.c
@@ -26,7 +26,6 @@
 #include <device/pci_def.h>
 #include <delay.h>
 #include <arch/cpu.h>
-#include <cpu/x86/msr.h>
 #include "raminit_native.h"
 #include "raminit_common.h"
 #include "sandybridge.h"
diff --git a/src/northbridge/intel/sandybridge/raminit_ivy.c b/src/northbridge/intel/sandybridge/raminit_ivy.c
index 19dea2f2e182..88d8bd6348bf 100644
--- a/src/northbridge/intel/sandybridge/raminit_ivy.c
+++ b/src/northbridge/intel/sandybridge/raminit_ivy.c
@@ -17,7 +17,6 @@
 
 #include <console/console.h>
 #include <console/usb.h>
-#include <cpu/x86/msr.h>
 #include <delay.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
diff --git a/src/northbridge/intel/sandybridge/raminit_sandy.c b/src/northbridge/intel/sandybridge/raminit_sandy.c
index 99c107ec0672..9fa6c7ba673c 100644
--- a/src/northbridge/intel/sandybridge/raminit_sandy.c
+++ b/src/northbridge/intel/sandybridge/raminit_sandy.c
@@ -17,7 +17,6 @@
 
 #include <console/console.h>
 #include <console/usb.h>
-#include <cpu/x86/msr.h>
 #include <delay.h>
 #include "raminit_native.h"
 #include "raminit_common.h"
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index 8ce1a5d2e4be..6c6f3a231827 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -23,8 +23,6 @@
 #include <device/pci_ids.h>
 #include <string.h>
 #include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include <cpu/x86/mtrr.h>
 #include <commonlib/helpers.h>
 #include <cbmem.h>