9 files changed, 9 insertions, 43 deletions
diff --git a/src/mainboard/google/bolt/mainboard.c b/src/mainboard/google/bolt/mainboard.c
index 39a85ffb6d..dd5dc03f90 100644
--- a/src/mainboard/google/bolt/mainboard.c
+++ b/src/mainboard/google/bolt/mainboard.c
@@ -34,6 +34,7 @@
 #include <arch/io.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
+#include <device/azalia_device.h>
 #include "hda_verb.h"
 #include <southbridge/intel/lynxpoint/pch.h>
 #include "ec.h"
@@ -133,9 +134,6 @@ static int int15_handler(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/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index f714ca9575..85b86cbbaa 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -39,6 +39,7 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/quanta/ene_kb3940q/ec.h>
+#include <device/azalia_device.h>
 #if CONFIG_CHROMEOS
 #include <vendorcode/google/chromeos/fmap.h>
 #else
@@ -282,11 +283,6 @@ static int int15_handler(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/google/falco/mainboard.c b/src/mainboard/google/falco/mainboard.c
index 26fd6ab04e..38edb5ca48 100644
--- a/src/mainboard/google/falco/mainboard.c
+++ b/src/mainboard/google/falco/mainboard.c
@@ -36,6 +36,7 @@
 #include <boot/coreboot_tables.h>
 #include "hda_verb.h"
 #include <southbridge/intel/lynxpoint/pch.h>
+#include <device/azalia_device.h>
 #include "ec.h"
 #include "onboard.h"
 
@@ -133,11 +134,6 @@ static int int15_handler(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/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index 9c63acd182..ee83089bbe 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -40,6 +40,7 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
+#include <device/azalia_device.h>
 
 /* placeholder for evenual link post. Not sure what we'll
  * do but it will look nice
@@ -150,11 +151,6 @@ static int int15_handler(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/google/panther/mainboard.c b/src/mainboard/google/panther/mainboard.c
index 0c59ded107..e4fd95b0bd 100644
--- a/src/mainboard/google/panther/mainboard.c
+++ b/src/mainboard/google/panther/mainboard.c
@@ -33,6 +33,7 @@
 #include <pc80/mc146818rtc.h>
 #include <southbridge/intel/lynxpoint/pch.h>
 #include <x86emu/x86emu.h>
+#include <device/azalia_device.h>
 #include "hda_verb.h"
 #include "onboard.h"
 
@@ -131,11 +132,6 @@ static int int15_handler(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/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 56a1b47b63..6aa3fcaffb 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -39,6 +39,7 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/compal/ene932/ec.h>
+#include <device/azalia_device.h>
 
 void mainboard_suspend_resume(void)
 {
@@ -136,11 +137,6 @@ static int int15_handler(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/google/peppy/mainboard.c b/src/mainboard/google/peppy/mainboard.c
index 26fd6ab04e..38edb5ca48 100644
--- a/src/mainboard/google/peppy/mainboard.c
+++ b/src/mainboard/google/peppy/mainboard.c
@@ -36,6 +36,7 @@
 #include <boot/coreboot_tables.h>
 #include "hda_verb.h"
 #include <southbridge/intel/lynxpoint/pch.h>
+#include <device/azalia_device.h>
 #include "ec.h"
 #include "onboard.h"
 
@@ -133,11 +134,6 @@ static int int15_handler(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/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index 26fd6ab04e..022c1e8be0 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -38,6 +38,7 @@
 #include <southbridge/intel/lynxpoint/pch.h>
 #include "ec.h"
 #include "onboard.h"
+#include <device/azalia_device.h>
 
 void mainboard_suspend_resume(void)
 {
@@ -133,11 +134,6 @@ static int int15_handler(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/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 8cd2fbd8c0..b0ed3c11f7 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -39,6 +39,7 @@
 #include <smbios.h>
 #include <device/pci.h>
 #include <ec/quanta/it8518/ec.h>
+#include <device/azalia_device.h>
 
 void mainboard_suspend_resume(void)
 {
@@ -136,11 +137,6 @@ static int int15_handler(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;