Fix inclusion broken from refactoring