Fix: some headers cleanup