Move unneeded includes out of shunting-yard.h