bond: fix headers for C++