Add header include missing after refactoring