Include guards and fixes