Interpolator has become external to prevent the need for mutexes too often.
Removed some unneeded includes