Added include that GCC doesn't require, but other platforms might.
Merge