Index: trunk/extremum_seeking/esc_ros/include/esc_ros/esc_ros.h
===================================================================
--- trunk/extremum_seeking/esc_ros/include/esc_ros/esc_ros.h	(revision 5)
+++ trunk/extremum_seeking/esc_ros/include/esc_ros/esc_ros.h	(revision 11)
@@ -18,6 +18,7 @@
 #include <esc_common/esc.h>
 #include <string>
-#include "esc_ros/monitor.h"
-#include "esc_ros/esc_w_state.h"
+#include <esc_ros/Monitors.h>
+#include <esc_ros/StateValue.h>
+
 class ESCROS{
 protected:
@@ -39,5 +40,5 @@
 protected:
 	virtual void objValCallback(std_msgs::Float32 msg);
-	virtual void objValWithStateCallback(esc_ros::esc_w_state msg);
+	virtual void objValWithStateCallback(esc_ros::StateValue msg);
 
 };