Refactoring patches

[Richard Kimberly Heck]

On 10/13/20 3:09 AM, Yuriy Skalko wrote:
>> Yes. We'll deal with the rest later. 
>> Pavel
> Done at 2a594d3.
>
> The .cpp changing part (for future applying) is in attached patch.

Suggestion: Let's see if we can get people on different platforms and
with different compilers to try the patch. As has already been said, we
do occasionally run into cases where includes are needed sometimes but
not others.

Me: Fedora 31, gcc 9.3.1, all is well.

Riki