Rebuilt with new SDK headers