Who was the first to build a mosque around the Kaaba?

During the time of the Prophet, peace and blessings be upon him, there was no wall around the Kaaba; rather, it was surrounded by houses. Then, Umar expanded it and built a short wall around it. After that, Uthman further expanded it, followed by Abdullah ibn al-Zubayr, then Abu Ja'far al-Mansur, and then his son al-Mahdi. Abd al-Malik ibn Marwan raised its walls and roof.