[powerdebug 07/17] Cleanup the headers