fix bad includes after upstream catkin fix