Cleaned up include guards