Updated header guards