Put back the 'XF86' prefix

Removing that prefix creates at least one collision between "Q" and
"XF86Q". Additionally we removed the 'xproto' dependency as it causes
problems for people having an older 'keysymdef.h' than mine.