keyboard stuff

More compiledb fixes. (#25355) master


+42 -8
3 changed files