more header fixes, minor warning fix