Include some more headers so that the code compiles with GCC/G++ 4.4 20090102.
Authored by: gavare 2019-06-07
Parent: [r5369]
Child: [r5371]
