Add additional include guards that were missed.