Fixed header guards and newlines