Fixing more header merge issues