keyboard: move includes to subdirectory