Changes that improve progress towards linux (non-ROS) compilation.