Modified header files to be compilable under ROS Indigo/Ubuntu 14.04