fix bad includes after upstream catkin fix
Added workaround for moveit_core/156