avoid #include confusion. This commit was SVN r6839.
This commit was SVN r6836.
This commit was SVN r6272.