Fix headers and imports