Index: src/OFDictionary_hashtable.m
==================================================================
--- src/OFDictionary_hashtable.m
+++ src/OFDictionary_hashtable.m
@@ -58,17 +58,17 @@
 equal(void *value1, void *value2)
 {
 	return [(id)value1 isEqual: (id)value2];
 }
 
-static of_map_table_functions_t keyFunctions = {
+static const of_map_table_functions_t keyFunctions = {
 	.retain = copy,
 	.release = release,
 	.hash = hash,
 	.equal = equal
 };
-static of_map_table_functions_t valueFunctions = {
+static const of_map_table_functions_t valueFunctions = {
 	.retain = retain,
 	.release = release,
 	.hash = hash,
 	.equal = equal
 };

Index: src/OFSet_hashtable.m
==================================================================
--- src/OFSet_hashtable.m
+++ src/OFSet_hashtable.m
@@ -50,17 +50,17 @@
 equal(void *value1, void *value2)
 {
 	return [(id)value1 isEqual: (id)value2];
 }
 
-static of_map_table_functions_t keyFunctions = {
+static const of_map_table_functions_t keyFunctions = {
 	.retain = retain,
 	.release = release,
 	.hash = hash,
 	.equal = equal
 };
-static of_map_table_functions_t valueFunctions = { 0 };
+static const of_map_table_functions_t valueFunctions = { 0 };
 
 @implementation OFSet_hashtable
 - init
 {
 	return [self initWithCapacity: 0];