Update for new include semantics.