cleanup of various include requirements