more header include tweaks