Changed several definition headers.