Fixed double import in headers