Add back missing file and include

This file was erroneously removed.