Disambiguating expression
Adding missing headers