Try another flag for C++.
Fix lack of headers.