Fix CNFSFile test compile

Let's deep grep next time we rename headers!
Fix compile of CharsetConverter tests.