Move a few more headers that are included only in sfx2 to sfx2

Change-Id: I8bd81a45f5ef1b76fce1563b06e05a4eefcff0ec