diff --git a/src/cpu/intel/haswell/bootblock.c b/src/cpu/intel/haswell/bootblock.c
index 37ce574f35..94e5d36e18 100644
--- a/src/cpu/intel/haswell/bootblock.c
+++ b/src/cpu/intel/haswell/bootblock.c
@@ -18,7 +18,6 @@
 #include <arch/io.h>
 #include <halt.h>
 
-#include <cpu/intel/microcode/microcode.c>
 #include "haswell.h"
 
 #include <southbridge/intel/lynxpoint/pch.h>
diff --git a/src/cpu/intel/microcode/Makefile.inc b/src/cpu/intel/microcode/Makefile.inc
index 2df1d5eb6f..b13172ee16 100644
--- a/src/cpu/intel/microcode/Makefile.inc
+++ b/src/cpu/intel/microcode/Makefile.inc
@@ -1,5 +1,6 @@
 bootblock-$(CONFIG_MICROCODE_UPDATE_PRE_RAM) += microcode_asm.S
 romstage-$(CONFIG_MICROCODE_UPDATE_PRE_RAM) += microcode_asm.S
 
+bootblock-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c
 ramstage-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c
 romstage-$(CONFIG_SUPPORT_CPU_UCODE_IN_CBFS) += microcode.c