header tweaks to make libs more self sufficient