Clean up #include files and repl IO