Fixed header import issues