This removes more unused includes from the components already cleaned up in #37467 and #37457. Split out of #37344.