Fixed issue with function calls to orcWbiUtil and other header references