Small patch to used the more appropraite c++ style header