minor configure clean up
small include fixups
listener count could get out of sync, leading to source staying around and possible fault

the count is now only modified in cases where the listener is actually added, a failed
fallback is not one of those.
build updates, for include tests