eliminate references to ADT/iterator.h