more header work for 1.1.0