ifdef for includes, added checking for two not previously checked files (one
being necessary for solaris builds)
2 files changed