More #define rebase issues in lp_screen.c