PANKOVs restructure

*** 38,48 ****
  #include <sys/psw.h>
  #include "../../../../common/pci/pci_strings.h"
  #include <sys/apic.h>
  #include <io/pciex/pcie_nvidia.h>
  #include <sys/hotplug/pci/pciehpc_acpi.h>
! #include <sys/acpi/acpi.h>
  #include <sys/acpica.h>
  #include <sys/iommulib.h>
  #include <sys/devcache.h>
  #include <sys/pci_cfgacc_x86.h>
  
--- 38,48 ----
  #include <sys/psw.h>
  #include "../../../../common/pci/pci_strings.h"
  #include <sys/apic.h>
  #include <io/pciex/pcie_nvidia.h>
  #include <sys/hotplug/pci/pciehpc_acpi.h>
! #include <acpica/include/acpi.h>
  #include <sys/acpica.h>
  #include <sys/iommulib.h>
  #include <sys/devcache.h>
  #include <sys/pci_cfgacc_x86.h>