diff --git a/lib/encryption.cpp b/lib/encryption.cpp
index 5e5b6df9..58cdbfd8 100644
--- a/lib/encryption.cpp
+++ b/lib/encryption.cpp
@@ -9,7 +9,7 @@
 #include "defines.h"
 #include "bitfields.h"
 #include "http_parser.h"
-#include "base64.h"
+#include "encode.h"
 #include "nal.h"/*LTS*/
 #include <sstream>
 
diff --git a/src/input/input_dtsccrypt.cpp b/src/input/input_dtsccrypt.cpp
index 903e28bf..602e739e 100644
--- a/src/input/input_dtsccrypt.cpp
+++ b/src/input/input_dtsccrypt.cpp
@@ -5,7 +5,7 @@
 #include <cstdio>
 #include <string>
 #include <mist/stream.h>
-#include <mist/base64.h>
+#include <mist/encode.h>
 #include <mist/defines.h>
 #include <mist/encryption.h>
 #include <mist/bitfields.h>
@@ -53,14 +53,14 @@ namespace Mist {
   }
 
   bool inputDTSC::setup() {
-    key = Base64::decode(config->getString("key"));
+    key = Encodings::Base64::decode(config->getString("key"));
     if (key == ""){
       if (config->getString("keyseed") == "" || config->getString("keyid") == ""){
         std::cerr << "No key given, and no keyseed/keyid geven" << std::endl;
         return false;
       }
-      std::string tmpSeed = Base64::decode(config->getString("keyseed"));
-      std::string tmpID = Base64::decode(config->getString("keyid"));
+      std::string tmpSeed = Encodings::Base64::decode(config->getString("keyseed"));
+      std::string tmpID = Encodings::Base64::decode(config->getString("keyid"));
       std::string guid = Encryption::PR_GuidToByteArray(tmpID);
       key = Encryption::PR_GenerateContentKey(tmpSeed, guid);
     }
diff --git a/src/io.cpp b/src/io.cpp
index 4b433914..d59a8b3a 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -1,7 +1,7 @@
 #include <mist/stream.h>
 #include <mist/json.h>
 #include <mist/auth.h>
-#include <mist/base64.h>
+#include <mist/encode.h>
 #include <mist/bitfields.h>
 #include <cstdlib>
 #include "io.h"
@@ -41,8 +41,8 @@ namespace Mist {
       vmData.keyid = cfg.isMember("keyid")?cfg["keyid"].asString():"";
       vmData.keyseed = cfg.isMember("keyseed")?cfg["keyseed"].asString():"";
       if (vmData.keyid != "" && vmData.keyseed != ""){
-        vmData.keyid = Base64::decode(vmData.keyid);
-        vmData.keyseed = Base64::decode(vmData.keyseed);
+        vmData.keyid = Encodings::Base64::decode(vmData.keyid);
+        vmData.keyseed = Encodings::Base64::decode(vmData.keyseed);
         vmData.key = Encryption:: PR_GenerateContentKey(vmData.keyseed, vmData.keyid);
         vmData.laurl = cfg.isMember("la_url")?cfg["la_url"].asString():"";
       }
diff --git a/src/output/output_hss.cpp b/src/output/output_hss.cpp
index e6efc76f..65cc650e 100644
--- a/src/output/output_hss.cpp
+++ b/src/output/output_hss.cpp
@@ -368,7 +368,7 @@ namespace Mist {
     resGen << (char)((tmp.size()) & 0xFF);
     resGen << (char)(((tmp.size()) >> 8) & 0xFF);
     resGen << tmp;
-    return Base64::encode(resGen.str());
+    return Encodings::Base64::encode(resGen.str());
   }
   /*LTS-END*/
 
diff --git a/src/output/output_rtsp.cpp b/src/output/output_rtsp.cpp
index 6c8907e2..57446dc8 100644
--- a/src/output/output_rtsp.cpp
+++ b/src/output/output_rtsp.cpp
@@ -1,6 +1,6 @@
 #include <mist/defines.h>
 #include <mist/auth.h>
-#include <mist/base64.h>
+#include <mist/encode.h>
 #include <mist/stream.h>
 #include "output_rtsp.h"
 
@@ -249,9 +249,9 @@ namespace Mist {
         << std::hex << std::setw(2) << std::setfill('0') << (int)objIt->second.init.data()[1] << std::dec << "E0"
         << std::hex << std::setw(2) << std::setfill('0') << (int)objIt->second.init.data()[3] << std::dec << ";"
         "sprop-parameter-sets="
-        << Base64::encode(std::string(avccbox.getSPS(), avccbox.getSPSLen()))
+        << Encodings::Base64::encode(std::string(avccbox.getSPS(), avccbox.getSPSLen()))
         << ","
-        << Base64::encode(std::string(avccbox.getPPS(), avccbox.getPPSLen()))
+        << Encodings::Base64::encode(std::string(avccbox.getPPS(), avccbox.getPPSLen()))
         << "\r\n"
         "a=framerate:" << ((double)objIt->second.fpks)/1000.0 << "\r\n"
         "a=control:track" << objIt->second.trackID << "\r\n";