More include file fixes.