PANKOVs restructure

*** 32,42 ****
  #include <sys/sdt.h>
  #include <sys/spl.h>
  #include <sys/machsystm.h>
  #include <sys/archsystm.h>
  #include <sys/hpet.h>
! #include <sys/acpi/acpi.h>
  #include <sys/acpica.h>
  #include <sys/cpupm.h>
  #include <sys/cpu_idle.h>
  #include <sys/cpu_acpi.h>
  #include <sys/cpupm_throttle.h>
--- 32,42 ----
  #include <sys/sdt.h>
  #include <sys/spl.h>
  #include <sys/machsystm.h>
  #include <sys/archsystm.h>
  #include <sys/hpet.h>
! #include <acpica/include/acpi.h>
  #include <sys/acpica.h>
  #include <sys/cpupm.h>
  #include <sys/cpu_idle.h>
  #include <sys/cpu_acpi.h>
  #include <sys/cpupm_throttle.h>