changes in includes and types