Fix include guards for ROS, needs cleanups