fix inconsistencies with integer and iterator range header files, closes #1296