PANKOVs restructure

*** 23,33 ****
   */
  
  #include <sys/x86_archext.h>
  #include <sys/machsystm.h>
  #include <sys/x_call.h>
! #include <sys/acpi/acpi.h>
  #include <sys/acpica.h>
  #include <sys/pwrnow.h>
  #include <sys/cpu_acpi.h>
  #include <sys/cpupm.h>
  #include <sys/dtrace.h>
--- 23,33 ----
   */
  
  #include <sys/x86_archext.h>
  #include <sys/machsystm.h>
  #include <sys/x_call.h>
! #include <acpica/include/acpi.h>
  #include <sys/acpica.h>
  #include <sys/pwrnow.h>
  #include <sys/cpu_acpi.h>
  #include <sys/cpupm.h>
  #include <sys/dtrace.h>