Revert "attempt to work around InputIterator"

This reverts commit a0fbded5afcf0b37d0736a822d70a4d4fa166f06.
Revert "report when parsing the ruleset is finished"

This reverts commit 7923989e631215a5b503beb1a58ae507c03e1ec0.
fix order of include directories