Use forward-declaration for Util::FileName

Remove includes, where possible.