Yet more include file fixes.