#JC-2020:Added missing headers