Imports & Error in Annotation headers

See comments.



Signed-off-by: Peter Kriens <peter.kriens@aqute.biz>