diff --git a/src/mainboard/bap/ode_e20XX/buildOpts.c b/src/mainboard/bap/ode_e20XX/buildOpts.c
index 2f6143ed81..6c405cc18e 100644
--- a/src/mainboard/bap/ode_e20XX/buildOpts.c
+++ b/src/mainboard/bap/ode_e20XX/buildOpts.c
@@ -228,8 +228,6 @@ CONST AP_MTRR_SETTINGS ROMDATA KabiniApMtrrSettingsList[] =
 
 #define BLDCFG_AP_MTRR_SETTINGS_LIST &KabiniApMtrrSettingsList
 
-//#include "KeralaInstall.h"
-
 /*  Include the files that instantiate the configuration definitions.  */
 #include "cpuRegisters.h"
 #include "cpuFamRegisters.h"
diff --git a/src/mainboard/gizmosphere/gizmo2/buildOpts.c b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
index 2f6143ed81..6c405cc18e 100644
--- a/src/mainboard/gizmosphere/gizmo2/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
@@ -228,8 +228,6 @@ CONST AP_MTRR_SETTINGS ROMDATA KabiniApMtrrSettingsList[] =
 
 #define BLDCFG_AP_MTRR_SETTINGS_LIST &KabiniApMtrrSettingsList
 
-//#include "KeralaInstall.h"
-
 /*  Include the files that instantiate the configuration definitions.  */
 #include "cpuRegisters.h"
 #include "cpuFamRegisters.h"
diff --git a/src/southbridge/amd/cimx/sb800/smbus.h b/src/southbridge/amd/cimx/sb800/smbus.h
index eb5bddf1a5..82db12a823 100644
--- a/src/southbridge/amd/cimx/sb800/smbus.h
+++ b/src/southbridge/amd/cimx/sb800/smbus.h
@@ -16,8 +16,6 @@
 #ifndef _SB800_SMBUS_H_
 #define _SB800_SMBUS_H_
 
-//#include <stdint.h>
-
 #define SMBUS_IO_BASE	SMBUS0_BASE_ADDRESS
 
 #define SMBHSTSTAT 0x0
diff --git a/src/southbridge/amd/cimx/sb900/smbus.h b/src/southbridge/amd/cimx/sb900/smbus.h
index feaa397336..9fc698e90c 100644
--- a/src/southbridge/amd/cimx/sb900/smbus.h
+++ b/src/southbridge/amd/cimx/sb900/smbus.h
@@ -16,8 +16,6 @@
 #ifndef _SB900_SMBUS_H_
 #define _SB900_SMBUS_H_
 
-//#include <stdint.h>
-
 #define SMBUS_IO_BASE	SMBUS0_BASE_ADDRESS
 
 #define SMBHSTSTAT 0x0
diff --git a/src/southbridge/amd/sb800/smbus.h b/src/southbridge/amd/sb800/smbus.h
index 5ac4ea603e..0a7ca0e1ea 100644
--- a/src/southbridge/amd/sb800/smbus.h
+++ b/src/southbridge/amd/sb800/smbus.h
@@ -16,8 +16,6 @@
 #ifndef SB800_SMBUS_H
 #define SB800_SMBUS_H
 
-//#include <stdint.h>
-
 #define SMBHSTSTAT 0x0
 #define SMBSLVSTAT 0x1
 #define SMBHSTCTRL 0x2