Use the new include/Support/iterator file