...and add the missing #include lines. While here, fix up the dependencies. Approved by: portmgr@ (just-fix-it blanket approvals) PR: 291316