Looks good. While C++ long ago abandoned the idea that it was a perfect C compatible superset, I can't see anything in these .h files that has any danger of being interpreted differently across the two languages.