Add the missing headers in the new performance optimizer system.