Latest SDK version, header cleanup