[powerdebug 18/22] cleanup the headers