Fix all header defines
Merge pull request #5196

8473862 Fix all header defines (Pavel Janík)