Index: src/XMPPDiscoEntity.m
==================================================================
--- src/XMPPDiscoEntity.m
+++ src/XMPPDiscoEntity.m
@@ -85,11 +85,11 @@
 {
 	OFEnumerator *enumerator;
 	XMPPDiscoIdentity *identity;
 	OFString *feature;
 	OFMutableString *caps = [OFMutableString string];
-	OFSHA1Hash *hash = [OFSHA1Hash hash];
+	OFSHA1Hash *hash = [OFSHA1Hash cryptoHash];
 	OFDataArray *digest = [OFDataArray dataArray];
 
 	enumerator = [_identities objectEnumerator];
 	while ((identity = [enumerator nextObject]) != nil)
 		[caps appendFormat: @"%@/%@//%@<", [identity category],

Index: src/XMPPPresence.m
==================================================================
--- src/XMPPPresence.m
+++ src/XMPPPresence.m
@@ -22,10 +22,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
+#include <inttypes.h>
 
 #import "XMPPPresence.h"
 #import "namespaces.h"
 
 /* This provides us with sortable values for show values */

Index: src/XMPPSCRAMAuth.m
==================================================================
--- src/XMPPSCRAMAuth.m
+++ src/XMPPSCRAMAuth.m
@@ -199,11 +199,11 @@
 - (OFDataArray*)XMPP_parseServerFirstMessage: (OFDataArray*)data
 {
 	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;
 	OFString *comp;
 	enum {
@@ -424,11 +424,11 @@
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	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];
 		[hashI updateWithBuffer: [key items]
 				length: [key itemSize] * [key count]];

Index: src/XMPPSRVLookup.m
==================================================================
--- src/XMPPSRVLookup.m
+++ src/XMPPSRVLookup.m
@@ -24,10 +24,11 @@
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <inttypes.h>
 #include <stdlib.h>
 
 #include <assert.h>
 
 #include <arpa/inet.h>
@@ -35,11 +36,11 @@
 #include <sys/types.h>
 #include <openssl/rand.h>
 
 #import "XMPPSRVLookup.h"
 
-#import <ObjFW/OFSystemInfo.h>
+#import <ObjFW/OFLocalization.h>
 
 @implementation XMPPSRVEntry
 @synthesize priority = _priority, weight = _weight;
 @synthesize accumulatedWeight = _accumulatedWeight, port = _port;
 @synthesize target = _target;
@@ -113,11 +114,11 @@
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: [self class]];
 
 		_target = [[OFString alloc]
 		    initWithCString: buffer
-			   encoding: [OFSystemInfo native8BitEncoding]];
+			   encoding: [OFLocalization encoding]];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -190,11 +191,11 @@
 			@throw [OFAddressTranslationFailedException
 			    exceptionWithHost: _domain];
 
 		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) ||
 		    (h_errno == NO_DATA)))
 			return;

Index: src/XMPPStreamManagement.m
==================================================================
--- src/XMPPStreamManagement.m
+++ src/XMPPStreamManagement.m
@@ -17,10 +17,12 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <inttypes.h>
 
 #import "XMPPStreamManagement.h"
 #import "namespaces.h"
 
 @implementation XMPPStreamManagement