Canonify include paths again.

9 files changed, 26 insertions, 26 deletions

diff --git a/sys/contrib/dev/acpica/include/accommon.h b/sys/contrib/dev/acpica/include/accommon.h
index 690d3cd..98331d6 100644
--- a/sys/contrib/dev/acpica/include/accommon.h
+++ b/sys/contrib/dev/acpica/include/accommon.h
@@ -123,14 +123,14 @@
  *
  * Note: The order of these include files is important.
  */
-#include "acconfig.h"           /* Global configuration constants */
-#include "acmacros.h"           /* C macros */
-#include "aclocal.h"            /* Internal data types */
-#include "acobject.h"           /* ACPI internal object */
-#include "acstruct.h"           /* Common structures */
-#include "acglobal.h"           /* All global variables */
-#include "achware.h"            /* Hardware defines and interfaces */
-#include "acutils.h"            /* Utility interfaces */
+#include <contrib/dev/acpica/include/acconfig.h>           /* Global configuration constants */
+#include <contrib/dev/acpica/include/acmacros.h>           /* C macros */
+#include <contrib/dev/acpica/include/aclocal.h>            /* Internal data types */
+#include <contrib/dev/acpica/include/acobject.h>           /* ACPI internal object */
+#include <contrib/dev/acpica/include/acstruct.h>           /* Common structures */
+#include <contrib/dev/acpica/include/acglobal.h>           /* All global variables */
+#include <contrib/dev/acpica/include/achware.h>            /* Hardware defines and interfaces */
+#include <contrib/dev/acpica/include/acutils.h>            /* Utility interfaces */
 
 
 #endif /* __ACCOMMON_H__ */
diff --git a/sys/contrib/dev/acpica/include/acdisasm.h b/sys/contrib/dev/acpica/include/acdisasm.h
index 1d82efc..ccc15f2 100644
--- a/sys/contrib/dev/acpica/include/acdisasm.h
+++ b/sys/contrib/dev/acpica/include/acdisasm.h
@@ -116,7 +116,7 @@
 #ifndef __ACDISASM_H__
 #define __ACDISASM_H__
 
-#include "amlresrc.h"
+#include <contrib/dev/acpica/include/amlresrc.h>
 
 
 #define BLOCK_NONE              0
diff --git a/sys/contrib/dev/acpica/include/acpi.h b/sys/contrib/dev/acpica/include/acpi.h
index ac0af03..0d82345 100644
--- a/sys/contrib/dev/acpica/include/acpi.h
+++ b/sys/contrib/dev/acpica/include/acpi.h
@@ -125,14 +125,14 @@
  *
  * Note: The order of these include files is important.
  */
-#include "platform/acenv.h"     /* Environment-specific items */
-#include "acnames.h"            /* Common ACPI names and strings */
-#include "actypes.h"            /* ACPICA data types and structures */
-#include "acexcep.h"            /* ACPICA exceptions */
-#include "actbl.h"              /* ACPI table definitions */
-#include "acoutput.h"           /* Error output and Debug macros */
-#include "acrestyp.h"           /* Resource Descriptor structs */
-#include "acpiosxf.h"           /* OSL interfaces (ACPICA-to-OS) */
-#include "acpixf.h"             /* ACPI core subsystem external interfaces */
+#include <contrib/dev/acpica/include/platform/acenv.h>     /* Environment-specific items */
+#include <contrib/dev/acpica/include/acnames.h>            /* Common ACPI names and strings */
+#include <contrib/dev/acpica/include/actypes.h>            /* ACPICA data types and structures */
+#include <contrib/dev/acpica/include/acexcep.h>            /* ACPICA exceptions */
+#include <contrib/dev/acpica/include/actbl.h>              /* ACPI table definitions */
+#include <contrib/dev/acpica/include/acoutput.h>           /* Error output and Debug macros */
+#include <contrib/dev/acpica/include/acrestyp.h>           /* Resource Descriptor structs */
+#include <contrib/dev/acpica/include/acpiosxf.h>           /* OSL interfaces (ACPICA-to-OS) */
+#include <contrib/dev/acpica/include/acpixf.h>             /* ACPI core subsystem external interfaces */
 
 #endif /* __ACPI_H__ */
