One more try to fix the complaint about doubly listed headers