remove some unneeded header includes