Additional includes moved to source from header.