diff --git a/include/engine/object_encoder.hpp b/include/engine/base64.hpp
similarity index 96%
rename from include/engine/object_encoder.hpp
rename to include/engine/base64.hpp
index 00a1d21c1..811ef9308 100644
--- a/include/engine/object_encoder.hpp
+++ b/include/engine/base64.hpp
@@ -1,5 +1,5 @@
-#ifndef OBJECT_ENCODER_HPP
-#define OBJECT_ENCODER_HPP
+#ifndef OSRM_BASE64_HPP
+#define OSRM_BASE64_HPP
 
 #include <boost/assert.hpp>
 #include <boost/archive/iterators/base64_from_binary.hpp>
@@ -88,4 +88,4 @@ template <typename T> T decodeBase64(std::string encoded)
 } // ns engine
 } // ns osrm
 
-#endif /* OBJECT_ENCODER_HPP */
+#endif /* OSRM_BASE64_HPP */
diff --git a/include/engine/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp
index 06404e62f..f73dcc612 100644
--- a/include/engine/plugins/viaroute.hpp
+++ b/include/engine/plugins/viaroute.hpp
@@ -5,7 +5,6 @@
 #include "engine/plugins/plugin_base.hpp"
 #include "engine/api/route_api.hpp"
 
-#include "engine/object_encoder.hpp"
 #include "engine/search_engine_data.hpp"
 #include "engine/routing_algorithms/shortest_path.hpp"
 #include "engine/routing_algorithms/alternative_path.hpp"
diff --git a/src/engine/hint.cpp b/src/engine/hint.cpp
index c3fd4ac0a..b00b2aad8 100644
--- a/src/engine/hint.cpp
+++ b/src/engine/hint.cpp
@@ -1,5 +1,5 @@
 #include "engine/hint.hpp"
-#include "engine/object_encoder.hpp"
+#include "engine/base64.hpp"
 #include "engine/datafacade/datafacade_base.hpp"
 
 #include <boost/assert.hpp>
diff --git a/src/engine/plugins/match.cpp b/src/engine/plugins/match.cpp
index f115a822d..777bdc814 100644
--- a/src/engine/plugins/match.cpp
+++ b/src/engine/plugins/match.cpp
@@ -4,7 +4,6 @@
 #include "engine/map_matching/bayes_classifier.hpp"
 #include "engine/api/match_parameters.hpp"
 #include "engine/api/match_api.hpp"
-#include "engine/object_encoder.hpp"
 #include "util/coordinate_calculation.hpp"
 #include "util/integer_range.hpp"
 #include "util/json_logger.hpp"
diff --git a/src/engine/plugins/table.cpp b/src/engine/plugins/table.cpp
index cb64a423c..2d13e1051 100644
--- a/src/engine/plugins/table.cpp
+++ b/src/engine/plugins/table.cpp
@@ -2,7 +2,6 @@
 
 #include "engine/api/table_parameters.hpp"
 #include "engine/api/table_api.hpp"
-#include "engine/object_encoder.hpp"
 #include "engine/routing_algorithms/many_to_many.hpp"
 #include "engine/search_engine_data.hpp"
 #include "util/string_util.hpp"
diff --git a/src/engine/plugins/viaroute.cpp b/src/engine/plugins/viaroute.cpp
index e57580b6c..dff0c8f1a 100644
--- a/src/engine/plugins/viaroute.cpp
+++ b/src/engine/plugins/viaroute.cpp
@@ -1,7 +1,6 @@
 #include "engine/plugins/viaroute.hpp"
 #include "engine/datafacade/datafacade_base.hpp"
 #include "engine/api/route_api.hpp"
-#include "engine/object_encoder.hpp"
 #include "engine/status.hpp"
 
 #include "util/for_each_pair.hpp"
diff --git a/unit_tests/engine/base64.cpp b/unit_tests/engine/base64.cpp
new file mode 100644
index 000000000..16749dc3f
--- /dev/null
+++ b/unit_tests/engine/base64.cpp
@@ -0,0 +1,12 @@
+#include "engine/base64.hpp"
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+
+BOOST_AUTO_TEST_SUITE(base64)
+
+BOOST_AUTO_TEST_CASE(encoding) {}
+
+BOOST_AUTO_TEST_CASE(decoding) {}
+
+BOOST_AUTO_TEST_SUITE_END()