Add some more header files for the next commit ... stay tuned ... This commit was SVN r7315.
This commit was SVN r6269.