@@ -299,58 +299,58 @@
 + stringWithString: (OFString*)string
 {
 	return [[[self alloc] initWithString: string] autorelease];
 }
 
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 {
 	return [[[self alloc] initWithUnicodeString: string] autorelease];
 }
 
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		byteOrder: (of_endianess_t)byteOrder
 {
 	return [[[self alloc] initWithUnicodeString: string
 					  byteOrder: byteOrder] autorelease];
 }
 
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		   length: (size_t)length
 {
 	return [[[self alloc] initWithUnicodeString: string
 					     length: length] autorelease];
 }
 
-+ stringWithUnicodeString: (of_unichar_t*)string
++ stringWithUnicodeString: (const of_unichar_t*)string
 		byteOrder: (of_endianess_t)byteOrder
 		   length: (size_t)length
 {
 	return [[[self alloc] initWithUnicodeString: string
 					  byteOrder: byteOrder
 					     length: length] autorelease];
 }
 
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 {
 	return [[[self alloc] initWithUTF16String: string] autorelease];
 }
 
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder] autorelease];
 }
 
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 		 length: (size_t)length
 {
 	return [[[self alloc] initWithUTF16String: string
 					   length: length] autorelease];
 }
 
-+ stringWithUTF16String: (uint16_t*)string
++ stringWithUTF16String: (const uint16_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 		 length: (size_t)length
 {
 	return [[[self alloc] initWithUTF16String: string
 					byteOrder: byteOrder
@@ -604,34 +604,34 @@
 	}
 
 	return self;
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 {
 	return [self initWithUnicodeString: string
 				 byteOrder: OF_ENDIANESS_NATIVE
 				    length: of_unicode_string_length(string)];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 {
 	return [self initWithUnicodeString: string
 				 byteOrder: byteOrder
 				    length: of_unicode_string_length(string)];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 		 length: (size_t)length
 {
 	return [self initWithUnicodeString: string
 				 byteOrder: OF_ENDIANESS_NATIVE
 				    length: length];
 }
 
-- initWithUnicodeString: (of_unichar_t*)string
+- initWithUnicodeString: (const of_unichar_t*)string
 	      byteOrder: (of_endianess_t)byteOrder
 		 length: (size_t)length
 {
 	self = [super init];
 
@@ -710,34 +710,34 @@
 	}
 
 	return self;
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 {
 	return [self initWithUTF16String: string
 			       byteOrder: OF_ENDIANESS_NATIVE
 				  length: of_utf16_string_length(string)];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder
 {
 	return [self initWithUTF16String: string
 			       byteOrder: byteOrder
 				  length: of_utf16_string_length(string)];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	       length: (size_t)length
 {
 	return [self initWithUTF16String: string
 			       byteOrder: OF_ENDIANESS_NATIVE
 				  length: length];
 }
 
-- initWithUTF16String: (uint16_t*)string
+- initWithUTF16String: (const uint16_t*)string
 	    byteOrder: (of_endianess_t)byteOrder
 	       length: (size_t)length
 {
 	self = [super init];