diff --git a/src/soc/intel/baytrail/Makefile.inc b/src/soc/intel/baytrail/Makefile.inc
index f5c4c9f6e7..94f3241dfb 100644
--- a/src/soc/intel/baytrail/Makefile.inc
+++ b/src/soc/intel/baytrail/Makefile.inc
@@ -48,7 +48,6 @@ ramstage-y += stage_cache.c
 romstage-y += stage_cache.c
 ramstage-$(CONFIG_ELOG) += elog.c
 ramstage-y += hda.c
-ramstage-y += hda_verb.c
 
 # Remove as ramstage gets fleshed out
 ramstage-y += placeholders.c
diff --git a/src/soc/intel/baytrail/hda.c b/src/soc/intel/baytrail/hda.c
index a99e743a60..c5de654921 100644
--- a/src/soc/intel/baytrail/hda.c
+++ b/src/soc/intel/baytrail/hda.c
@@ -24,7 +24,7 @@
 #include <device/pci_ids.h>
 #include <reg_script.h>
 
-#include <baytrail/hda_verb.h>
+#include <soc/intel/common/hda_verb.h>
 #include <baytrail/iomap.h>
 #include <baytrail/iosf.h>
 #include <baytrail/pci_devs.h>
diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.inc
index b32255ae42..0c39d80340 100644
--- a/src/soc/intel/common/Makefile.inc
+++ b/src/soc/intel/common/Makefile.inc
@@ -1,3 +1,4 @@
+ramstage-y += hda_verb.c
 ramstage-$(CONFIG_CACHE_MRC_SETTINGS) += nvm.c
 ramstage-$(CONFIG_CACHE_MRC_SETTINGS) += mrc_cache.c
 romstage-$(CONFIG_CACHE_MRC_SETTINGS) += mrc_cache.c
diff --git a/src/soc/intel/baytrail/hda_verb.c b/src/soc/intel/common/hda_verb.c
similarity index 99%
rename from src/soc/intel/baytrail/hda_verb.c
rename to src/soc/intel/common/hda_verb.c
index ae71b89770..6404ee281f 100644
--- a/src/soc/intel/baytrail/hda_verb.c
+++ b/src/soc/intel/common/hda_verb.c
@@ -22,7 +22,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <delay.h>
-#include <baytrail/hda_verb.h>
+#include "hda_verb.h"
 
 /**
  * Set bits in a register and wait for status
diff --git a/src/soc/intel/baytrail/baytrail/hda_verb.h b/src/soc/intel/common/hda_verb.h
similarity index 90%
rename from src/soc/intel/baytrail/baytrail/hda_verb.h
rename to src/soc/intel/common/hda_verb.h
index 9c505d6c0e..a9c93c6e4f 100644
--- a/src/soc/intel/baytrail/baytrail/hda_verb.h
+++ b/src/soc/intel/common/hda_verb.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2013 Google Inc.
+ * Copyright (C) 2014 Google Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef BAYTRAIL_HDA_VERB_H
-#define BAYTRAIL_HDA_VERB_H
+#ifndef _COMMON_HDA_VERB_H_
+#define _COMMON_HDA_VERB_H_
 
 #include <stdint.h>
 
@@ -36,4 +36,4 @@ int hda_codec_detect(u32 base);
 int hda_codec_write(u32 base, u32 size, const u32 *data);
 int hda_codec_init(u32 base, int addr, int verb_size, const u32 *verb_data);
 
-#endif
+#endif /* _COMMON_HDA_VERB_H_ */