Prepare for #inclusion in C++