included missing headers, fix bug in fs::ChangeMatch