Headers

Objective-C++ headers fix