Thanks, Prins. Luckily I mv'ed instead of rm'ed, as without those files I could not get X to start, even after reverting the changes to the other files. The log file simply stated that it could not compile the keyboard maps, with no indication of the offending file or line.
By the way, in 10.10 they were in /var instead of /usr.
I must have done something wrong, I'm off to google what it might have been. Thanks.