diff --git a/src/southbridge/via/vt82c686/chip.h b/src/southbridge/via/vt82c686/chip.h
index b62617d8df..5c4959f1f2 100644
--- a/src/southbridge/via/vt82c686/chip.h
+++ b/src/southbridge/via/vt82c686/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_via_vt82c686_config {
 	struct pc_keyboard keyboard;
diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index 4a31606895..fa9608f326 100644
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -24,7 +24,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include <uart8250.h>
 #include "f71805f.h"
 
 static void f71805f_init(device_t dev)
diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index 2736c0b988..8eca710080 100644
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -25,7 +25,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include <uart8250.h>
 #include "f71859.h"
 
 static void f71859_init(device_t dev)
diff --git a/src/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h
index 5558d70c82..908482447b 100644
--- a/src/superio/fintek/f71863fg/chip.h
+++ b/src/superio/fintek/f71863fg/chip.h
@@ -23,7 +23,6 @@
 
 #include <pc80/keyboard.h>
 #include <device/device.h>
-#include <uart8250.h>
 
 struct superio_fintek_f71863fg_config {
 
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index 4159e6ddc6..29b5ab3307 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -24,7 +24,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include <uart8250.h>
 #include "chip.h"
 #include "f71863fg.h"
 
diff --git a/src/superio/fintek/f71869ad/chip.h b/src/superio/fintek/f71869ad/chip.h
index 78f366494c..5b18c33f48 100644
--- a/src/superio/fintek/f71869ad/chip.h
+++ b/src/superio/fintek/f71869ad/chip.h
@@ -23,7 +23,6 @@
 
 #include <pc80/keyboard.h>
 #include <device/device.h>
-#include <uart8250.h>
 
 struct superio_fintek_f71869ad_config {
 	struct pc_keyboard keyboard;
diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c
index 442ca00911..c9aa0b394f 100644
--- a/src/superio/fintek/f71869ad/superio.c
+++ b/src/superio/fintek/f71869ad/superio.c
@@ -24,7 +24,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include <uart8250.h>
 
 #include "chip.h"
 #include "f71869ad.h"
diff --git a/src/superio/fintek/f71872/chip.h b/src/superio/fintek/f71872/chip.h
index ef10403261..a6ac51fe45 100644
--- a/src/superio/fintek/f71872/chip.h
+++ b/src/superio/fintek/f71872/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_FINTEK_F71872_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_fintek_f71872_config {
 
diff --git a/src/superio/fintek/f71889/chip.h b/src/superio/fintek/f71889/chip.h
index 6199223aad..2895efc92e 100644
--- a/src/superio/fintek/f71889/chip.h
+++ b/src/superio/fintek/f71889/chip.h
@@ -23,7 +23,6 @@
 
 #include <pc80/keyboard.h>
 #include <device/device.h>
-#include <uart8250.h>
 
 struct superio_fintek_f71889_config {
 
diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 450f9385c2..71edafcd53 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -24,7 +24,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
-#include <uart8250.h>
 #include "chip.h"
 #include "f71889.h"
 
diff --git a/src/superio/fintek/f81865f/chip.h b/src/superio/fintek/f81865f/chip.h
index 735018b93f..fc17c0f72f 100644
--- a/src/superio/fintek/f81865f/chip.h
+++ b/src/superio/fintek/f81865f/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_FINTEK_F81865_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 /* This chip doesn't have keyboard and mouse support. */
 
diff --git a/src/superio/intel/i3100/superio.c b/src/superio/intel/i3100/superio.c
index f791d9d54a..d0c506626d 100644
--- a/src/superio/intel/i3100/superio.c
+++ b/src/superio/intel/i3100/superio.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include "i3100.h"
 #include <arch/io.h>
 
diff --git a/src/superio/ite/it8661f/superio.c b/src/superio/ite/it8661f/superio.c
index 812af78b4f..4b7aa00e28 100644
--- a/src/superio/ite/it8661f/superio.c
+++ b/src/superio/ite/it8661f/superio.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <stdlib.h>
 #include "it8661f.h"
 
diff --git a/src/superio/ite/it8671f/chip.h b/src/superio/ite/it8671f/chip.h
index 13b2079f01..7d5c1d4c95 100644
--- a/src/superio/ite/it8671f/chip.h
+++ b/src/superio/ite/it8671f/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_ite_it8671f_config {
 
diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 423dbfea32..21c70ecb10 100644
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/ite/it8673f/chip.h b/src/superio/ite/it8673f/chip.h
index ef19d17c29..c5fd8dedee 100644
--- a/src/superio/ite/it8673f/chip.h
+++ b/src/superio/ite/it8673f/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_ite_it8673f_config {
 
diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c
index 080c3bd26c..baa1ae17b1 100644
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c
index 1dedf457af..0df7f2d8ef 100644
--- a/src/superio/ite/it8705f/superio.c
+++ b/src/superio/ite/it8705f/superio.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <stdlib.h>
 #include "it8705f.h"
 
diff --git a/src/superio/ite/it8712f/chip.h b/src/superio/ite/it8712f/chip.h
index ffa0d0403c..1f159cd87f 100644
--- a/src/superio/ite/it8712f/chip.h
+++ b/src/superio/ite/it8712f/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_ite_it8712f_config {
 
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index 619b2602f8..2fd3440ecf 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -21,7 +21,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <arch/io.h>
 #include <stdlib.h>
diff --git a/src/superio/ite/it8716f/chip.h b/src/superio/ite/it8716f/chip.h
index 12a4d89c44..33a265abb5 100644
--- a/src/superio/ite/it8716f/chip.h
+++ b/src/superio/ite/it8716f/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_ite_it8716f_config {
 
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index 4b58bb4a47..8cf3c5f76b 100644
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -24,7 +24,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <console/console.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <arch/io.h>
 #include <stdlib.h>
diff --git a/src/superio/ite/it8718f/chip.h b/src/superio/ite/it8718f/chip.h
index 8f84fdb837..a23687c6eb 100644
--- a/src/superio/ite/it8718f/chip.h
+++ b/src/superio/ite/it8718f/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_ite_it8718f_config {
 
diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 17c7fadb9a..998d271250 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/ite/it8721f/chip.h b/src/superio/ite/it8721f/chip.h
index 0ac4d03583..bd04460b5a 100644
--- a/src/superio/ite/it8721f/chip.h
+++ b/src/superio/ite/it8721f/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_ite_it8721f_config {
 	struct pc_keyboard keyboard;
diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c
index 6305d751e8..27eab4905d 100644
--- a/src/superio/ite/it8721f/superio.c
+++ b/src/superio/ite/it8721f/superio.c
@@ -21,7 +21,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h
index 010c59a8ae..9c9aaa6b1e 100644
--- a/src/superio/ite/it8772f/chip.h
+++ b/src/superio/ite/it8772f/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_ite_it8772f_config {
 	struct pc_keyboard keyboard;
diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c
index 5004c102a1..e7e82a8e80 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <arch/io.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc8374/chip.h b/src/superio/nsc/pc8374/chip.h
index 523abdf740..40a9b604c8 100644
--- a/src/superio/nsc/pc8374/chip.h
+++ b/src/superio/nsc/pc8374/chip.h
@@ -23,7 +23,6 @@
 #define SUPERIO_NSC_PC8374_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc8374_config {
 
diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index af50316bd1..71cde2ca04 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/nsc/pc87309/chip.h b/src/superio/nsc/pc87309/chip.h
index f6f2782d0c..e769a85c34 100644
--- a/src/superio/nsc/pc87309/chip.h
+++ b/src/superio/nsc/pc87309/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_NSC_PC87309_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc87309_config {
 
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index 2aede74a98..52fc14f4ef 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -21,7 +21,6 @@
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/nsc/pc87351/chip.h b/src/superio/nsc/pc87351/chip.h
index 90dbf17980..39faee4e69 100644
--- a/src/superio/nsc/pc87351/chip.h
+++ b/src/superio/nsc/pc87351/chip.h
@@ -23,7 +23,6 @@
 #define SUPERIO_NSC_PC87351_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc87351_config {
 
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index 56d373b385..4d9469ed63 100644
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/nsc/pc87360/chip.h b/src/superio/nsc/pc87360/chip.h
index a19196ddd4..e48c0f2140 100644
--- a/src/superio/nsc/pc87360/chip.h
+++ b/src/superio/nsc/pc87360/chip.h
@@ -23,7 +23,6 @@
 #define SUPERIO_NSC_PC87360_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc87360_config {
 
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 054353acf4..92731e72c1 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/nsc/pc87366/chip.h b/src/superio/nsc/pc87366/chip.h
index a9d2b9fb2e..0ce8abd247 100644
--- a/src/superio/nsc/pc87366/chip.h
+++ b/src/superio/nsc/pc87366/chip.h
@@ -23,7 +23,6 @@
 #define SUPERIO_NSC_PC87366_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc87366_config {
 
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 95945c8808..1874ab3d2b 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index ce0189dea1..3c0cda05f0 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "pc87382.h"
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index 8fd33d7680..f5248b89ca 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "pc87384.h"
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index 3afc556208..d67539f706 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <stdlib.h>
 #include "pc87392.h"
 
diff --git a/src/superio/nsc/pc87417/chip.h b/src/superio/nsc/pc87417/chip.h
index 8752dc8d35..8c1e8e0777 100644
--- a/src/superio/nsc/pc87417/chip.h
+++ b/src/superio/nsc/pc87417/chip.h
@@ -24,7 +24,6 @@
 #define SUPERIO_NSC_PC87417_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc87417_config {
 
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index 52f20d34e2..3b91f369cd 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -25,7 +25,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/nsc/pc87427/chip.h b/src/superio/nsc/pc87427/chip.h
index 2464a44de7..4500aa98a3 100644
--- a/src/superio/nsc/pc87427/chip.h
+++ b/src/superio/nsc/pc87427/chip.h
@@ -23,7 +23,6 @@
 #define SUPERIO_NSC_PC87427_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc87427_config {
 
diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h
index a190221dd8..e0c133009d 100644
--- a/src/superio/nsc/pc97307/chip.h
+++ b/src/superio/nsc/pc97307/chip.h
@@ -29,7 +29,6 @@
 #endif
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc97307_config {
 
diff --git a/src/superio/nsc/pc97317/chip.h b/src/superio/nsc/pc97317/chip.h
index 8aaeddd58d..d8969165f6 100644
--- a/src/superio/nsc/pc97317/chip.h
+++ b/src/superio/nsc/pc97317/chip.h
@@ -29,7 +29,6 @@
 #endif
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nsc_pc97317_config {
 
diff --git a/src/superio/nuvoton/wpcm450/chip.h b/src/superio/nuvoton/wpcm450/chip.h
index 4bbcb9b9ee..cc4054f648 100644
--- a/src/superio/nuvoton/wpcm450/chip.h
+++ b/src/superio/nuvoton/wpcm450/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_NUVOTON_WPCM450_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_nuvoton_wpcm450_config {
 
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index 6a48b7229f..fabb546783 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index 56e9c07004..34d7d11211 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -23,7 +23,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/fdc37m60x/chip.h b/src/superio/smsc/fdc37m60x/chip.h
index 0ca235c532..a143f65bf8 100644
--- a/src/superio/smsc/fdc37m60x/chip.h
+++ b/src/superio/smsc/fdc37m60x/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_fdc37m60x_config {
 
diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index af305728ee..92a1783316 100644
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h
index b09e4ce107..e4126a7b5c 100644
--- a/src/superio/smsc/fdc37n972/chip.h
+++ b/src/superio/smsc/fdc37n972/chip.h
@@ -22,7 +22,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_fdc37n972_config {
 
diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c
index 3265e6b2ac..cab454045f 100644
--- a/src/superio/smsc/fdc37n972/fdc37n972.c
+++ b/src/superio/smsc/fdc37n972/fdc37n972.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include "chip.h"
 #include "fdc37n972.h"
diff --git a/src/superio/smsc/kbc1100/chip.h b/src/superio/smsc/kbc1100/chip.h
index 552098caab..59ffb4290d 100644
--- a/src/superio/smsc/kbc1100/chip.h
+++ b/src/superio/smsc/kbc1100/chip.h
@@ -21,7 +21,6 @@
 #define SUPERIO_SMSC_KBC1100_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_kbc1100_config {
 
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index c56694ca24..3a834a005d 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/lpc47b272/chip.h b/src/superio/smsc/lpc47b272/chip.h
index 625514ce9a..5a42f4a0a8 100644
--- a/src/superio/smsc/lpc47b272/chip.h
+++ b/src/superio/smsc/lpc47b272/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_SMSC_LPC47B272_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_lpc47b272_config {
 
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 8901ec4460..fb39c28934 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -30,7 +30,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/lpc47b397/chip.h b/src/superio/smsc/lpc47b397/chip.h
index ebfbd42979..e4ad5b1fbf 100644
--- a/src/superio/smsc/lpc47b397/chip.h
+++ b/src/superio/smsc/lpc47b397/chip.h
@@ -24,7 +24,6 @@
 #define SUPERIO_SMSC_LPC47B397_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_lpc47b397_config {
 
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index ff6e4051ad..3d81350ca9 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -27,7 +27,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/lpc47m10x/chip.h b/src/superio/smsc/lpc47m10x/chip.h
index f2e0860140..2d947be1a2 100644
--- a/src/superio/smsc/lpc47m10x/chip.h
+++ b/src/superio/smsc/lpc47m10x/chip.h
@@ -26,7 +26,6 @@
 #define SUPERIO_SMSC_LPC47M10X_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_lpc47m10x_config {
 
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index c1f3c2c1bb..1a697f2a0d 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -29,7 +29,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/lpc47m15x/chip.h b/src/superio/smsc/lpc47m15x/chip.h
index 47544d7ad9..757fa73cf0 100644
--- a/src/superio/smsc/lpc47m15x/chip.h
+++ b/src/superio/smsc/lpc47m15x/chip.h
@@ -21,7 +21,6 @@
 #define SUPERIO_SMSC_LPC47M15X_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_lpc47m15x_config {
 
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index 7e400fc500..b142dde1ba 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index 0b62f9dbf6..0b470f6500 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -29,7 +29,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>
 #include "lpc47n217.h"
diff --git a/src/superio/smsc/lpc47n227/chip.h b/src/superio/smsc/lpc47n227/chip.h
index da78b652af..3f26d8b7d4 100644
--- a/src/superio/smsc/lpc47n227/chip.h
+++ b/src/superio/smsc/lpc47n227/chip.h
@@ -22,7 +22,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_lpc47n227_config {
 
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index 4c110421ec..eda2622ff6 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/mec1308/chip.h b/src/superio/smsc/mec1308/chip.h
index 83d15a3dfa..733cd34984 100644
--- a/src/superio/smsc/mec1308/chip.h
+++ b/src/superio/smsc/mec1308/chip.h
@@ -21,7 +21,6 @@
 #define SUPERIO_SMSC_MEC1308_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_mec1308_config {
 	struct pc_keyboard keyboard;
diff --git a/src/superio/smsc/sch4037/chip.h b/src/superio/smsc/sch4037/chip.h
index a295a0d0de..b1fee0020b 100644
--- a/src/superio/smsc/sch4037/chip.h
+++ b/src/superio/smsc/sch4037/chip.h
@@ -21,7 +21,6 @@
 #define SUPERIO_SCH_4037_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_sch4037_config {
 
diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c
index 96d35fe3ed..b7f100ab7f 100644
--- a/src/superio/smsc/sch4037/superio.c
+++ b/src/superio/smsc/sch4037/superio.c
@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/sio1036/chip.h b/src/superio/smsc/sio1036/chip.h
index a19ce1dd86..c19ce434b7 100644
--- a/src/superio/smsc/sio1036/chip.h
+++ b/src/superio/smsc/sio1036/chip.h
@@ -21,10 +21,8 @@
 #define SUPERIO_SMSC_SIO1036_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_sio1036_config {
-	struct uart8250 com1;
 };
 
 #endif //SUPERIO_SMSC_SIO1036_CHIP_H
diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index ff7b5d1252..4980803731 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h
index 1d4577e447..cde51d1ed6 100644
--- a/src/superio/smsc/sio10n268/chip.h
+++ b/src/superio/smsc/sio10n268/chip.h
@@ -22,7 +22,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_sio10n268_config {
 
diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c
index 827274f647..690c1609c7 100644
--- a/src/superio/smsc/sio10n268/sio10n268.c
+++ b/src/superio/smsc/sio10n268/sio10n268.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <device/device.h>
 #include <device/pnp.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include "chip.h"
 #include "sio10n268.h"
diff --git a/src/superio/smsc/smscsuperio/chip.h b/src/superio/smsc/smscsuperio/chip.h
index 1ba47c6306..1e5acfe672 100644
--- a/src/superio/smsc/smscsuperio/chip.h
+++ b/src/superio/smsc/smscsuperio/chip.h
@@ -23,7 +23,6 @@
 
 #include <device/device.h>
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_smsc_smscsuperio_config {
 
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index 42a9c09a00..9990aa2e59 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -39,7 +39,6 @@
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
 #include <console/console.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c
index 68fd999eb4..551f6f02c7 100644
--- a/src/superio/via/vt1211/vt1211.c
+++ b/src/superio/via/vt1211/vt1211.c
@@ -24,7 +24,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <uart8250.h>
 #include <stdlib.h>
 #include "vt1211.h"
 
diff --git a/src/superio/winbond/w83627dhg/chip.h b/src/superio/winbond/w83627dhg/chip.h
index c8cf6ebd80..0bc5374e34 100644
--- a/src/superio/winbond/w83627dhg/chip.h
+++ b/src/superio/winbond/w83627dhg/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_WINBOND_W83627DHG_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_winbond_w83627dhg_config {
 
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index a9314196ee..269e57c869 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <superio/conf_mode.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/winbond/w83627ehg/chip.h b/src/superio/winbond/w83627ehg/chip.h
index 26a7112e5a..e073d7d0e8 100644
--- a/src/superio/winbond/w83627ehg/chip.h
+++ b/src/superio/winbond/w83627ehg/chip.h
@@ -23,7 +23,6 @@
 #define SUPERIO_WINBOND_W83627EHG_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_winbond_w83627ehg_config {
 
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 6f2c9deef3..62d331126d 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -27,7 +27,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
diff --git a/src/superio/winbond/w83627hf/chip.h b/src/superio/winbond/w83627hf/chip.h
index ac476517ef..ae527eacdc 100644
--- a/src/superio/winbond/w83627hf/chip.h
+++ b/src/superio/winbond/w83627hf/chip.h
@@ -24,7 +24,6 @@
 #define SUPERIO_WINBOND_W83627HF_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_winbond_w83627hf_config {
 
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 5a4e964dc3..c88174357c 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -27,7 +27,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
diff --git a/src/superio/winbond/w83627thg/chip.h b/src/superio/winbond/w83627thg/chip.h
index 975492ae43..692715e2c2 100644
--- a/src/superio/winbond/w83627thg/chip.h
+++ b/src/superio/winbond/w83627thg/chip.h
@@ -24,7 +24,6 @@
 #define SUPERIO_WINBOND_W83627THG_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_winbond_w83627thg_config {
 
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 257cd0ad76..f6aba10bf2 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -26,7 +26,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include "chip.h"
 #include "w83627thg.h"
diff --git a/src/superio/winbond/w83627uhg/chip.h b/src/superio/winbond/w83627uhg/chip.h
index d69f17fd89..cf8edfbf2d 100644
--- a/src/superio/winbond/w83627uhg/chip.h
+++ b/src/superio/winbond/w83627uhg/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_WINBOND_W83627UHG_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_winbond_w83627uhg_config {
 
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 9de7ac0afc..5775ff5577 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include "chip.h"
 #include "w83627uhg.h"
diff --git a/src/superio/winbond/w83697hf/chip.h b/src/superio/winbond/w83697hf/chip.h
index f075c2ead8..df9ce4b236 100644
--- a/src/superio/winbond/w83697hf/chip.h
+++ b/src/superio/winbond/w83697hf/chip.h
@@ -21,7 +21,6 @@
 #ifndef SUPERIO_WINBOND_W83697HF_CHIP_H
 #define SUPERIO_WINBOND_W83697HF_CHIP_H
 
-#include <uart8250.h>
 
 struct superio_winbond_w83697hf_config {
 	unsigned int hwmon_fan1_divisor;
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index 79ebcc9408..f89607857e 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <string.h>
 #include <lib.h>
-#include <uart8250.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/winbond/w83977f/chip.h b/src/superio/winbond/w83977f/chip.h
index 6414048ffc..736344528c 100644
--- a/src/superio/winbond/w83977f/chip.h
+++ b/src/superio/winbond/w83977f/chip.h
@@ -22,7 +22,6 @@
 #define SUPERIO_WINBOND_W83977F_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_winbond_w83977f_config {
 
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 6756830dbd..32ecf1857c 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -24,7 +24,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/winbond/w83977tf/chip.h b/src/superio/winbond/w83977tf/chip.h
index 84e7402847..ddcf1b5b49 100644
--- a/src/superio/winbond/w83977tf/chip.h
+++ b/src/superio/winbond/w83977tf/chip.h
@@ -24,7 +24,6 @@
 #define SUPERIO_WINBOND_W83977TF_CHIP_H
 
 #include <pc80/keyboard.h>
-#include <uart8250.h>
 
 struct superio_winbond_w83977tf_config {
 
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 0200d26b04..7f2dffb836 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -26,7 +26,6 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <string.h>
-#include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"