[M] Change in osmo-bsc[master]: Includes: Reorganize some enum defs