Thanks for posting your detailed description of how to modify Xvkbd. It will be of benefit to anyone wanting to go down this route. One minor point of clarification however concerning:
#include "XVkbd-common"
I'm not sure why it begins with the # sign.
Once you “un-comment