Move code to prepare for GPU interface rework

This is pure renaming, so hopefully rebases work better. Two of the
header files were being explicitly removed from the set installed, but
now that these headers are no longer in legacyheaders, this issue is
resolved.

Change-Id: I5bbc89c2e52e0d92704896c48eeed5d9c00fd61a