Added and fixed Include guards