Messing with headers for code duplicated from Eclipse due to visibility constraints.

Signed-off-by: Jody Garnett <jody.garnett@gmail.com>