minor changes in header inclusions