Bug 905892 - Clean up some geolocation #includes. rs=dougt