[12664] More missing includes