- wbinvd isn't an inline on ia64.

- includes are not in subdirectories.

sys/contrib/dev/acpica/acgcc.h

@@ -130,9 +130,7 @@
 #define BREAKPOINT3
 #define disable() __cli()
 #define enable()  __sti()
-#ifndef __FreeBSD__	/* XXX conflicts with inline in cpufunc.h */
 #define wbinvd()
-#endif
 
 /*! [Begin] no source code translation */
 

sys/contrib/dev/acpica/acpi.h

@@ -123,7 +123,7 @@
  * in the rest of the source code again and again.
  */
 #include "acconfig.h"           /* Configuration constants */
-#include "platform/acenv.h"     /* Target environment specific items */
+#include "acenv.h"              /* Target environment specific items */
 #include "actypes.h"            /* Fundamental common data types */
 #include "acexcep.h"            /* ACPI exception codes */
 #include "acmacros.h"           /* C macros */

sys/contrib/dev/acpica/acpiosxf.h

@@ -120,7 +120,7 @@
 #ifndef __ACPIOSXF_H__
 #define __ACPIOSXF_H__
 
-#include "platform/acenv.h"
+#include "acenv.h"
 #include "actypes.h"