Add missing header for XC5
Merge branch 'master' into XPC