Using public headers where possible