--- a/dstep/foundation/NSHashTable_bindings.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSHashTable_bindings.d	Sun Jan 03 22:06:11 2010 +0100
@@ -1,37 +1,25 @@
 module dstep.foundation.NSHashTable_bindings;
 
-import dstep.foundation.NSArray;
-import dstep.foundation.NSEnumerator;
 import dstep.foundation.NSHashTable;
-import dstep.foundation.NSPointerFunctions;
-import dstep.foundation.NSSet;
-import dstep.foundation.NSString;
-import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
-
+import dstep.foundation.NSObjCRuntime;
+import dstep.foundation.NSZone;
+import dstep.objc.objc;
 
 extern (C)
 {
-	extern
-	{
-	}
-}
-
-extern (C)
-{
-	private void NSFreeHashTable (id table);
-	private void NSResetHashTable (id table);
-	private bool NSCompareHashTables (id table1, id table2);
-	private id NSCopyHashTableWithZone (id table, NSZone* zone);
-	private void* NSHashGet (id table, void* pointer);
-	private void NSHashInsert (id table, void* pointer);
-	private void NSHashInsertKnownAbsent (id table, void* pointer);
-	private void* NSHashInsertIfAbsent (id table, void* pointer);
-	private void NSHashRemove (id table, void* pointer);
-	private NSHashEnumerator NSEnumerateHashTable (id table);
-	private NSUInteger NSCountHashTable (id table);
-	private id NSStringFromHashTable (id table);
-	private id NSAllHashTableObjects (id table);
-	private id NSCreateHashTableWithZone (NSHashTableCallBacks callBacks, NSUInteger capacity, NSZone* zone);
-	private id NSCreateHashTable (NSHashTableCallBacks callBacks, NSUInteger capacity);
+	package void NSFreeHashTable (id table);
+	package void NSResetHashTable (id table);
+	package bool NSCompareHashTables (id table1, id table2);
+	package id NSCopyHashTableWithZone (id table, NSZone* zone);
+	package void* NSHashGet (id table, void* pointer);
+	package void NSHashInsert (id table, void* pointer);
+	package void NSHashInsertKnownAbsent (id table, void* pointer);
+	package void* NSHashInsertIfAbsent (id table, void* pointer);
+	package void NSHashRemove (id table, void* pointer);
+	package NSHashEnumerator NSEnumerateHashTable (id table);
+	package NSUInteger NSCountHashTable (id table);
+	package id NSStringFromHashTable (id table);
+	package id NSAllHashTableObjects (id table);
+	package id NSCreateHashTableWithZone (NSHashTableCallBacks callBacks, NSUInteger capacity, NSZone* zone);
+	package id NSCreateHashTable (NSHashTableCallBacks callBacks, NSUInteger capacity);
 }
\ No newline at end of file