diff --git a/packages/cocoaint/src/UndefinedTypes.inc b/packages/cocoaint/src/UndefinedTypes.inc
index a88b2e6c6b..03bea6a613 100644
--- a/packages/cocoaint/src/UndefinedTypes.inc
+++ b/packages/cocoaint/src/UndefinedTypes.inc
@@ -20,6 +20,7 @@ type
   GLsizei = integer;
   GLbitfield = integer;
   objc_protocol = protocol;
+  idpointer = ^id;
 
 { Variable argument list - disabled for Pascal }
 type
diff --git a/packages/cocoaint/src/foundation/NSEnumerator.inc b/packages/cocoaint/src/foundation/NSEnumerator.inc
index fb4bb9660d..35b139646d 100644
--- a/packages/cocoaint/src/foundation/NSEnumerator.inc
+++ b/packages/cocoaint/src/foundation/NSEnumerator.inc
@@ -17,9 +17,9 @@
 type
   NSFastEnumerationState = record
     state: culong;
-    itemsPtr: id;
-    mutationsPtr: culong;
-    extra: culong;
+    itemsPtr: idpointer;
+    mutationsPtr: pculong;
+    extra: array[0..5-1] of culong;
   end;
 
 
@@ -71,7 +71,7 @@ type
   
 { NSFastEnumeration Protocol }
   NSFastEnumerationProtocol = objcprotocol
-    function countByEnumeratingWithState_objects_count(state: NSFastEnumerationStatePointer; stackbuf: id; len: NSUInteger): NSUInteger; message 'countByEnumeratingWithState:objects:count:';
+    function countByEnumeratingWithState_objects_count(state: NSFastEnumerationStatePointer; stackbuf: idpointer; len: NSUInteger): NSUInteger; message 'countByEnumeratingWithState:objects:count:';
   end; external name 'NSFastEnumeration';
 {$endif}
 {$endif}