Include file fixes