Without these changes, minor changes in include file ordering or extent elsewhere can cause compiler errors.