diff --git a/src/mainboard/lenovo/x200/Makefile.inc b/src/mainboard/lenovo/x200/Makefile.inc
index 85bb37a459..b2e5c2aebb 100644
--- a/src/mainboard/lenovo/x200/Makefile.inc
+++ b/src/mainboard/lenovo/x200/Makefile.inc
@@ -18,3 +18,4 @@
 ##
 
 ramstage-y += dock.c
+ramstage-y += cstates.c
diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c
index f23d8d51a1..518b51a9dd 100644
--- a/src/mainboard/lenovo/x200/mainboard.c
+++ b/src/mainboard/lenovo/x200/mainboard.c
@@ -32,9 +32,6 @@
 #include <ec/lenovo/h8/h8.h>
 #include "drivers/lenovo/lenovo.h"
 
-#include "cstates.c" /* Include it, as the linker won't find
-			the overloaded weak function in there. */
-
 static void fill_ssdt(void)
 {
 	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
diff --git a/src/mainboard/roda/rk9/Makefile.inc b/src/mainboard/roda/rk9/Makefile.inc
index 21bedea8dc..d6838b7b4b 100644
--- a/src/mainboard/roda/rk9/Makefile.inc
+++ b/src/mainboard/roda/rk9/Makefile.inc
@@ -18,3 +18,5 @@
 ##
 
 ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += ti_pci7xx1.c
+ramstage-y += cstates.c
+
diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c
index 9d31dc3342..d0d9b55e92 100644
--- a/src/mainboard/roda/rk9/mainboard.c
+++ b/src/mainboard/roda/rk9/mainboard.c
@@ -26,9 +26,6 @@
 #include <pc80/keyboard.h>
 #include <ec/acpi/ec.h>
 
-#include "cstates.c" /* Include it, as the linker won't find
-			the overloaded weak function in there. */
-
 static void ec_setup(void)
 {
 	/* Thermal limits?  Values are from ectool's ram dump. */