Fixes for includes. (Did not compile on certain platforms.)