Updated header guarding