Move ACPICA files into acpica subdir and use acpica subdir layout.hrev44307

This matches layout in ACPICA and keeps a cleaner boundry between
Haiku and ACPICA code. The only haiku specific file in ACPICA is
achaiku.h and it will hopefully be included upstream soon.

Merging will be simpler as we can just replace acpica contents and
fix Jamfile and build errors in our code.

179 files changed, 14 insertions, 14 deletions

diff --git a/src/add-ons/kernel/bus_managers/acpi/Jamfile b/src/add-ons/kernel/bus_managers/acpi/Jamfile
index f1a82e530a..eec7fd91f0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/Jamfile
+++ b/src/add-ons/kernel/bus_managers/acpi/Jamfile
@@ -1,8 +1,8 @@
 SubDir HAIKU_TOP src add-ons kernel bus_managers acpi ;
 
 UsePrivateKernelHeaders ;
-SubDirHdrs [ FDirName $(SUBDIR) include ] ;
-SubDirHdrs [ FDirName $(SUBDIR) include platform ] ;
+SubDirHdrs [ FDirName $(SUBDIR) acpica include ] ;
+SubDirHdrs [ FDirName $(SUBDIR) acpica include platform ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) pci ] ;
 SubDirCcFlags -fno-pic -D_KERNEL_MODE ;
 
@@ -181,16 +181,16 @@ StaticLibrary libacpi_ca.a :
 	$(utilities_src)
 	;
 
