Externals Xinha - Fix various 5.4 class declaration issues