Fixing the Linux build.

6 files changed