Removing obsolete includes