Re #8487. Give up and put the include back in the header.

The strange thing is that my local Windows build was just fine...
Merge branch 'bugfix/8487_geometry_poco_xml_leaks' into develop