diff --git a/src/add-ons/kernel/bus_managers/acpi/Jamfile b/src/add-ons/kernel/bus_managers/acpi/Jamfile
index 975b879c59..21d465a1f9 100644
--- a/src/add-ons/kernel/bus_managers/acpi/Jamfile
+++ b/src/add-ons/kernel/bus_managers/acpi/Jamfile
@@ -1,7 +1,17 @@
 SubDir HAIKU_TOP src add-ons kernel bus_managers acpi ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
 SubDirHdrs [ FDirName $(SUBDIR) include ] ;
+SubDirHdrs [ FDirName $(SUBDIR) include platform ] ;
 SubDirCcFlags -fno-pic -D_KERNEL_MODE ;
 
+if $(TARGET_PLATFORM) != haiku {
+	# Needed for <ACPI.h>. Unfortunately we also get the other headers there,
+	# that we don't really want.
+	UsePublicHeaders drivers ;
+}
+
 local events_src =
 	evevent.c
 	evgpe.c
diff --git a/src/add-ons/kernel/drivers/power/acpi_button/Jamfile b/src/add-ons/kernel/drivers/power/acpi_button/Jamfile
index f86301b4b5..43f70410ca 100644
--- a/src/add-ons/kernel/drivers/power/acpi_button/Jamfile
+++ b/src/add-ons/kernel/drivers/power/acpi_button/Jamfile
@@ -1,5 +1,13 @@
 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 : kernel drivers bin :
 	acpi_button.c
 	;