Merge "Mode code cleaning: remove obsolete references to EXTRA_NO_HEADERS"