Add missing includes (companion commit for cms-sw/cmsdist#7309)#35286

cmsbuild merged 3 commits intocms-sw:mastercms-sw/cmssw:masterfrom

iarspider-cmssw:patch-1iarspider-cmssw/cmssw:patch-1Copy head branch name to clipboard