2 files changed, 9 insertions, 12 deletions
diff --git a/src/core/basetypes/MCHashMap.cc b/src/core/basetypes/MCHashMap.cc
index 164198f5..524221fa 100644
--- a/src/core/basetypes/MCHashMap.cc
+++ b/src/core/basetypes/MCHashMap.cc
@@ -10,15 +10,6 @@
 
 using namespace mailcore;
 
-namespace mailcore {
-    struct HashMapCell {
-        unsigned int func;
-        Object * key;
-        Object * value;
-        HashMapCell * next;
-    };
-}
-
 #define CHASH_DEFAULTSIZE 13
 #define CHASH_MAXDEPTH    3
 
diff --git a/src/core/basetypes/MCHashMap.h b/src/core/basetypes/MCHashMap.h
index 40751b8e..75bcab47 100644
--- a/src/core/basetypes/MCHashMap.h
+++ b/src/core/basetypes/MCHashMap.h
@@ -10,7 +10,12 @@ namespace mailcore {
 
 	class String;
 	class Array;
-	struct HashMapCell;
+    struct HashMapCell {
+        unsigned int func;
+        Object * key;
+        Object * value;
+        HashMapCell * next;
+    };
 	typedef HashMapCell HashMapIter;
 
 	class HashMap : public Object {
@@ -28,6 +33,9 @@ namespace mailcore {
 		virtual Array * allValues();
 		virtual void removeAllObjects();
         
+		HashMapIter * iteratorBegin();
+		HashMapIter * iteratorNext(HashMapIter * iter);
+        
     public: // subclass behavior
 		HashMap(HashMap * o);
 		virtual String * description();
@@ -37,8 +45,6 @@ namespace mailcore {
 		unsigned int mAllocated;
 		unsigned int mCount;
 		void ** mCells;
-		HashMapIter * iteratorBegin();
-		HashMapIter * iteratorNext(HashMapIter * iter);
 		void allocate(unsigned int size);
 		void init();
 	};