Rbuild changes for include structure change.