Header change to fix include issues