Auto tools / minor tweaks to includes