9p: some more cleanup in #include directives