Remove a few obsolete header includes (fixes a compile error on solaris)