Also, missing safeguard from multiple includes