Changes necessary to compile C++ headers on Linux.

Build fails for me without these changes.