Clean up ACPI build wrappers: