Fix header including to avoid confusion: headers only included where they are needed

Fix header including to avoid confusion: headers only included where they are needed #900