Header cleanup (REnamer, f222781)

Remove redundant import (covered by prefix header) and move class header import into implementation file.

Signed-off-by: Greg Hurrell <greg@hurrell.net>