--- a/dstep/foundation/NSMapTable_bindings.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSMapTable_bindings.d	Sun Jan 03 22:06:11 2010 +0100
@@ -1,39 +1,28 @@
 module dstep.foundation.NSMapTable_bindings;
 
-import dstep.foundation.NSArray;
-import dstep.foundation.NSDictionary;
-import dstep.foundation.NSEnumerator;
 import dstep.foundation.NSMapTable;
-import dstep.foundation.NSPointerFunctions;
-import dstep.foundation.NSString;
+import dstep.foundation.NSObjCRuntime;
+import dstep.foundation.NSZone;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
-
+import dstep.objc.objc;
 
 extern (C)
 {
-	extern
-	{
-	}
-}
-
-extern (C)
-{
-	private void NSFreeMapTable (id table);
-	private void NSResetMapTable (id table);
-	private bool NSCompareMapTables (id table1, id table2);
-	private id NSCopyMapTableWithZone (id table, NSZone* zone);
-	private bool NSMapMember (id table, void* key, void** originalKey, void** value);
-	private void* NSMapGet (id table, void* key);
-	private void NSMapInsert (id table, void* key, void* value);
-	private void NSMapInsertKnownAbsent (id table, void* key, void* value);
-	private void* NSMapInsertIfAbsent (id table, void* key, void* value);
-	private void NSMapRemove (id table, void* key);
-	private NSMapEnumerator NSEnumerateMapTable (id table);
-	private NSUInteger NSCountMapTable (id table);
-	private id NSStringFromMapTable (id table);
-	private id NSAllMapTableKeys (id table);
-	private id NSAllMapTableValues (id table);
-	private id NSCreateMapTableWithZone (NSMapTableKeyCallBacks keyCallBacks, NSMapTableValueCallBacks valueCallBacks, NSUInteger capacity, NSZone* zone);
-	private id NSCreateMapTable (NSMapTableKeyCallBacks keyCallBacks, NSMapTableValueCallBacks valueCallBacks, NSUInteger capacity);
+	package void NSFreeMapTable (id table);
+	package void NSResetMapTable (id table);
+	package bool NSCompareMapTables (id table1, id table2);
+	package id NSCopyMapTableWithZone (id table, NSZone* zone);
+	package bool NSMapMember (id table, void* key, void** originalKey, void** value);
+	package void* NSMapGet (id table, void* key);
+	package void NSMapInsert (id table, void* key, void* value);
+	package void NSMapInsertKnownAbsent (id table, void* key, void* value);
+	package void* NSMapInsertIfAbsent (id table, void* key, void* value);
+	package void NSMapRemove (id table, void* key);
+	package NSMapEnumerator NSEnumerateMapTable (id table);
+	package NSUInteger NSCountMapTable (id table);
+	package id NSStringFromMapTable (id table);
+	package id NSAllMapTableKeys (id table);
+	package id NSAllMapTableValues (id table);
+	package id NSCreateMapTableWithZone (NSMapTableKeyCallBacks keyCallBacks, NSMapTableValueCallBacks valueCallBacks, NSUInteger capacity, NSZone* zone);
+	package id NSCreateMapTable (NSMapTableKeyCallBacks keyCallBacks, NSMapTableValueCallBacks valueCallBacks, NSUInteger capacity);
 }
\ No newline at end of file