THIS WAS A BUG.  Fixed this missing include along the way...