12 files changed, 21 insertions, 7 deletions
diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c
index 50e58839a1..0fba3e6677 100644
--- a/src/drivers/spi/adesto.c
+++ b/src/drivers/spi/adesto.c
@@ -12,6 +12,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 /* at25dfxx-specific commands */
diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c
index 63a68a5309..87ef95166a 100644
--- a/src/drivers/spi/amic.c
+++ b/src/drivers/spi/amic.c
@@ -10,6 +10,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 /* A25L-specific commands */
diff --git a/src/drivers/spi/eon.c b/src/drivers/spi/eon.c
index 5a74b846f6..85567eb0d6 100644
--- a/src/drivers/spi/eon.c
+++ b/src/drivers/spi/eon.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 /* EN25Q128-specific commands */
diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c
index 783d321566..d9d4e17f57 100644
--- a/src/drivers/spi/gigadevice.c
+++ b/src/drivers/spi/gigadevice.c
@@ -28,6 +28,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 /* GD25Pxx-specific commands */
diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c
index 6e910f6b91..8a6601b6ec 100644
--- a/src/drivers/spi/macronix.c
+++ b/src/drivers/spi/macronix.c
@@ -31,6 +31,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 /* MX25xx-specific commands */
diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c
index 6dd6df921a..fc96e40260 100644
--- a/src/drivers/spi/spansion.c
+++ b/src/drivers/spi/spansion.c
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 /* S25FLxx-specific commands */
diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c
index f3a5906a00..626d5069b0 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -7,14 +7,13 @@
  * Licensed under the GPL-2 or later.
  */
 
+#include <cpu/x86/smm.h>
+#include <delay.h>
 #include <stdlib.h>
 #include <string.h>
 #include <spi-generic.h>
 #include <spi_flash.h>
-#include <delay.h>
-#ifdef __SMM__
-#include <cpu/x86/smm.h>
-#endif
+
 #include "spi_flash_internal.h"
 #include <timer.h>
 
diff --git a/src/drivers/spi/spi_flash_internal.h b/src/drivers/spi/spi_flash_internal.h
index e69694870e..6f184848b6 100644
--- a/src/drivers/spi/spi_flash_internal.h
+++ b/src/drivers/spi/spi_flash_internal.h
@@ -4,6 +4,9 @@
  * Copyright (C) 2008 Atmel Corporation
  */
 
+#ifndef SPI_FLASH_INTERNAL_H
+#define SPI_FLASH_INTERNAL_H
+
 /* Common parameters -- kind of high, but they should only occur when there
  * is a problem (and well your system already is broken), so err on the side
  * of caution in case we're dealing with slower SPI buses and/or processors.
@@ -83,3 +86,5 @@ struct spi_flash *spi_flash_probe_gigadevice(struct spi_slave *spi,
 					     u8 *idcode);
 struct spi_flash *spi_flash_probe_adesto(struct spi_slave *spi, u8 *idcode);
 struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode);
+
+#endif /* SPI_FLASH_INTERNAL_H */
diff --git a/src/drivers/spi/sst.c b/src/drivers/spi/sst.c
index 3cf6c509bf..d81888a709 100644
--- a/src/drivers/spi/sst.c
+++ b/src/drivers/spi/sst.c
@@ -14,6 +14,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 #define CMD_SST_WREN		0x06	/* Write Enable */
diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c
index bc7969d138..40bce31983 100644
--- a/src/drivers/spi/stmicro.c
+++ b/src/drivers/spi/stmicro.c
@@ -29,6 +29,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 /* M25Pxx-specific commands */
diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c
index 7ddd312616..37fd0e5112 100644
--- a/src/drivers/spi/winbond.c
+++ b/src/drivers/spi/winbond.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <spi_flash.h>
+
 #include "spi_flash_internal.h"
 
 /* M25Pxx-specific commands */
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index f63420fab5..7b529e0773 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -24,6 +24,9 @@
 #ifndef CPU_X86_SMM_H
 #define CPU_X86_SMM_H
 
+#include <arch/cpu.h>
+#include <types.h>
+
 #define SMM_DEFAULT_BASE 0x30000
 #define SMM_DEFAULT_SIZE 0x10000
 
@@ -33,8 +36,6 @@
 #define SMM_ENTRY_OFFSET 0x8000
 #define SMM_SAVE_STATE_BEGIN(x) (SMM_ENTRY_OFFSET + (x))
 
-#include <arch/cpu.h>
-#include <types.h>
 typedef struct {
 	u16	es_selector;
 	u16	es_attributes;
@@ -581,4 +582,4 @@ int smm_load_module(void *smram, int size, struct smm_loader_params *params);
 void *backup_default_smm_area(void);
 void restore_default_smm_area(void *smm_save_area);
 
-#endif
+#endif /* CPU_X86_SMM_H */