diff --git a/src/add-ons/kernel/drivers/power/acpi_button/Jamfile b/src/add-ons/kernel/drivers/power/acpi_button/Jamfile
index 4c1b1154d70..74c71c6817b 100644
--- a/src/add-ons/kernel/drivers/power/acpi_button/Jamfile
+++ b/src/add-ons/kernel/drivers/power/acpi_button/Jamfile
@@ -1,15 +1,5 @@
 SubDir HAIKU_TOP src add-ons kernel drivers power acpi_button ;
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
-if $(TARGET_PLATFORM) != haiku {
-	# Needed for <ACPI.h>. Unfortunately we also get the other headers there,
-	# that we don't really want.
-	UsePublicHeaders drivers ;
-}
-
 KernelAddon acpi_button :
 	acpi_button.cpp
 	;
-
-Depends acpi_button : acpi ;
diff --git a/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.c b/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.c
deleted file mode 100644
index 747d976eddc..00000000000
--- a/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* ++++++++++
-	ACPI Button Driver, used to get info on power buttons, etc.
-+++++ */
-
-#include <KernelExport.h>
-#include <Drivers.h>
-#include <Errors.h>
-#include <string.h>
-
-#include <ACPI.h>
-
-int32 api_version = B_CUR_DRIVER_API_VERSION;
-acpi_module_info *acpi;
-
-status_t
-init_hardware (void)
-{
-	return B_OK;
-}
-
-status_t
-init_driver (void)
-{
-	return get_module(B_ACPI_MODULE_NAME,(module_info **)&acpi);
-}
-
-void
-uninit_driver (void)
-{
-	put_module(B_ACPI_MODULE_NAME);
-}
-
-	
-/* ----------
-	acpi_button_open - handle open() calls
------ */
-
-static status_t
-acpi_button_open (const char *name, uint32 flags, void** cookie)
-{
-	if (strcmp(name,"power/button/power") == 0)
-		*cookie = (void *)ACPI_EVENT_POWER_BUTTON;
-	else if (strcmp(name,"power/button/sleep") == 0)
-		*cookie = (void *)ACPI_EVENT_SLEEP_BUTTON;
-	else
-		return B_ERROR;
-	
-	acpi->enable_fixed_event((uint32)(cookie));
-	
-	return B_OK;
-}
-
-
-/* ----------
-	acpi_button_read - handle read() calls
------ */
-
-static status_t
-acpi_button_read (void* cookie, off_t position, void *buf, size_t* num_bytes)
-{
-	if (*num_bytes < 1)
-		return B_IO_ERROR;
-		
-	*((uint8 *)(buf)) = acpi->fixed_event_status((uint32)(cookie)) ? 1 : 0;
-	
-	acpi->reset_fixed_event((uint32)(cookie));
-	
-	*num_bytes = 1;
-	return B_OK;
-}
-
-
-/* ----------
-	acpi_button_write - handle write() calls
------ */
-
-static status_t
-acpi_button_write (void* cookie, off_t position, const void* buffer, size_t* num_bytes)
-{
-	return B_IO_ERROR;
-}
-
-
-/* ----------
-	acpi_button_control - handle ioctl calls
------ */
-
-static status_t
-acpi_button_control (void* cookie, uint32 op, void* arg, size_t len)
-{	
-	return B_ERROR;
-}
-
-
-/* ----------
-	acpi_button_close - handle close() calls
------ */
-
-static status_t
-acpi_button_close (void* cookie)
-{
-	acpi->disable_fixed_event((uint32)(cookie));
-	return B_OK;
-}
-
-
-/* -----
-	acpi_button_free - called after the last device is closed, and after
-	all i/o is complete.
------ */
-static status_t
-acpi_button_free (void* cookie)
-{
-	return B_OK;
-}
-
-
-/* -----
-	null-terminated array of device names supported by this driver
------ */
-
-static const char *acpi_button_name[] = {
-	"power/button/power",
-	"power/button/sleep",
-	NULL
-};
-
-/* -----
-	function pointers for the device hooks entry points
------ */
-
-device_hooks acpi_button_hooks = {
-	acpi_button_open, 			/* -> open entry point */
-	acpi_button_close, 			/* -> close entry point */
-	acpi_button_free,			/* -> free cookie */
-	acpi_button_control, 		/* -> control entry point */
-	acpi_button_read,			/* -> read entry point */
-	acpi_button_write,			/* -> write entry point */
-	NULL, NULL, NULL, NULL
-};
-
-/* ----------
-	publish_devices - return a null-terminated array of devices
-	supported by this driver.
------ */
-
-const char**
-publish_devices()
-{
-	return acpi_button_name;
-}
-
-/* ----------
-	find_device - return ptr to device hooks structure for a
-	given device name
------ */
-
-device_hooks*
-find_device(const char* name)
-{
-	return &acpi_button_hooks;
-}
-
diff --git a/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp b/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp
index f9f9c4acef6..2bd49580656 100644
--- a/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp
+++ b/src/add-ons/kernel/drivers/power/acpi_button/acpi_button.cpp
@@ -161,7 +161,7 @@ acpi_button_support(device_node *parent)
 		return 0.0;
 	}
 
-	dprintf("acpi_button_support lid device found\n");
+	dprintf("acpi_button_support button device found\n");
 
 	return 0.6;
 }