Using logog in GeoLib and removing some include dependencies