Merge "Fix missing #includes in cts."