Move types.h and remove unused screen.c functions