Removed (replaced with template class)
Made into template
Changed to templated includes