Corrected included headers to fix compilation problems on Solaris.
Corrected included headers to fix compilation problems on Solaris.

[SVN r85810]

nihildeb/hme,nihildeb/hme,nihildeb/hme,nihildeb/hme,nihildeb/hme,nihildeb/hme