Remove non-portable and unnused header includes