fix changed include paths

Util/DataStoreOptions.h

@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "osrm_exception.hpp"
 #include "simple_logger.hpp"
 
-#include <osrm/ServerPaths.h>
+#include <osrm/server_paths.hpp>
 
 #include <boost/any.hpp>
 #include <boost/filesystem.hpp>

Util/ProgramOptions.h

@@ -33,11 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "osrm_exception.hpp"
 #include "simple_logger.hpp"
 
-#include <osrm/ServerPaths.h>
-
 #include <boost/any.hpp>
 #include <boost/program_options.hpp>
 
+#include <osrm/server_paths.hpp>
+
 #include <fstream>
 #include <string>
 

Util/compute_angle.cpp

@@ -29,7 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "TrigonometryTables.h"
 #include "../Util/MercatorUtil.h"
-#include <osrm/Coordinate.h>
+
+#include <osrm/coordinate.hpp>
 
 #include <cmath>
 

Util/json_renderer.hpp

@@ -31,9 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_RENDERER_HPP
 #define JSON_RENDERER_HPP
 
-#include "../data_structures/json_container.hpp"
 #include "cast.hpp"
 
+#include <osrm/json_container.hpp>
+
 namespace JSON {
 
 struct Renderer : mapbox::util::static_visitor<>

Util/xml_renderer.hpp

@@ -28,9 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef XML_RENDERER_HPP
 #define XML_RENDERER_HPP
 
-#include "../data_structures/json_container.hpp"
 #include "cast.hpp"
 
+#include <osrm/json_container.hpp>
+
 namespace JSON {
 
 struct XMLToArrayRenderer : mapbox::util::static_visitor<>