Clean some includes