6 files changed, 5 insertions, 22 deletions
diff --git a/src/mainboard/lenovo/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c
index d374e7e5e7..c37e6b981f 100644
--- a/src/mainboard/lenovo/t520/mainboard.c
+++ b/src/mainboard/lenovo/t520/mainboard.c
@@ -40,6 +40,7 @@
 #include <cbfs.h>
 #include <pc80/keyboard.h>
 #include <ec/lenovo/h8/h8.h>
+#include <device/azalia_device.h>
 
 void mainboard_suspend_resume(void)
 {
@@ -139,11 +140,6 @@ const char *smbios_mainboard_version(void)
 
 /* Audio Setup */
 
-extern const u32 *cim_verb_data;
-extern u32 cim_verb_data_size;
-extern const u32 *pc_beep_verbs;
-extern u32 pc_beep_verbs_size;
-
 static void verb_setup(void)
 {
 	cim_verb_data = mainboard_cim_verb_data;
diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c
index 325f90f259..b82ba7c085 100644
--- a/src/mainboard/lenovo/t530/mainboard.c
+++ b/src/mainboard/lenovo/t530/mainboard.c
@@ -40,6 +40,7 @@
 #include <cbfs.h>
 #include <pc80/keyboard.h>
 #include <ec/lenovo/h8/h8.h>
+#include <device/azalia_device.h>
 
 void mainboard_suspend_resume(void)
 {
@@ -139,11 +140,6 @@ const char *smbios_mainboard_version(void)
 
 /* Audio Setup */
 
-extern const u32 *cim_verb_data;
-extern u32 cim_verb_data_size;
-extern const u32 *pc_beep_verbs;
-extern u32 pc_beep_verbs_size;
-
 static void verb_setup(void)
 {
 	cim_verb_data = mainboard_cim_verb_data;
diff --git a/src/mainboard/lenovo/x200/hda_verb.h b/src/mainboard/lenovo/x200/hda_verb.h
index 6c9f60b057..6be7518e1a 100644
--- a/src/mainboard/lenovo/x200/hda_verb.h
+++ b/src/mainboard/lenovo/x200/hda_verb.h
@@ -41,8 +41,6 @@ static const u32 mainboard_cim_verb_data[] = {
 	PIN_CFG(0x1c, 0x40f001f0),
 	PIN_CFG(0x1d, 0x90a601f0)
 };
-extern const u32 *cim_verb_data;
-extern u32 cim_verb_data_size;
 
 static const u32 mainboard_pc_beep_verbs[] = {
 	0x00170500,	/* power up codec */
@@ -54,5 +52,3 @@ static const u32 mainboard_pc_beep_verbs[] = {
 	0x00c3b015,	/* set lout1 output volume -15dB */
 	0x0143b000,	/* unmute speakers */
 };
-extern const u32 * pc_beep_verbs;
-extern u32 pc_beep_verbs_size;
diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c
index ab0bc45678..a00f1851c9 100644
--- a/src/mainboard/lenovo/x200/mainboard.c
+++ b/src/mainboard/lenovo/x200/mainboard.c
@@ -35,6 +35,7 @@
 #include <ec/lenovo/pmh7/pmh7.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
+#include <device/azalia_device.h>
 
 #include "hda_verb.h"
 
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index 0c3c49a8fb..b57d79065d 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -35,6 +35,7 @@
 #include <ec/lenovo/h8/h8.h>
 #include <northbridge/intel/nehalem/nehalem.h>
 #include <southbridge/intel/bd82x6x/pch.h>
+#include <device/azalia_device.h>
 
 #include <pc80/mc146818rtc.h>
 #include "dock.h"
@@ -104,9 +105,6 @@ const char *smbios_mainboard_version(void)
 
 /* Audio Setup */
 
-extern const u32 *cim_verb_data;
-extern u32 cim_verb_data_size;
-
 static void verb_setup(void)
 {
 	cim_verb_data = mainboard_cim_verb_data;
diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c
index 8c977ad96e..4e3151fef4 100644
--- a/src/mainboard/lenovo/x230/mainboard.c
+++ b/src/mainboard/lenovo/x230/mainboard.c
@@ -41,6 +41,7 @@
 #include <pc80/keyboard.h>
 #include <ec/lenovo/h8/h8.h>
 #include <build.h>
+#include <device/azalia_device.h>
 
 void mainboard_suspend_resume(void)
 {
@@ -149,11 +150,6 @@ const char *smbios_mainboard_version(void)
 
 /* Audio Setup */
 
-extern const u32 *cim_verb_data;
-extern u32 cim_verb_data_size;
-extern const u32 *pc_beep_verbs;
-extern u32 pc_beep_verbs_size;
-
 static void verb_setup(void)
 {
 	cim_verb_data = mainboard_cim_verb_data;