Fix include dependencies

Some headers included other headers they didn’t
need. This is trying to reduce the dependencies
of Surface.h / Surface.cpp on the rest of the
world.

Test: compiled
Bug: not applicable
Change-Id: Ibb5de1308a387394a1367638c3b7f26b5549ce6a