For us, that's KeywordStyleValue and CustomIdentStyleValue. CustomIdentStyleValue now has a .cpp file to reduce the number of includes in its header file.