diff --git a/src/mainboard/apple/macbook21/smihandler.c b/src/mainboard/apple/macbook21/smihandler.c
index 5c6cd443d9..a43ab26e2d 100644
--- a/src/mainboard/apple/macbook21/smihandler.c
+++ b/src/mainboard/apple/macbook21/smihandler.c
@@ -29,11 +29,6 @@
 
 #define GPE_EC_SCI	12
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard_smi.c b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard_smi.c
index 35702f0879..85409fccbf 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard_smi.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard_smi.c
@@ -31,11 +31,6 @@
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <cpu/intel/model_206ax/model_206ax.h>
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard_smi.c b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard_smi.c
index 35702f0879..85409fccbf 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard_smi.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard_smi.c
@@ -31,11 +31,6 @@
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <cpu/intel/model_206ax/model_206ax.h>
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/lenovo/t420s/smihandler.c b/src/mainboard/lenovo/t420s/smihandler.c
index 430ad1ba77..8acd989b42 100644
--- a/src/mainboard/lenovo/t420s/smihandler.c
+++ b/src/mainboard/lenovo/t420s/smihandler.c
@@ -36,11 +36,6 @@
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/lenovo/t430s/smihandler.c b/src/mainboard/lenovo/t430s/smihandler.c
index 2f690b4815..44a39bcf1b 100644
--- a/src/mainboard/lenovo/t430s/smihandler.c
+++ b/src/mainboard/lenovo/t430s/smihandler.c
@@ -34,11 +34,6 @@
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/lenovo/t520/smihandler.c b/src/mainboard/lenovo/t520/smihandler.c
index 4d874fd2eb..0bd0d441da 100644
--- a/src/mainboard/lenovo/t520/smihandler.c
+++ b/src/mainboard/lenovo/t520/smihandler.c
@@ -36,11 +36,6 @@
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/lenovo/t530/smihandler.c b/src/mainboard/lenovo/t530/smihandler.c
index 8208fe735d..cae590641e 100644
--- a/src/mainboard/lenovo/t530/smihandler.c
+++ b/src/mainboard/lenovo/t530/smihandler.c
@@ -36,11 +36,6 @@
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/lenovo/t60/smihandler.c b/src/mainboard/lenovo/t60/smihandler.c
index 6e46bfd77c..e25d4ce309 100644
--- a/src/mainboard/lenovo/t60/smihandler.c
+++ b/src/mainboard/lenovo/t60/smihandler.c
@@ -31,10 +31,6 @@
 #define GPE_EC_SCI	12
 
 #define LVTMA_BL_MOD_LEVEL 0x7af9 /* ATI Radeon backlight level */
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
 
 static void mainboard_smm_init(void)
 {
diff --git a/src/mainboard/lenovo/x201/smihandler.c b/src/mainboard/lenovo/x201/smihandler.c
index 35d9605744..1bd7766eb2 100644
--- a/src/mainboard/lenovo/x201/smihandler.c
+++ b/src/mainboard/lenovo/x201/smihandler.c
@@ -37,11 +37,6 @@
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/lenovo/x220/smihandler.c b/src/mainboard/lenovo/x220/smihandler.c
index 8208fe735d..cae590641e 100644
--- a/src/mainboard/lenovo/x220/smihandler.c
+++ b/src/mainboard/lenovo/x220/smihandler.c
@@ -36,11 +36,6 @@
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/lenovo/x230/smihandler.c b/src/mainboard/lenovo/x230/smihandler.c
index 3fbcce7baf..6b946fa68c 100644
--- a/src/mainboard/lenovo/x230/smihandler.c
+++ b/src/mainboard/lenovo/x230/smihandler.c
@@ -36,11 +36,6 @@
 #define GPE_EC_SCI	1
 #define GPE_EC_WAKE	13
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/lenovo/x60/smihandler.c b/src/mainboard/lenovo/x60/smihandler.c
index be6efceaf4..c037dfaa52 100644
--- a/src/mainboard/lenovo/x60/smihandler.c
+++ b/src/mainboard/lenovo/x60/smihandler.c
@@ -33,11 +33,6 @@
 
 #define GPE_EC_SCI	12
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");
diff --git a/src/mainboard/packardbell/ms2290/smihandler.c b/src/mainboard/packardbell/ms2290/smihandler.c
index 5cc692b4ca..b883872e2d 100644
--- a/src/mainboard/packardbell/ms2290/smihandler.c
+++ b/src/mainboard/packardbell/ms2290/smihandler.c
@@ -31,11 +31,6 @@
 #include <pc80/mc146818rtc.h>
 #include <delay.h>
 
-/* The southbridge SMI handler checks whether gnvs has a
- * valid pointer before calling the trap handler
- */
-extern global_nvs_t *gnvs;
-
 static void mainboard_smm_init(void)
 {
 	printk(BIOS_DEBUG, "initializing SMI\n");