Fixing some include guards