Simplify #include directives in ioutil.c, use new header checks.