Revert r20381 as two header files are "special". This commit was SVN r20382. The following SVN revision numbers were found above: r20381 --> open-mpi/ompi@25b25aef41