Changed several definition headers.
Modified the incorrect format of the definition header.
Merge pull request #3151 from gyohk/master

Changed several definition headers.