I've checked in a better fix. That is a real subtle situation using #include_next, and I don't think we have others susceptible to quite the same issue. But folks should be on the lookout for include file orders that changed. Thanks, Roland