diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 79feaad070..60efdd0d7a 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -838,14 +838,12 @@ void acpi_create_ivrs(acpi_ivrs_t *ivrs,
 		      unsigned long (*acpi_fill_ivrs)(acpi_ivrs_t *ivrs_struct,
 		      unsigned long current));
 
-#if ENV_RAMSTAGE && !defined(__SIMPLE_DEVICE__)
 void acpi_create_hpet(acpi_hpet_t *hpet);
 unsigned long acpi_write_hpet(struct device *device, unsigned long start,
 			      acpi_rsdp_t *rsdp);
 
 /* cpu/intel/speedstep/acpi.c */
 void generate_cpu_entries(struct device *device);
-#endif
 
 void acpi_create_mcfg(acpi_mcfg_t *mcfg);
 
diff --git a/src/console/post.c b/src/console/post.c
index 236aa8cdaa..b17a819d97 100644
--- a/src/console/post.c
+++ b/src/console/post.c
@@ -44,7 +44,6 @@ void __weak mainboard_post(uint8_t value)
 
 DECLARE_SPIN_LOCK(cmos_post_lock)
 
-#if ENV_RAMSTAGE
 void cmos_post_log(void)
 {
 	u8 code = 0;
@@ -125,7 +124,6 @@ void post_log_clear(void)
 	post_log_extra(0);
 }
 #endif /* CONFIG_CMOS_POST_EXTRA */
-#endif /* ENV_RAMSTAGE */
 
 static void cmos_post_code(u8 value)
 {
diff --git a/src/drivers/uart/uart8250io.c b/src/drivers/uart/uart8250io.c
index 62671e2b6f..614a849f7a 100644
--- a/src/drivers/uart/uart8250io.c
+++ b/src/drivers/uart/uart8250io.c
@@ -124,7 +124,6 @@ void uart_tx_flush(int idx)
 	uart8250_tx_flush(uart_platform_base(idx));
 }
 
-#if ENV_RAMSTAGE
 void uart_fill_lb(void *data)
 {
 	struct lb_serial serial;
@@ -138,4 +137,3 @@ void uart_fill_lb(void *data)
 
 	lb_add_console(LB_TAG_CONSOLE_SERIAL8250, data);
 }
-#endif
diff --git a/src/drivers/uart/uart8250mem.c b/src/drivers/uart/uart8250mem.c
index c3dff6a72c..a5aa74a332 100644
--- a/src/drivers/uart/uart8250mem.c
+++ b/src/drivers/uart/uart8250mem.c
@@ -147,7 +147,6 @@ void uart_tx_flush(int idx)
 	uart8250_mem_tx_flush(base);
 }
 
-#if ENV_RAMSTAGE
 void uart_fill_lb(void *data)
 {
 	struct lb_serial serial;
@@ -166,4 +165,3 @@ void uart_fill_lb(void *data)
 
 	lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
 }
-#endif
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index 18f6d5dcac..737dcf93d0 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -17,7 +17,6 @@
 #include <bootmode.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
-#if ENV_RAMSTAGE
 static int gfx_init_done = -1;
 
 int gfx_get_init_done(void)
@@ -31,7 +30,6 @@ void gfx_set_init_done(int done)
 {
 	gfx_init_done = done;
 }
-#endif
 
 int display_init_required(void)
 {