trimmed up some includes and more io.h fixes