diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 6a573d8e08..06eae463e1 100644
--- a/src/drivers/pc80/keyboard.c
+++ b/src/drivers/pc80/keyboard.c
@@ -25,9 +25,7 @@
 #include <arch/io.h>
 #include <delay.h>
 #include <types.h>
-#if CONFIG_HAVE_ACPI_RESUME
 #include <arch/acpi.h>
-#endif
 
 #define KBD_DATA	0x60
 #define KBD_COMMAND	0x64
@@ -202,10 +200,8 @@ void pc_keyboard_init(void)
 	if (!CONFIG_DRIVERS_PS2_KEYBOARD)
 		return;
 
-#if CONFIG_HAVE_ACPI_RESUME
-	if (acpi_slp_type == 3)
+	if (acpi_is_wakeup_s3())
 		return;
-#endif
 
 	printk(BIOS_DEBUG, "Keyboard init...\n");
 
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index 54d99fb5c7..9e293bded8 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -29,9 +29,6 @@
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "mec1308.h"
-#if CONFIG_HAVE_ACPI_RESUME
-#include <arch/acpi.h>
-#endif
 
 static void mec1308_init(device_t dev)
 {
@@ -41,10 +38,6 @@ static void mec1308_init(device_t dev)
 
 	switch(dev->path.pnp.device) {
 	case MEC1308_KBC:
-#if CONFIG_HAVE_ACPI_RESUME
-		if (acpi_slp_type == 3)
-			return;
-#endif
 		pc_keyboard_init();
 		break;
 	}