Change in osmo-uecups[master]: Move several objects outside of main.c