Comb header file inclusions

Remove unnecessary header files and try to reduce header files in header files.

Edited by Ciarán Ó Rourke