Remove a few extra "ui.h" includes