More include optimisations and fixes.