desktop: further src file cleanup

Change-Id: I37f83084203fcc4e2f7d68f7c21774573b9281e8