diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h
index dfa608585..6e09b4347 100644
--- a/DataStructures/StaticRTree.h
+++ b/DataStructures/StaticRTree.h
@@ -890,7 +890,7 @@ class StaticRTree
 
             if (current_query_node.RepresentsTreeNode())
             {
-                const TreeNode & current_tree_node = boost::get<TreeNode>(current_query_node.node);
+                const TreeNode & current_tree_node = current_query_node.node.template get<TreeNode>();
                 if (current_tree_node.child_is_on_disk)
                 {
                     LeafNode current_leaf_node;
@@ -939,7 +939,7 @@ class StaticRTree
             {
                 ++inspected_segments;
                 // inspecting an actual road segment
-                const EdgeDataT & current_segment = boost::get<EdgeDataT>(current_query_node.node);
+                const EdgeDataT & current_segment = current_query_node.node.template get<EdgeDataT>();
 
                 // don't collect too many results from small components
                 if (number_of_results_found_in_big_cc == number_of_results && !current_segment.is_in_tiny_cc)
diff --git a/Util/BoostFileSystemFix.h b/Util/BoostFileSystemFix.h
index f64288b85..d7049cc2e 100644
--- a/Util/BoostFileSystemFix.h
+++ b/Util/BoostFileSystemFix.h
@@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "OSRMException.h"
 
-#include <boost/any.hpp>
+// #include <boost/any.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/program_options.hpp>
+// #include <boost/program_options.hpp>
 
 // This is one big workaround for latest boost renaming woes.
 
diff --git a/Util/StringUtil.h b/Util/StringUtil.h
index 49fa8bb76..3c9375ca7 100644
--- a/Util/StringUtil.h
+++ b/Util/StringUtil.h
@@ -146,6 +146,7 @@ inline std::size_t URIDecode(const std::string &input, std::string &output)
 
 inline std::size_t URIDecodeInPlace(std::string &URI) { return URIDecode(URI, URI); }
 
+// TODO: remove after switch to libosmium
 inline bool StringStartsWith(const std::string &input, const std::string &prefix)
 {
     return boost::starts_with(input, prefix);