header include fixes