Rebuilt for new SDK headers