Index: src/OFHTTPServer.h
==================================================================
--- src/OFHTTPServer.h
+++ src/OFHTTPServer.h
@@ -23,11 +23,14 @@
 @class OFException;
 
 /*!
  * @brief A delegate for OFHTTPServer.
  */
-@protocol OFHTTPServerDelegate <OFObject>
+@protocol OFHTTPServerDelegate
+#ifndef OF_HTTP_SERVER_M
+    <OFObject>
+#endif
 /*!
  * @brief This method is called when the HTTP server received a request from a
  *	  client.
  *
  * @param server The HTTP server which received the request

Index: src/OFHTTPServer.m
==================================================================
--- src/OFHTTPServer.m
+++ src/OFHTTPServer.m
@@ -14,10 +14,12 @@
  * file.
  */
 
 #include "config.h"
 
+#define OF_HTTP_SERVER_M
+
 #include <string.h>
 #include <ctype.h>
 
 #import "OFHTTPServer.h"
 #import "OFDataArray.h"
@@ -138,11 +140,11 @@
 
 static OF_INLINE OFString*
 normalized_key(OFString *key)
 {
 	char *cString = strdup([key UTF8String]);
-	char *tmp = cString;
+	uint8_t *tmp = (uint8_t*)cString;
 	BOOL firstLetter = YES;
 
 	if (cString == NULL)
 		@throw [OFOutOfMemoryException
 		    exceptionWithClass: nil
@@ -463,11 +465,11 @@
 			didReceiveRequest: request];
 
 	if (reply == nil) {
 		[self sendErrorAndClose: 500];
 		@throw [OFInvalidArgumentException
-		    exceptionWithClass: [[server delegate] class]
+		    exceptionWithClass: [(id)[server delegate] class]
 			      selector: @selector(server:didReceiveRequest:)];
 	}
 
 	replyHeaders = [reply headers];
 	replyData = [reply data];