2 files changed, 3 insertions, 4 deletions
diff --git a/Swiften/StringCodecs/Base64.cpp b/Swiften/StringCodecs/Base64.cpp
index d8511b4..e4eaa4e 100644
--- a/Swiften/StringCodecs/Base64.cpp
+++ b/Swiften/StringCodecs/Base64.cpp
@@ -10,7 +10,6 @@
 
 #include <Swiften/StringCodecs/Base64.h>
 #include <Swiften/Base/Algorithm.h>
-#include <Swiften/Base/SafeString.h>
 
 namespace Swift {
 
@@ -56,8 +55,8 @@ std::string Base64::encode(const ByteArray &s) {
 	return base64Encode<std::string, ByteArray>(s);
 }
 
-SafeString Base64::encode(const SafeByteArray &s) {
-	return base64Encode<SafeString, SafeByteArray>(s);
+SafeByteArray Base64::encode(const SafeByteArray &s) {
+	return base64Encode<SafeByteArray, SafeByteArray>(s);
 }
 
 ByteArray Base64::decode(const std::string& input) {
diff --git a/Swiften/StringCodecs/Base64.h b/Swiften/StringCodecs/Base64.h
index 00a290d..2d67971 100644
--- a/Swiften/StringCodecs/Base64.h
+++ b/Swiften/StringCodecs/Base64.h
@@ -16,7 +16,7 @@ namespace Swift {
 	class Base64 {
 		public:
 			static std::string encode(const ByteArray& s);
-			static SafeString encode(const SafeByteArray& s);
+			static SafeByteArray encode(const SafeByteArray& s);
 
 			static ByteArray decode(const std::string &s);
 	};