r13071: Work around a really annoying compiler warning where header file