Bug 14669: (RM follow-up) Ensure updated include compiles