3 files changed, 5 insertions, 21 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 6fa624c799..dfeedda5e0 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -24,22 +24,6 @@
 #include <console/loglevel.h>
 #include <console/post_codes.h>
 
-#if CONFIG_CONSOLE_SERIAL
-#include <uart.h>
-#endif
-#if CONFIG_USBDEBUG && !defined(__ROMCC__)
-#include <console/usb.h>
-#endif
-#if CONFIG_CONSOLE_NE2K
-#include <console/ne2k.h>
-#endif
-#if CONFIG_CONSOLE_CBMEM
-#include <console/cbmem_console.h>
-#endif
-#if CONFIG_SPKMODEM
-#include <console/spkmodem.h>
-#endif
-
 #ifndef __PRE_RAM__
 unsigned char console_rx_byte(void);
 int console_tst_byte(void);
diff --git a/src/include/uart.h b/src/include/console/uart.h
index 997fe185ce..9b52a78c69 100644
--- a/src/include/uart.h
+++ b/src/include/console/uart.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef UART_H
-#define UART_H
+#ifndef CONSOLE_UART_H
+#define CONSOLE_UART_H
 
 /* Return the clock frequency UART uses as reference clock for
  * baudrate generator. */
@@ -44,4 +44,6 @@ void uart_init(void);
 
 uint32_t uartmem_getbaseaddr(void);
 
-#endif /* UART_H */
+void oxford_init(void);
+
+#endif /* CONSOLE_UART_H */
diff --git a/src/include/uart8250.h b/src/include/uart8250.h
index 112cd44945..af95796733 100644
--- a/src/include/uart8250.h
+++ b/src/include/uart8250.h
@@ -129,8 +129,6 @@ u32 uart_mem_init(void);
 #if defined(__PRE_RAM__) && CONFIG_DRIVERS_OXFORD_OXPCIE
 /* and special init for OXPCIe based cards */
 extern int oxford_oxpcie_present;
-
-void oxford_init(void);
 #endif
 #endif