Merge topic 'C++-headers'

6f4727aaa0 Source: Replace C headers with C++ ones

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6657