properly-prefixed static-component.h files. This commit was SVN r6342.
This commit was SVN r6322.
This commit was SVN r6269.