Add C++ check and fix bs header