Merge "Re-hide some error.h stuff." into main