r25301: Merge my includes.h cleanups.