Missed these moves & includes
(should really add some proper unittests)