Cppcheck defect: uninitialised member in c'tor, so initialise member variable (and tidy headers while there).