o Add include-guards to new includes.