Upgrade header to cope with new user-prefs API