Some unneeded includes cleanup