Codemod to improve include search paths

Also fixes #402 and #403