Header support

Thanks, yobbo & i2amroy.