Add conditional includes in passenger class