-SEARCH on [ FGristFiles $(common_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi common ] ;
-SEARCH on [ FGristFiles $(dispatcher_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi dispatcher ] ;
-SEARCH on [ FGristFiles $(events_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi events ] ;
-SEARCH on [ FGristFiles $(executer_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi executer ] ;
-SEARCH on [ FGristFiles $(hardware_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi hardware ] ;
-SEARCH on [ FGristFiles $(namespace_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi namespace ] ;
-SEARCH on [ FGristFiles $(parser_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi parser ] ;
-SEARCH on [ FGristFiles $(resources_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi resources ] ;
-SEARCH on [ FGristFiles $(tables_src) ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi tables ] ;
-SEARCH on [ FGristFiles $(utilities_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi utilities ] ;
+SEARCH on [ FGristFiles $(common_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica common ] ;
+SEARCH on [ FGristFiles $(dispatcher_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components dispatcher ] ;
+SEARCH on [ FGristFiles $(events_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components events ] ;
+SEARCH on [ FGristFiles $(executer_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components executer ] ;
+SEARCH on [ FGristFiles $(hardware_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components hardware ] ;
+SEARCH on [ FGristFiles $(namespace_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components namespace ] ;
+SEARCH on [ FGristFiles $(parser_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components parser ] ;
+SEARCH on [ FGristFiles $(resources_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components resources ] ;
+SEARCH on [ FGristFiles $(tables_src) ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components tables ] ;
+SEARCH on [ FGristFiles $(utilities_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components utilities ] ;
 
 KernelAddon acpi :
 	oshaiku.cpp
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/adfile.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adfile.c
index a7020cb9c2..a7020cb9c2 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/adfile.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adfile.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/adisasm.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adisasm.c
index 748561f708..748561f708 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/adisasm.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adisasm.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/adwalk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adwalk.c
index b4e227daba..b4e227daba 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/adwalk.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/adwalk.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmextern.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmextern.c
index b2e2acbc80..b2e2acbc80 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/dmextern.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmextern.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmrestag.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmrestag.c
index 827dc26684..827dc26684 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/dmrestag.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmrestag.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmtable.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtable.c
index b2ed5dd3ad..b2ed5dd3ad 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/dmtable.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtable.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmtbdump.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtbdump.c
index 2102bab469..2102bab469 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/dmtbdump.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtbdump.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/dmtbinfo.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtbinfo.c
index 05e5709c46..05e5709c46 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/dmtbinfo.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/dmtbinfo.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/common/getopt.c b/src/add-ons/kernel/bus_managers/acpi/acpica/common/getopt.c
index aaca1ffe27..aaca1ffe27 100644
--- a/src/add-ons/kernel/bus_managers/acpi/common/getopt.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/common/getopt.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsargs.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsargs.c
index 44cc41b339..44cc41b339 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsargs.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsargs.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dscontrol.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dscontrol.c
index 41435e072c..41435e072c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dscontrol.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dscontrol.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsfield.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsfield.c
index 39d2e885a0..39d2e885a0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsfield.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsfield.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsinit.c
index f9d1e2498b..f9d1e2498b 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsinit.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsinit.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsmethod.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsmethod.c
index 8f7d6bd15d..8f7d6bd15d 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsmethod.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsmethod.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsmthdat.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsmthdat.c
index a264b3aba1..a264b3aba1 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsmthdat.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsmthdat.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsobject.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsobject.c
index abf8672f2e..abf8672f2e 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsobject.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsobject.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsopcode.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsopcode.c
index 0f5164e96f..0f5164e96f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsopcode.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsopcode.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsutils.c
index 22bd0bf900..22bd0bf900 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dsutils.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dsutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswexec.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswexec.c
index e243c7f769..e243c7f769 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswexec.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswexec.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswload.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswload.c
index f30bbfc193..f30bbfc193 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswload.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswload.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswload2.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswload2.c
index 8eba533977..8eba533977 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswload2.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswload2.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswscope.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswscope.c
index b95c42746c..b95c42746c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswscope.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswscope.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswstate.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswstate.c
index 07ed6d4d71..07ed6d4d71 100644
--- a/src/add-ons/kernel/bus_managers/acpi/dispatcher/dswstate.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/dispatcher/dswstate.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evevent.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evevent.c
index a85588f105..a85588f105 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evevent.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evevent.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evglock.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evglock.c
index a7a585a0eb..a7a585a0eb 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evglock.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evglock.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evgpe.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpe.c
index 59e5d55879..59e5d55879 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evgpe.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpe.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evgpeblk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeblk.c
index c3ea571ca4..c3ea571ca4 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evgpeblk.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeblk.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evgpeinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeinit.c
index 8bba11166c..8bba11166c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evgpeinit.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeinit.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evgpeutil.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeutil.c
index eb422a17c6..eb422a17c6 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evgpeutil.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evgpeutil.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evmisc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evmisc.c
index 69d6c79ded..69d6c79ded 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evmisc.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evmisc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evregion.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evregion.c
index bd50228df3..bd50228df3 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evregion.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evregion.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evrgnini.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evrgnini.c
index cb9a2fdcd0..cb9a2fdcd0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evrgnini.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evrgnini.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evsci.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evsci.c
index e0d9261acf..e0d9261acf 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evsci.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evsci.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxface.c
index 990ddfb0b8..990ddfb0b8 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evxface.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evxfevnt.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfevnt.c
index 437f6e3137..437f6e3137 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evxfevnt.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfevnt.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evxfgpe.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfgpe.c
index 8cd73b3648..8cd73b3648 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evxfgpe.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfgpe.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/events/evxfregn.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfregn.c
index 552b0e0f47..552b0e0f47 100644
--- a/src/add-ons/kernel/bus_managers/acpi/events/evxfregn.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/events/evxfregn.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exconfig.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exconfig.c
index 341a05bac3..341a05bac3 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exconfig.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exconfig.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exconvrt.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exconvrt.c
index 67a0a26dce..67a0a26dce 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exconvrt.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exconvrt.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/excreate.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/excreate.c
index a9b92c16f3..a9b92c16f3 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/excreate.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/excreate.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exdebug.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exdebug.c
index b1d7e072de..b1d7e072de 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exdebug.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exdebug.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exdump.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exdump.c
index 44f7d3ba5a..44f7d3ba5a 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exdump.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exdump.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exfield.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exfield.c
index 3cec69aafc..3cec69aafc 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exfield.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exfield.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exfldio.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exfldio.c
index 55aacef4a4..55aacef4a4 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exfldio.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exfldio.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exmisc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exmisc.c
index 41a6d3aadf..41a6d3aadf 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exmisc.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exmisc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exmutex.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exmutex.c
index 1ce899289b..1ce899289b 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exmutex.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exmutex.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exnames.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exnames.c
index 8fd609823b..8fd609823b 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exnames.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exnames.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg1.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg1.c
index 5b37a5e066..5b37a5e066 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg1.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg1.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg2.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg2.c
index b7c19ec775..b7c19ec775 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg2.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg2.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg3.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg3.c
index e583c53697..e583c53697 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg3.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg3.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg6.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg6.c
index 92afffcdea..92afffcdea 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exoparg6.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exoparg6.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exprep.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exprep.c
index 3355eac2e5..3355eac2e5 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exprep.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exprep.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exregion.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exregion.c
index 2a308dbeee..2a308dbeee 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exregion.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exregion.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exresnte.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresnte.c
index 494d154125..494d154125 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exresnte.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresnte.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exresolv.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresolv.c
index 27a6c5273d..27a6c5273d 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exresolv.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresolv.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exresop.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresop.c
index 3a6be3bba9..3a6be3bba9 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exresop.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exresop.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exstore.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstore.c
index 30414f0f7e..30414f0f7e 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exstore.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstore.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exstoren.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstoren.c
index cee5bc64ce..cee5bc64ce 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exstoren.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstoren.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exstorob.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstorob.c
index e9adf5f7ac..e9adf5f7ac 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exstorob.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exstorob.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exsystem.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exsystem.c
index ab36f756e5..ab36f756e5 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exsystem.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exsystem.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/executer/exutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exutils.c
index 5a0a9a59db..5a0a9a59db 100644
--- a/src/add-ons/kernel/bus_managers/acpi/executer/exutils.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/executer/exutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwacpi.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwacpi.c
index b4ceb390ef..b4ceb390ef 100644
--- a/src/add-ons/kernel/bus_managers/acpi/hardware/hwacpi.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwacpi.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwgpe.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwgpe.c
index b12bab6bca..b12bab6bca 100644
--- a/src/add-ons/kernel/bus_managers/acpi/hardware/hwgpe.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwgpe.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwpci.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwpci.c
index d733b1164c..d733b1164c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/hardware/hwpci.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwpci.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwregs.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwregs.c
index 2e43a4af90..2e43a4af90 100644
--- a/src/add-ons/kernel/bus_managers/acpi/hardware/hwregs.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwregs.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwsleep.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwsleep.c
index fe796ec273..fe796ec273 100644
--- a/src/add-ons/kernel/bus_managers/acpi/hardware/hwsleep.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwsleep.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwtimer.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwtimer.c
index 79ddb8e540..79ddb8e540 100644
--- a/src/add-ons/kernel/bus_managers/acpi/hardware/hwtimer.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwtimer.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwvalid.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwvalid.c
index 92b9a4e71e..92b9a4e71e 100644
--- a/src/add-ons/kernel/bus_managers/acpi/hardware/hwvalid.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwvalid.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/hardware/hwxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwxface.c
index e7bcbe0ae9..e7bcbe0ae9 100644
--- a/src/add-ons/kernel/bus_managers/acpi/hardware/hwxface.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/hardware/hwxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsaccess.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsaccess.c
index e098e52b0e..e098e52b0e 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsaccess.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsaccess.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsalloc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsalloc.c
index de9f2293b0..de9f2293b0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsalloc.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsalloc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsdump.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsdump.c
index 2bc0eba9a0..2bc0eba9a0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsdump.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsdump.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsdumpdv.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsdumpdv.c
index 98fb8bd0a6..98fb8bd0a6 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsdumpdv.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsdumpdv.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nseval.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nseval.c
index c200e92b05..c200e92b05 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nseval.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nseval.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsinit.c
index d5f9daafbb..d5f9daafbb 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsinit.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsinit.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsload.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsload.c
index 45ab0dfc2d..45ab0dfc2d 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsload.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsload.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsnames.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsnames.c
index 59ecfd69a8..59ecfd69a8 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsnames.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsnames.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsobject.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsobject.c
index d2747f32a9..d2747f32a9 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsobject.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsobject.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsparse.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsparse.c
index cd4794079c..cd4794079c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsparse.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsparse.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nspredef.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nspredef.c
index 4c0cc821cf..4c0cc821cf 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nspredef.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nspredef.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsrepair.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsrepair.c
index 702e53e84f..702e53e84f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsrepair.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsrepair.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsrepair2.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsrepair2.c
index 7f8862dc5f..7f8862dc5f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsrepair2.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsrepair2.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nssearch.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nssearch.c
index c1ba96ede5..c1ba96ede5 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nssearch.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nssearch.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsutils.c
index 603a00ffe7..603a00ffe7 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsutils.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nswalk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nswalk.c
index c7d95e89cf..c7d95e89cf 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nswalk.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nswalk.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfeval.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfeval.c
index c3b96e30b8..c3b96e30b8 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfeval.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfeval.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfname.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfname.c
index 911fad4086..911fad4086 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfname.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfname.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfobj.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfobj.c
index 5dca29cd81..5dca29cd81 100644
--- a/src/add-ons/kernel/bus_managers/acpi/namespace/nsxfobj.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/namespace/nsxfobj.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psargs.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psargs.c
index 1dcb1b77b0..1dcb1b77b0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/psargs.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psargs.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psloop.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psloop.c
index 9791efcc78..9791efcc78 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/psloop.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psloop.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psopcode.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psopcode.c
index 30a393f1ef..30a393f1ef 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/psopcode.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psopcode.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psparse.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psparse.c
index 59af839bec..59af839bec 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/psparse.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psparse.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psscope.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psscope.c
index 10fe18690f..10fe18690f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/psscope.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psscope.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/pstree.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pstree.c
index 950dedf6c2..950dedf6c2 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/pstree.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pstree.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psutils.c
index e676a4023a..e676a4023a 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/psutils.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/pswalk.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pswalk.c
index 0de366c4a0..0de366c4a0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/pswalk.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/pswalk.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/parser/psxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psxface.c
index 54af318284..54af318284 100644
--- a/src/add-ons/kernel/bus_managers/acpi/parser/psxface.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/parser/psxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsaddr.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsaddr.c
index 0ee032c799..0ee032c799 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsaddr.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsaddr.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rscalc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rscalc.c
index ceb8cd9215..ceb8cd9215 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rscalc.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rscalc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rscreate.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rscreate.c
index 11db3a44f1..11db3a44f1 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rscreate.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rscreate.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsdump.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsdump.c
index d2db725b2e..d2db725b2e 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsdump.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsdump.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsinfo.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsinfo.c
index 5fca428e3d..5fca428e3d 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsinfo.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsinfo.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsio.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsio.c
index 26e7988644..26e7988644 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsio.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsio.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsirq.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsirq.c
index d424d1215c..d424d1215c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsirq.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsirq.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rslist.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rslist.c
index 58bd395114..58bd395114 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rslist.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rslist.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsmemory.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsmemory.c
index 708e604c51..708e604c51 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsmemory.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsmemory.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsmisc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsmisc.c
index 89c59a531b..89c59a531b 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsmisc.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsmisc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsutils.c
index f3c73f8fd4..f3c73f8fd4 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsutils.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/resources/rsxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsxface.c
index 6646ef18ed..6646ef18ed 100644
--- a/src/add-ons/kernel/bus_managers/acpi/resources/rsxface.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/resources/rsxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbfadt.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbfadt.c
index fae6428582..fae6428582 100644
--- a/src/add-ons/kernel/bus_managers/acpi/tables/tbfadt.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbfadt.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbfind.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbfind.c
index 48ef81756c..48ef81756c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/tables/tbfind.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbfind.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbinstal.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbinstal.c
index da3ccf497a..da3ccf497a 100644
--- a/src/add-ons/kernel/bus_managers/acpi/tables/tbinstal.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbinstal.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbutils.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbutils.c
index 3cb3cc204c..3cb3cc204c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/tables/tbutils.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbutils.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbxface.c
index 507ea0bd68..507ea0bd68 100644
--- a/src/add-ons/kernel/bus_managers/acpi/tables/tbxface.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/tables/tbxfroot.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbxfroot.c
index 7319a18376..7319a18376 100644
--- a/src/add-ons/kernel/bus_managers/acpi/tables/tbxfroot.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/tables/tbxfroot.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utalloc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utalloc.c
index 7a276f8203..7a276f8203 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utalloc.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utalloc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utcache.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utcache.c
index ba131014b6..ba131014b6 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utcache.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utcache.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utclib.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utclib.c
index 340e5b5d4a..340e5b5d4a 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utclib.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utclib.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utcopy.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utcopy.c
index 64484ad023..64484ad023 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utcopy.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utcopy.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utdebug.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdebug.c
index b21f07fc9e..b21f07fc9e 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utdebug.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdebug.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utdecode.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdecode.c
index 94b53d80d2..94b53d80d2 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utdecode.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdecode.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utdelete.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdelete.c
index 801f957d49..801f957d49 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utdelete.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utdelete.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/uteval.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/uteval.c
index eeaaebbbe0..eeaaebbbe0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/uteval.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/uteval.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utglobal.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utglobal.c
index 30da582a98..30da582a98 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utglobal.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utglobal.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utids.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utids.c
index c24541da86..c24541da86 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utids.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utids.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utinit.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utinit.c
index 9e06711f47..9e06711f47 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utinit.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utinit.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utlock.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utlock.c
index 6e68ec0043..6e68ec0043 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utlock.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utlock.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utmath.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmath.c
index 5c6d20e3c9..5c6d20e3c9 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utmath.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmath.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utmisc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmisc.c
index d379a220d3..d379a220d3 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utmisc.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmisc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utmutex.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmutex.c
index 01a2422e93..01a2422e93 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utmutex.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utmutex.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utobject.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utobject.c
index f62ebe01a8..f62ebe01a8 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utobject.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utobject.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utosi.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utosi.c
index 2b64d674b2..2b64d674b2 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utosi.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utosi.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utresrc.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utresrc.c
index a6b6d9c810..a6b6d9c810 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utresrc.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utresrc.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utstate.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utstate.c
index c23c701787..c23c701787 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utstate.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utstate.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/uttrack.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/uttrack.c
index f5599b792f..f5599b792f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/uttrack.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/uttrack.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utxface.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utxface.c
index d65c8210e1..d65c8210e1 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utxface.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utxface.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/utilities/utxferror.c b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utxferror.c
index 60e6217135..60e6217135 100644
--- a/src/add-ons/kernel/bus_managers/acpi/utilities/utxferror.c
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/components/utilities/utxferror.c
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acapps.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acapps.h
index d6a19f5574..d6a19f5574 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acapps.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acapps.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/accommon.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/accommon.h
index 7a5739eb0d..7a5739eb0d 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/accommon.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/accommon.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acconfig.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acconfig.h
index 9bc00f1577..9bc00f1577 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acconfig.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acconfig.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acdebug.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdebug.h
index 05f9aa3e21..05f9aa3e21 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acdebug.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdebug.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acdisasm.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdisasm.h
index b151ecdfa7..b151ecdfa7 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acdisasm.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdisasm.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acdispat.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdispat.h
index 9a47d1dbe6..9a47d1dbe6 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acdispat.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acdispat.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acevents.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acevents.h
index 9944e329d8..9944e329d8 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acevents.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acevents.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acexcep.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acexcep.h
index 0985258f97..0985258f97 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acexcep.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acexcep.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acglobal.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acglobal.h
index 1d55d7e986..1d55d7e986 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acglobal.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acglobal.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/achware.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/achware.h
index 32b9a0110a..32b9a0110a 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/achware.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/achware.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acinterp.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acinterp.h
index 8cb1e3b1d0..8cb1e3b1d0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acinterp.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acinterp.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/aclocal.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/aclocal.h
index b1b1d05a9e..b1b1d05a9e 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/aclocal.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/aclocal.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acmacros.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acmacros.h
index 5cc284efdf..5cc284efdf 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acmacros.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acmacros.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acnames.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acnames.h
index 3fbc61cc9b..3fbc61cc9b 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acnames.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acnames.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acnamesp.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acnamesp.h
index 0437a277fe..0437a277fe 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acnamesp.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acnamesp.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acobject.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acobject.h
index 6a6ad334e7..6a6ad334e7 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acobject.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acobject.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acopcode.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acopcode.h
index 5e42cc5b80..5e42cc5b80 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acopcode.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acopcode.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acoutput.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acoutput.h
index 0b319c8b10..0b319c8b10 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acoutput.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acoutput.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acparser.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acparser.h
index 3ea2096c9c..3ea2096c9c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acparser.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acparser.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acpi.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpi.h
index fcc027d9ae..fcc027d9ae 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acpi.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpi.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acpiosxf.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpiosxf.h
index 9f7fc4207c..9f7fc4207c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acpiosxf.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpiosxf.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acpixf.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpixf.h
index 34f84b166d..34f84b166d 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acpixf.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpixf.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acpredef.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpredef.h
index 5b3227083f..5b3227083f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acpredef.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acpredef.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acresrc.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acresrc.h
index 05ff90c0c1..05ff90c0c1 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acresrc.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acresrc.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acrestyp.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acrestyp.h
index d85e4a9b30..d85e4a9b30 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acrestyp.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acrestyp.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acstruct.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acstruct.h
index e90d8ecedf..e90d8ecedf 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acstruct.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acstruct.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actables.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actables.h
index d19e6845d7..d19e6845d7 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/actables.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actables.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actbl.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl.h
index 3cec93028f..3cec93028f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/actbl.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actbl1.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl1.h
index a593f44170..a593f44170 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/actbl1.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl1.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actbl2.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl2.h
index a093e85847..a093e85847 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/actbl2.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actbl2.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/actypes.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h
index 10b1e67e18..10b1e67e18 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/actypes.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/actypes.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/acutils.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acutils.h
index cef6ab3e6f..cef6ab3e6f 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/acutils.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/acutils.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/amlcode.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/amlcode.h
index c6c62ea9f0..c6c62ea9f0 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/amlcode.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/amlcode.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/amlresrc.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/amlresrc.h
index ba0e324f13..ba0e324f13 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/amlresrc.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/amlresrc.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acefi.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acefi.h
index 6ecda765dd..6ecda765dd 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/platform/acefi.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acefi.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acenv.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acenv.h
index c1cdf082ec..c1cdf082ec 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/platform/acenv.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acenv.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acgcc.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acgcc.h
index 8743a8f045..8743a8f045 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/platform/acgcc.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acgcc.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/achaiku.h
index 9b07784421..9b07784421 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/achaiku.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acintel.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acintel.h
index a93ccf8976..a93ccf8976 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/platform/acintel.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acintel.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/acmsvc.h b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acmsvc.h
index 860869331c..860869331c 100644
--- a/src/add-ons/kernel/bus_managers/acpi/include/platform/acmsvc.h
+++ b/src/add-ons/kernel/bus_managers/acpi/acpica/include/platform/acmsvc.h
diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
index ecb9706398..cc43a7da0a 100644
--- a/src/system/kernel/arch/x86/Jamfile
+++ b/src/system/kernel/arch/x86/Jamfile
@@ -3,8 +3,8 @@ SubDir HAIKU_TOP src system kernel arch x86 ;
 SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) system kernel ] ;
 	# for syscall_numbers.h
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers ps2 ;
-SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers acpi include ;
-SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers acpi include platform ;
+SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica include ;
+SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica include platform ;
 SubDirHdrs $(SUBDIR) timers ;
 
 UsePrivateKernelHeaders ;