Fixes for missing platform files.
Merge pull request #1501 from seanpaultaylor/next

Fixes for missing platform files.