tweaks to includes