fix changed include paths

plugins/distance_table.hpp

@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "plugin_base.hpp"
 
 #include "../algorithms/object_encoder.hpp"
-#include "../data_structures/json_container.hpp"
 #include "../data_structures/query_edge.hpp"
 #include "../data_structures/search_engine.hpp"
 #include "../descriptors/descriptor_base.hpp"
@@ -40,6 +39,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/string_util.hpp"
 #include "../Util/timing_util.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <cstdlib>
 
 #include <algorithm>

plugins/hello_world.hpp

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/cast.hpp"
 #include "../Util/json_renderer.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <string>
 
 class HelloWorldPlugin final : public BasePlugin

plugins/locate.hpp

@@ -30,10 +30,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "plugin_base.hpp"
 
-#include "../data_structures/json_container.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/string_util.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <string>
 
 // locates the nearest node in the road network for a given coordinate.

plugins/nearest.hpp

@@ -30,11 +30,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "plugin_base.hpp"
 
-#include "../data_structures/json_container.hpp"
 #include "../data_structures/phantom_node.hpp"
 #include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <string>
 
 /*

plugins/plugin_base.hpp

@@ -28,9 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef BASEPLUGIN_H_
 #define BASEPLUGIN_H_
 
-#include <osrm/Coordinate.h>
-#include <osrm/Reply.h>
-#include <osrm/RouteParameters.h>
+// remove
+#include "../Server/Http/Reply.h"
+
+#include <osrm/coordinate.hpp>
+#include <osrm/route_parameters.hpp>
 
 #include <string>
 #include <vector>

plugins/timestamp.hpp

@@ -30,9 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "plugin_base.hpp"
 
-#include "../data_structures/json_container.hpp"
 #include "../Util/json_renderer.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <string>
 
 template <class DataFacadeT> class TimestampPlugin final : public BasePlugin

plugins/viaroute.hpp

@@ -40,6 +40,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/make_unique.hpp"
 #include "../Util/simple_logger.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <cstdlib>
 
 #include <algorithm>