Added correct includes to SelectionCriteria for accessors