minor changes in includes