Remove obsolete includes