diff --git a/Algorithms/ObjectToBase64.h b/Algorithms/object_encoder.hpp
similarity index 97%
rename from Algorithms/ObjectToBase64.h
rename to Algorithms/object_encoder.hpp
index 6930b9c2c..64c03c1be 100644
--- a/Algorithms/ObjectToBase64.h
+++ b/Algorithms/object_encoder.hpp
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef OBJECT_TO_BASE64_H_
-#define OBJECT_TO_BASE64_H_
+#ifndef OBJECT_ENCODER_HPP
+#define OBJECT_ENCODER_HPP
 
 #include "../Util/StringUtil.h"
 
@@ -91,4 +91,4 @@ struct ObjectEncoder
     }
 };
 
-#endif /* OBJECT_TO_BASE64_H_ */
+#endif /* OBJECT_ENCODER_HPP */
diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h
index b8ce47e16..e562e4158 100644
--- a/Descriptors/JSONDescriptor.h
+++ b/Descriptors/JSONDescriptor.h
@@ -30,13 +30,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BaseDescriptor.h"
 #include "DescriptionFactory.h"
-#include "../Algorithms/ObjectToBase64.h"
+#include "../Algorithms/object_encoder.hpp"
 #include "../Algorithms/ExtractRouteNames.h"
 #include "../DataStructures/JSONContainer.h"
 #include "../DataStructures/Range.h"
 #include "../DataStructures/SegmentInformation.h"
 #include "../DataStructures/TurnInstructions.h"
 #include "../Util/Azimuth.h"
+#include "../Util/json_renderer.hpp"
 #include "../Util/simple_logger.hpp"
 #include "../Util/StringUtil.h"
 #include "../Util/TimingUtil.h"
diff --git a/Plugins/DistanceTablePlugin.h b/Plugins/DistanceTablePlugin.h
index a5cd8c807..329936fcd 100644
--- a/Plugins/DistanceTablePlugin.h
+++ b/Plugins/DistanceTablePlugin.h
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BasePlugin.h"
 
-#include "../Algorithms/ObjectToBase64.h"
+#include "../Algorithms/object_encoder.hpp"
 #include "../DataStructures/JSONContainer.h"
 #include "../DataStructures/QueryEdge.h"
 #include "../DataStructures/SearchEngine.h"
diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h
index 428b2abe2..2164efed3 100644
--- a/Plugins/ViaRoutePlugin.h
+++ b/Plugins/ViaRoutePlugin.h
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "BasePlugin.h"
 
-#include "../Algorithms/ObjectToBase64.h"
+#include "../Algorithms/object_encoder.hpp"
 #include "../DataStructures/Range.h"
 #include "../DataStructures/SearchEngine.h"
 #include "../Descriptors/BaseDescriptor.h"