diff --git a/sys/contrib/dev/acpica/include/acpiosxf.h b/sys/contrib/dev/acpica/include/acpiosxf.h
index 730057d..b10d12b 100644
--- a/sys/contrib/dev/acpica/include/acpiosxf.h
+++ b/sys/contrib/dev/acpica/include/acpiosxf.h
@@ -121,8 +121,8 @@
 #ifndef __ACPIOSXF_H__
 #define __ACPIOSXF_H__
 
-#include "platform/acenv.h"
-#include "actypes.h"
+#include <contrib/dev/acpica/include/platform/acenv.h>
+#include <contrib/dev/acpica/include/actypes.h>
 
 
 /* Types for AcpiOsExecute */
diff --git a/sys/contrib/dev/acpica/include/acpixf.h b/sys/contrib/dev/acpica/include/acpixf.h
index 84e4a4f..466fb27 100644
--- a/sys/contrib/dev/acpica/include/acpixf.h
+++ b/sys/contrib/dev/acpica/include/acpixf.h
@@ -122,8 +122,8 @@
 
 #define ACPI_CA_VERSION                 0x20090521
 
-#include "actypes.h"
-#include "actbl.h"
+#include <contrib/dev/acpica/include/actypes.h>
+#include <contrib/dev/acpica/include/actbl.h>
 
 /*
  * Globals that are publically available
diff --git a/sys/contrib/dev/acpica/include/acresrc.h b/sys/contrib/dev/acpica/include/acresrc.h
index c70aa5e..9e3698a 100644
--- a/sys/contrib/dev/acpica/include/acresrc.h
+++ b/sys/contrib/dev/acpica/include/acresrc.h
@@ -119,7 +119,7 @@
 
 /* Need the AML resource descriptor structs */
 
-#include "amlresrc.h"
+#include <contrib/dev/acpica/include/amlresrc.h>
 
 
 /*
diff --git a/sys/contrib/dev/acpica/include/actbl.h b/sys/contrib/dev/acpica/include/actbl.h
index 9d53404..ce1f071 100644
--- a/sys/contrib/dev/acpica/include/actbl.h
+++ b/sys/contrib/dev/acpica/include/actbl.h
@@ -415,7 +415,7 @@ typedef struct acpi_table_desc
 /*
  * Get the remaining ACPI tables
  */
-#include "actbl1.h"
+#include <contrib/dev/acpica/include/actbl1.h>
 
 /* Macros used to generate offsets to specific table fields */
 
diff --git a/sys/contrib/dev/acpica/include/platform/acenv.h b/sys/contrib/dev/acpica/include/platform/acenv.h
index 58cb03b..7756fb7 100644
--- a/sys/contrib/dev/acpica/include/platform/acenv.h
+++ b/sys/contrib/dev/acpica/include/platform/acenv.h
@@ -194,7 +194,7 @@
 #include "aclinux.h"
 
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include "acfreebsd.h"
+#include <contrib/dev/acpica/include/platform/acfreebsd.h>
 
 #elif defined(__NetBSD__)
 #include "acnetbsd.h"
diff --git a/sys/contrib/dev/acpica/include/platform/acfreebsd.h b/sys/contrib/dev/acpica/include/platform/acfreebsd.h
index 20c5687..d3084eb 100644
--- a/sys/contrib/dev/acpica/include/platform/acfreebsd.h
+++ b/sys/contrib/dev/acpica/include/platform/acfreebsd.h
@@ -119,7 +119,7 @@
 
 /* FreeBSD uses GCC */
 
-#include "acgcc.h"
+#include <contrib/dev/acpica/include/platform/acgcc.h>
 #include <sys/types.h>
 #include <machine/acpica_machdep.h>