Correct erroneous deletion of display.h

This is what I get for attempting to cherry-pick an ugly mess of patches.