[Util] Removed obsolete ValueFinder.
[CL] Added missing includes.