Upgraded query tools to allow single-pass query string & bind variable building (BaseSqlite3Impl::QueryCriteria)
cleaned up include