fix some more header includes