fix bad includes in recent trigonometric changes