remove redundant headers
fix "extern" symbol table clash