Minor #include fixups, to compile on FreeBSD