Conversation so far:

Question: Where was Kibaki born?
Self-contained rewrite: Where was Mwai Kibaki born?