diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f624f3ad0596..08e19041fd72 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1231,7 +1231,6 @@ hint.npx.0.irq="13"
 device		acpi
 options 	ACPI_DEBUG
 #!options	ACPI_NO_ENABLE_ON_BOOT
-#!options	ACPI_NO_OSDFUNC_INLINE
 options 	AML_DEBUG
 
 #
diff --git a/sys/conf/options b/sys/conf/options
index 80327a829fca..c21bb4f5c87c 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -463,7 +463,6 @@ WITNESS			opt_global.h
 ACPI_DEBUG		opt_acpi.h
 AML_DEBUG		opt_acpi.h
 ACPI_NO_ENABLE_ON_BOOT	opt_acpi.h
-ACPI_NO_OSDFUNC_INLINE	opt_acpi.h
 
 # options for DEVFS, see sys/fs/devfs/devfs.h
 NDEVFSINO		opt_devfs.h
diff --git a/sys/dev/acpi/acpireg.h b/sys/dev/acpi/acpireg.h
index 1d64e92314ab..409afe6897aa 100644
--- a/sys/dev/acpi/acpireg.h
+++ b/sys/dev/acpi/acpireg.h
@@ -310,6 +310,9 @@ typedef UINT32				ACPI_STATUS;
 /*
  * ACPICA Osd family functions
  */
+#if defined(DIAGNOSTIC)
+#define ACPI_NO_OSDFUNC_INLINE
+#endif
 
 #ifdef ACPI_NO_OSDFUNC_INLINE
 ACPI_STATUS	 OsdMapMemory(void *, UINT32, void **);
diff --git a/sys/dev/acpi/aml/aml_common.c b/sys/dev/acpi/aml/aml_common.c
index a00f971ca34a..da616a6e7aa2 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/bus.h>
+#include <machine/bus.h>
 #include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
 #ifndef ACPI_NO_OSDFUNC_INLINE
 #include <machine/acpica_osd.h>
 #endif /* !ACPI_NO_OSDFUNC_INLINE */
diff --git a/sys/dev/acpi/aml/aml_region.c b/sys/dev/acpi/aml/aml_region.c
index a96b2b6fc2ec..e643b662c802 100644
--- a/sys/dev/acpi/aml/aml_region.c
+++ b/sys/dev/acpi/aml/aml_region.c
@@ -35,12 +35,14 @@
 #include "opt_acpi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
 #include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
 #include <dev/acpi/aml/aml_common.h>
 #include <dev/acpi/aml/aml_region.h>
 #include <dev/acpi/aml/aml_name.h>
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index f624f3ad0596..08e19041fd72 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1231,7 +1231,6 @@ hint.npx.0.irq="13"
 device		acpi
 options 	ACPI_DEBUG
 #!options	ACPI_NO_ENABLE_ON_BOOT
-#!options	ACPI_NO_OSDFUNC_INLINE
 options 	AML_DEBUG
 
 #
diff --git a/sys/i386/i386/acpi_machdep.c b/sys/i386/i386/acpi_machdep.c
index ef25f0b9bc16..9081b736bd5c 100644
--- a/sys/i386/i386/acpi_machdep.c
+++ b/sys/i386/i386/acpi_machdep.c
@@ -43,6 +43,10 @@
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 
+#ifdef ACPI_NO_OSDFUNC_INLINE
+#include <machine/acpica_osd.h>
+#endif
+
 struct ACPIrsdp *
 acpi_find_rsdp(void)
 {
diff --git a/sys/i386/include/acpica_osd.h b/sys/i386/include/acpica_osd.h
index 2d22b50efd5e..cdb96b5a446a 100644
--- a/sys/i386/include/acpica_osd.h
+++ b/sys/i386/include/acpica_osd.h
@@ -37,15 +37,12 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <dev/acpi/acpireg.h>
-#include <dev/acpi/acpivar.h>
-
 #include "pcib_if.h"
 
 #ifdef ACPI_NO_OSDFUNC_INLINE
 #define _ACPICA_INLINE_
 #else
-#define _ACPICA_INLINE_ static __inline
+#define _ACPICA_INLINE_	static __inline
 #endif
 
 /*
diff --git a/usr.sbin/acpi/amldb/aml/aml_common.c b/usr.sbin/acpi/amldb/aml/aml_common.c
index a00f971ca34a..da616a6e7aa2 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/bus.h>
+#include <machine/bus.h>
 #include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
 #ifndef ACPI_NO_OSDFUNC_INLINE
 #include <machine/acpica_osd.h>
 #endif /* !ACPI_NO_OSDFUNC_INLINE */
diff --git a/usr.sbin/acpi/amldb/aml/aml_region.c b/usr.sbin/acpi/amldb/aml/aml_region.c
index a96b2b6fc2ec..e643b662c802 100644
--- a/usr.sbin/acpi/amldb/aml/aml_region.c
+++ b/usr.sbin/acpi/amldb/aml/aml_region.c
@@ -35,12 +35,14 @@
 #include "opt_acpi.h"
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
 #include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
 #include <dev/acpi/aml/aml_common.h>
 #include <dev/acpi/aml/aml_region.h>
 #include <dev/acpi/aml/aml_name.h>