Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -85,11 +85,11 @@
  *
  * \param objects A C array of objects
  * \param length The length of the C array
  * \return A new autoreleased OFArray
  */
-+ arrayWithObjects: (id*)objects
++ arrayWithObjects: (id const*)objects
 	     count: (size_t)count;
 
 /**
  * \brief Initializes an OFArray with the specified object.
  *
@@ -130,11 +130,11 @@
  *
  * \param objects A C array of objects
  * \param length The length of the C array
  * \return An initialized OFArray
  */
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count;
 
 /**
  * \brief Returns a specified object of the array.
  *

Index: src/OFArray.m
==================================================================
--- src/OFArray.m
+++ src/OFArray.m
@@ -73,11 +73,11 @@
 - initWithArray: (OFArray*)array
 {
 	return (id)[[OFArray_adjacent alloc] initWithArray: array];
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	return (id)[[OFArray_adjacent alloc] initWithObjects: objects
 						       count: count];
 }
@@ -150,11 +150,11 @@
 + arrayWithArray: (OFArray*)array
 {
 	return [[[self alloc] initWithArray: array] autorelease];
 }
 
-+ arrayWithObjects: (id*)objects
++ arrayWithObjects: (id const*)objects
 	     count: (size_t)count
 {
 	return [[[self alloc] initWithObjects: objects
 					count: count] autorelease];
 }
@@ -204,11 +204,11 @@
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c

Index: src/OFArray_adjacent.m
==================================================================
--- src/OFArray_adjacent.m
+++ src/OFArray_adjacent.m
@@ -119,11 +119,11 @@
 	}
 
 	return self;
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	self = [self init];
 
 	@try {

Index: src/OFCountedSet.m
==================================================================
--- src/OFCountedSet.m
+++ src/OFCountedSet.m
@@ -59,11 +59,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	return (id)[[OFCountedSet_hashtable alloc] initWithObjects: objects
 							     count: count];
 }

Index: src/OFCountedSet_hashtable.m
==================================================================
--- src/OFCountedSet_hashtable.m
+++ src/OFCountedSet_hashtable.m
@@ -92,11 +92,11 @@
 	}
 
 	return self;
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	self = [self init];
 
 	@try {

Index: src/OFDictionary.h
==================================================================
--- src/OFDictionary.h
+++ src/OFDictionary.h
@@ -89,12 +89,12 @@
  * \param keys An array of keys
  * \param objects An array of objects
  * \param count The number of objects in the arrays
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithObjects: (id*)objects
-		forKeys: (id*)keys
++ dictionaryWithObjects: (id const*)objects
+		forKeys: (id const*)keys
 		  count: (size_t)count;
 
 /**
  * \brief Creates a new OFDictionary with the specified keys objects.
  *
@@ -148,12 +148,12 @@
  * \param keys An array of keys
  * \param objects An array of objects
  * \param count The number of objects in the arrays
  * \return A new initialized OFDictionary
  */
