diff --git a/src/XMPPDiscoEntity.m b/src/XMPPDiscoEntity.m
index a3806f8..6a35976 100644
--- a/src/XMPPDiscoEntity.m
+++ b/src/XMPPDiscoEntity.m
@@ -87,7 +87,7 @@
 	XMPPDiscoIdentity *identity;
 	OFString *feature;
 	OFMutableString *caps = [OFMutableString string];
-	OFSHA1Hash *hash = [OFSHA1Hash hash];
+	OFSHA1Hash *hash = [OFSHA1Hash cryptoHash];
 	OFDataArray *digest = [OFDataArray dataArray];
 
 	enumerator = [_identities objectEnumerator];
diff --git a/src/XMPPPresence.m b/src/XMPPPresence.m
index 8b28570..3f2bd6a 100644
--- a/src/XMPPPresence.m
+++ b/src/XMPPPresence.m
@@ -25,6 +25,8 @@
 # include "config.h"
 #endif
 
+#include <inttypes.h>
+
 #import "XMPPPresence.h"
 #import "namespaces.h"
 
diff --git a/src/XMPPSCRAMAuth.m b/src/XMPPSCRAMAuth.m
index a711c7e..a517369 100644
--- a/src/XMPPSCRAMAuth.m
+++ b/src/XMPPSCRAMAuth.m
@@ -201,7 +201,7 @@
 	size_t i;
 	const uint8_t *clientKey, *serverKey, *clientSignature;
 	intmax_t iterCount = 0;
-	id <OFHash> hash;
+	id <OFCryptoHash> hash;
 	OFDataArray *ret, *authMessage, *tmpArray, *salt = nil, *saltedPassword;
 	OFString *tmpString, *sNonce = nil;
 	OFEnumerator *enumerator;
@@ -426,7 +426,7 @@
 	OFDataArray *k = [OFDataArray dataArray];
 	size_t i, kSize, blockSize = [_hashType blockSize];
 	uint8_t *kI = NULL, *kO = NULL;
-	id <OFHash> hashI, hashO;
+	id <OFCryptoHash> hashI, hashO;
 
 	if ([key itemSize] * [key count] > blockSize) {
 		hashI = [[[_hashType alloc] init] autorelease];
diff --git a/src/XMPPSRVLookup.m b/src/XMPPSRVLookup.m
index 37efaa8..97822ff 100644
--- a/src/XMPPSRVLookup.m
+++ b/src/XMPPSRVLookup.m
@@ -26,6 +26,7 @@
 # include "config.h"
 #endif
 
+#include <inttypes.h>
 #include <stdlib.h>
 
 #include <assert.h>
@@ -37,7 +38,7 @@
 
 #import "XMPPSRVLookup.h"
 
-#import <ObjFW/OFSystemInfo.h>
+#import <ObjFW/OFLocalization.h>
 
 @implementation XMPPSRVEntry
 @synthesize priority = _priority, weight = _weight;
@@ -115,7 +116,7 @@
 
 		_target = [[OFString alloc]
 		    initWithCString: buffer
-			   encoding: [OFSystemInfo native8BitEncoding]];
+			   encoding: [OFLocalization encoding]];
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -192,7 +193,7 @@
 
 		answer = [self allocMemoryWithSize: pageSize];
 		answerLen = res_nsearch(&_resState, [request
-		    cStringWithEncoding: [OFSystemInfo native8BitEncoding]],
+		    cStringWithEncoding: [OFLocalization encoding]],
 		    ns_c_in, ns_t_srv, answer, (int)pageSize);
 
 		if ((answerLen == -1) && ((h_errno == HOST_NOT_FOUND) ||
diff --git a/src/XMPPStreamManagement.m b/src/XMPPStreamManagement.m
index 54083fe..30ec330 100644
--- a/src/XMPPStreamManagement.m
+++ b/src/XMPPStreamManagement.m
@@ -20,6 +20,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <inttypes.h>
+
 #import "XMPPStreamManagement.h"
 #import "namespaces.h"