Re #6972. Fixing doxygen link.
Re #6972. Only window builds appear to need the includes.