-- initWithObjects: (id*)objects
-	  forKeys: (id*)keys
+- initWithObjects: (id const*)objects
+	  forKeys: (id const*)keys
 	    count: (size_t)count;
 
 /**
  * \brief Initializes an already allocated OFDictionary with the specified keys
  *	  and objects.

Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -58,12 +58,12 @@
 {
 	return (id)[[OFDictionary_hashtable alloc] initWithObjects: objects
 							   forKeys: keys];
 }
 
-- initWithObjects: (id*)objects
-	  forKeys: (id*)keys
+- initWithObjects: (id const*)objects
+	  forKeys: (id const*)keys
 	    count: (size_t)count
 {
 	return (id)[[OFDictionary_hashtable alloc] initWithObjects: objects
 							   forKeys: keys
 							     count: count];
@@ -154,12 +154,12 @@
 {
 	return [[[self alloc] initWithObjects: objects
 				      forKeys: keys] autorelease];
 }
 
-+ dictionaryWithObjects: (id*)objects
-		forKeys: (id*)keys
++ dictionaryWithObjects: (id const*)objects
+		forKeys: (id const*)keys
 		  count: (size_t)count
 {
 	return [[[self alloc] initWithObjects: objects
 				      forKeys: keys
 					count: count] autorelease];
@@ -211,12 +211,12 @@
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithObjects: (id*)objects
-	  forKeys: (id*)keys
+- initWithObjects: (id const*)objects
+	  forKeys: (id const*)keys
 	    count: (size_t)count
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c

Index: src/OFDictionary_hashtable.m
==================================================================
--- src/OFDictionary_hashtable.m
+++ src/OFDictionary_hashtable.m
@@ -251,12 +251,12 @@
 	}
 
 	return ret;
 }
 
-- initWithObjects: (id*)objects
-	  forKeys: (id*)keys
+- initWithObjects: (id const*)objects
+	  forKeys: (id const*)keys
 	    count: (size_t)count_
 {
 	self = [super init];
 
 	@try {

Index: src/OFMutableArray.m
==================================================================
--- src/OFMutableArray.m
+++ src/OFMutableArray.m
@@ -106,11 +106,11 @@
 - initWithArray: (OFArray*)array
 {
 	return (id)[[OFMutableArray_adjacent alloc] initWithArray: array];
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	return (id)[[OFMutableArray_adjacent alloc] initWithObjects: objects
 							      count: count];
 }

Index: src/OFMutableDictionary.m
==================================================================
--- src/OFMutableDictionary.m
+++ src/OFMutableDictionary.m
@@ -53,12 +53,12 @@
 	return (id)[[OFMutableDictionary_hashtable alloc]
 	    initWithObjects: objects
 		    forKeys: keys];
 }
 
-- initWithObjects: (id*)objects
-	  forKeys: (id*)keys
+- initWithObjects: (id const*)objects
+	  forKeys: (id const*)keys
 	    count: (size_t)count
 {
 	return (id)[[OFMutableDictionary_hashtable alloc]
 	    initWithObjects: objects
 		    forKeys: keys

Index: src/OFMutableSet.m
==================================================================
--- src/OFMutableSet.m
+++ src/OFMutableSet.m
@@ -58,11 +58,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	return (id)[[OFMutableSet_hashtable alloc] initWithObjects: objects
 							     count: count];
 }

Index: src/OFSet.h
==================================================================
--- src/OFSet.h
+++ src/OFSet.h
@@ -75,11 +75,11 @@
  *
  * \param objects An array of objects for the set
  * \param count The number of objects in the specified array
  * \return A new, autoreleased set with the specified objects
  */
-+ setWithObjects: (id*)objects
++ setWithObjects: (id const*)objects
 	   count: (size_t)count;
 
 /**
  * \brief Initializes an already allocated set with the specified set.
  *
@@ -109,11 +109,11 @@
  *
  * \param objects An array of objects for the set
  * \param count The number of objects in the specified array
  * \return An initialized set with the specified objects
  */
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count;
 
 /**
  * \brief Initializes an already allocated set with the specified object and
  *	  va_list.

Index: src/OFSet.m
==================================================================
--- src/OFSet.m
+++ src/OFSet.m
@@ -58,11 +58,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	return (id)[[OFSet_hashtable alloc] initWithObjects: objects
 						      count: count];
 }
@@ -142,11 +142,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-+ setWithObjects: (id*)objects
++ setWithObjects: (id const*)objects
 	   count: (size_t)count
 {
 	return [[[self alloc] initWithObjects: objects
 					count: count] autorelease];
 }
@@ -190,11 +190,11 @@
 	va_end(arguments);
 
 	return ret;
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	Class c = isa;
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c

Index: src/OFSet_hashtable.m
==================================================================
--- src/OFSet_hashtable.m
+++ src/OFSet_hashtable.m
@@ -95,11 +95,11 @@
 	}
 
 	return self;
 }
 
-- initWithObjects: (id*)objects
+- initWithObjects: (id const*)objects
 	    count: (size_t)count
 {
 	self = [self init];
 
 	@try {