Changes to remove C++ code in headers to allow use in Swift.