untangle includes

DataStructures/JSONContainer.h

@@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define JSON_CONTAINER_H
 
 #include <variant/variant.hpp>
-#include "../Util/cast.hpp"
 
 #include <iostream>
 #include <vector>
@@ -90,7 +89,6 @@ struct Array
     std::vector<Value> values;
 };
 
-
 } // namespace JSON
 
 #endif // JSON_CONTAINER_H

Descriptors/DescriptionFactory.h

@@ -35,6 +35,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../DataStructures/TurnInstructions.h"
 #include "../typedefs.h"
 
+#include <boost/assert.hpp>
+
 #include <osrm/Coordinate.h>
 
 #include <limits>