diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 35557330f5df..c2b94aba26cc 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1239,10 +1239,10 @@ hint.npx.0.irq="13"
 
 # ACPI Experimental Driver
 device		acpi
-options		ACPI_DEBUG
-options		AML_DEBUG
-options		ACPI_NO_ENABLE_ON_BOOT
-options		ACPI_NO_OSDFUNC_INLINE
+options 		ACPI_DEBUG
+options 		AML_DEBUG
+options 		ACPI_NO_ENABLE_ON_BOOT
+options 		ACPI_NO_OSDFUNC_INLINE
 
 #
 # Optional devices:
diff --git a/sys/dev/acpi/aml/aml_common.c b/sys/dev/acpi/aml/aml_common.c
index fe98e1ed14fc..4721b7f32663 100644
--- a/sys/dev/acpi/aml/aml_common.c
+++ b/sys/dev/acpi/aml/aml_common.c
@@ -42,7 +42,10 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/acpi.h>
+#ifndef ACPI_NO_OSDFUNC_INLINE
 #include <machine/acpica_osd.h>
+#endif /* !ACPI_NO_OSDFUNC_INLINE */
 #endif /* !_KERNEL */
 
 #include <dev/acpi/aml/aml_common.h>
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 35557330f5df..c2b94aba26cc 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1239,10 +1239,10 @@ hint.npx.0.irq="13"
 
 # ACPI Experimental Driver
 device		acpi
-options		ACPI_DEBUG
-options		AML_DEBUG
-options		ACPI_NO_ENABLE_ON_BOOT
-options		ACPI_NO_OSDFUNC_INLINE
+options 		ACPI_DEBUG
+options 		AML_DEBUG
+options 		ACPI_NO_ENABLE_ON_BOOT
+options 		ACPI_NO_OSDFUNC_INLINE
 
 #
 # Optional devices:
diff --git a/usr.sbin/acpi/amldb/aml/aml_common.c b/usr.sbin/acpi/amldb/aml/aml_common.c
index fe98e1ed14fc..4721b7f32663 100644
--- a/usr.sbin/acpi/amldb/aml/aml_common.c
+++ b/usr.sbin/acpi/amldb/aml/aml_common.c
@@ -42,7 +42,10 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/acpi.h>
+#ifndef ACPI_NO_OSDFUNC_INLINE
 #include <machine/acpica_osd.h>
+#endif /* !ACPI_NO_OSDFUNC_INLINE */
 #endif /* !_KERNEL */
 
 #include <dev/acpi/aml/aml_common.h>