fix remaining include directives, and i2c CLID