Re-add SDI and muiaros headers to make backporting to NList's