some minor changes in header includes