rework more XPCU code. INT_* still needs to be moved
Impressum, Datenschutz