Remove inclusion of header files that we can't rely on due to portability