am eae38344: Fix C headers for all platforms.

Merge commit 'eae38344a15b28c9a6f5c77b7c326776af06aad7' into kraken

* commit 'eae38344a15b28c9a6f5c77b7c326776af06aad7':
  Fix C headers for all platforms.