Header file fixes