Re #8359. Add more required includes.
Merge branch 'bugfix/8359_kernel_memory_leaks' into develop