Update includes to add new required headers