diff --git a/Library/OSRM_impl.cpp b/Library/OSRM_impl.cpp
index 810b978d6..44547cd42 100644
--- a/Library/OSRM_impl.cpp
+++ b/Library/OSRM_impl.cpp
@@ -46,6 +46,7 @@ namespace boost { namespace interprocess { class named_mutex; } }
 #include "../Server/DataStructures/SharedBarriers.h"
 #include "../Server/DataStructures/SharedDataFacade.h"
 #include "../Util/make_unique.hpp"
+#include "../Util/ProgramOptions.h"
 #include "../Util/simple_logger.hpp"
 
 #include <boost/assert.hpp>
diff --git a/Server/DataStructures/InternalDataFacade.h b/Server/DataStructures/InternalDataFacade.h
index 357edf9ca..77432d33d 100644
--- a/Server/DataStructures/InternalDataFacade.h
+++ b/Server/DataStructures/InternalDataFacade.h
@@ -41,10 +41,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../DataStructures/RangeTable.h"
 #include "../../Util/BoostFileSystemFix.h"
 #include "../../Util/GraphLoader.h"
-#include "../../Util/ProgramOptions.h"
 #include "../../Util/simple_logger.hpp"
 
 #include <osrm/Coordinate.h>
+#include <osrm/ServerPaths.h>
 
 template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<EdgeDataT>
 {
@@ -396,9 +396,9 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
                                             const unsigned zoom_level) final
     {
         std::vector<PhantomNode> resulting_phantom_node_vector;
-        auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate, 
-                                                              resulting_phantom_node_vector, 
-                                                              zoom_level, 
+        auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
+                                                              resulting_phantom_node_vector,
+                                                              zoom_level,
                                                               1);
         if (result)
         {
diff --git a/Server/DataStructures/SharedDataFacade.h b/Server/DataStructures/SharedDataFacade.h
index 779813eae..785872c55 100644
--- a/Server/DataStructures/SharedDataFacade.h
+++ b/Server/DataStructures/SharedDataFacade.h
@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../DataStructures/StaticGraph.h"
 #include "../../DataStructures/StaticRTree.h"
 #include "../../Util/BoostFileSystemFix.h"
-#include "../../Util/ProgramOptions.h"
 #include "../../Util/make_unique.hpp"
 #include "../../Util/simple_logger.hpp"
 
@@ -389,9 +388,9 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
                                             const unsigned zoom_level) final
     {
         std::vector<PhantomNode> resulting_phantom_node_vector;
-        auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate, 
-                                                              resulting_phantom_node_vector, 
-                                                              zoom_level, 
+        auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
+                                                              resulting_phantom_node_vector,
+                                                              zoom_level,
                                                               1);
         if (result)
         {