diff --git a/Makefile.inc b/Makefile.inc
index 69ad3a1e9f..0fb86ce643 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -127,6 +127,7 @@ endif
 ramstage-c-deps:=$$(OPTION_TABLE_H)
 romstage-c-deps:=$$(OPTION_TABLE_H)
 bootblock-c-deps:=$$(OPTION_TABLE_H)
+smm-c-deps:=$$(OPTION_TABLE_H)
 
 #######################################################################
 # Add handler to compile ACPI's ASL
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index b0d9366113..92ec663408 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -131,14 +131,6 @@ smm-y += gcc.c
 
 $(obj)/lib/version.ramstage.o : $(obj)/build.h
 
-OPTION_TABLE_H:=
-ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)
-OPTION_TABLE_H:=$(obj)/option_table.h
-endif
-
-$(obj)/lib/uart8250mem.smm.o : $(OPTION_TABLE_H)
-$(obj)/lib/uart8250.smm.o : $(OPTION_TABLE_H)
-
 ifeq ($(CONFIG_RELOCATABLE_MODULES),y)
 ramstage-y += rmodule.c
 romstage-$(CONFIG_RELOCATABLE_RAMSTAGE) += rmodule.c