diff --git a/bindings/pascocoa/examples/statusitem/controller.pas b/bindings/pascocoa/examples/statusitem/controller.pas
index 7ba8e52f1..dd92c5936 100644
--- a/bindings/pascocoa/examples/statusitem/controller.pas
+++ b/bindings/pascocoa/examples/statusitem/controller.pas
@@ -75,6 +75,7 @@ constructor TMyController.Create;
 var
   fileName: CFStringRef;
 begin
+  { The class is registered on the Objective-C runtime before the NSObject constructor is called }
   if not CreateClassDefinition(Str_TMyController, Str_NSObject) then WriteLn('Failed to create objc class');
 
   inherited Create;
diff --git a/bindings/pascocoa/parser/objcparser.lpi b/bindings/pascocoa/parser/objcparser.lpi
index e0f7d4a10..d291dc732 100755
--- a/bindings/pascocoa/parser/objcparser.lpi
+++ b/bindings/pascocoa/parser/objcparser.lpi
@@ -9,11 +9,11 @@
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
       </Flags>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
       <UseAppBundle Value="False"/>
-      <ActiveEditorIndexAtStart Value="4"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -30,303 +30,22 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <Units Count="24">
+    <Units Count="3">
       <Unit0>
         <Filename Value="objcparser.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Project1"/>
-        <CursorPos X="49" Y="77"/>
-        <TopLine Value="112"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="53"/>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <UnitName Value="ObjCParserUtils"/>
-        <CursorPos X="1" Y="633"/>
-        <TopLine Value="616"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="27"/>
-        <Loaded Value="True"/>
-      </Unit1>
-      <Unit2>
-        <Filename Value="ObjCParserTypes.pas"/>
-        <UnitName Value="ObjCParserTypes"/>
-        <CursorPos X="49" Y="19"/>
-        <TopLine Value="12"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="27"/>
-        <Bookmarks Count="1">
-          <Item0 X="1" Y="418" ID="0"/>
-        </Bookmarks>
-        <Loaded Value="True"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="../foundation/foundation.pas"/>
-        <UnitName Value="foundation"/>
-        <CursorPos X="28" Y="10"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="8"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="../appkit/AppKit.inc"/>
-        <CursorPos X="18" Y="74"/>
-        <TopLine Value="74"/>
-        <UsageCount Value="8"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="../../objc/objc.pas"/>
-        <UnitName Value="objc"/>
-        <CursorPos X="32" Y="38"/>
-        <TopLine Value="36"/>
-        <UsageCount Value="12"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="../../objc/objc-api.inc"/>
-        <CursorPos X="106" Y="9"/>
-        <TopLine Value="8"/>
-        <UsageCount Value="8"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="../appkit/NSActionCell.inc"/>
-        <CursorPos X="49" Y="34"/>
-        <TopLine Value="13"/>
-        <UsageCount Value="8"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="../appkit/NSCell.inc"/>
-        <CursorPos X="1" Y="48"/>
-        <TopLine Value="42"/>
-        <UsageCount Value="8"/>
-      </Unit8>
-      <Unit9>
-        <Filename Value="../foundation/NSGeometry.inc"/>
-        <CursorPos X="1" Y="46"/>
-        <TopLine Value="26"/>
-        <UsageCount Value="10"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="../foundation/NSObject.inc"/>
-        <CursorPos X="18" Y="53"/>
-        <TopLine Value="38"/>
-        <UsageCount Value="8"/>
-      </Unit10>
-      <Unit11>
         <Filename Value="pascodeutils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="pascodeutils"/>
-        <CursorPos X="1" Y="13"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="50"/>
-      </Unit11>
-      <Unit12>
-        <Filename Value="../appkit/NSWindow.inc"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="12"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="test.inc"/>
-        <CursorPos X="9" Y="18"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="9"/>
-      </Unit13>
-      <Unit14>
-        <Filename Value="NSWindow.h"/>
-        <CursorPos X="9" Y="121"/>
-        <TopLine Value="104"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="21"/>
-        <Loaded Value="True"/>
-        <SyntaxHighlighter Value="C++"/>
-      </Unit14>
-      <Unit15>
-        <Filename Value="../../objc/objc-runtime.inc"/>
-        <CursorPos X="1" Y="127"/>
-        <TopLine Value="127"/>
-        <UsageCount Value="12"/>
-      </Unit15>
-      <Unit16>
-        <Filename Value="headers/NSScreen.h"/>
-        <CursorPos X="1" Y="9"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="C++"/>
-      </Unit16>
-      <Unit17>
-        <Filename Value="../foundation/NSAutoreleasePool.inc"/>
-        <CursorPos X="16" Y="12"/>
-        <TopLine Value="12"/>
-        <UsageCount Value="9"/>
-      </Unit17>
-      <Unit18>
-        <Filename Value="../appkit/NSButton.inc"/>
-        <CursorPos X="23" Y="15"/>
-        <TopLine Value="12"/>
-        <UsageCount Value="9"/>
-      </Unit18>
-      <Unit19>
-        <Filename Value="../appkit/NSControl.inc"/>
-        <CursorPos X="91" Y="21"/>
-        <TopLine Value="21"/>
-        <UsageCount Value="8"/>
-      </Unit19>
-      <Unit20>
-        <Filename Value="headers/NSButton.h"/>
-        <CursorPos X="1" Y="23"/>
-        <TopLine Value="4"/>
-        <UsageCount Value="9"/>
-        <SyntaxHighlighter Value="C++"/>
-      </Unit20>
-      <Unit21>
-        <Filename Value="NSWindow.inc"/>
-        <CursorPos X="32" Y="442"/>
-        <TopLine Value="442"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="16"/>
-        <Loaded Value="True"/>
-      </Unit21>
-      <Unit22>
+      </Unit1>
+      <Unit2>
         <Filename Value="NSWindow2.h"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="94" Y="1"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="31"/>
-        <Loaded Value="True"/>
-        <SyntaxHighlighter Value="C++"/>
-      </Unit22>
-      <Unit23>
-        <Filename Value="../uikit/UIKit.h"/>
-        <CursorPos X="1" Y="31"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-        <SyntaxHighlighter Value="C++"/>
-      </Unit23>
+      </Unit2>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
-      <Position1>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="850" Column="19" TopLine="826"/>
-      </Position1>
-      <Position2>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="557" Column="20" TopLine="538"/>
-      </Position2>
-      <Position3>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="854" Column="13" TopLine="829"/>
-      </Position3>
-      <Position4>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="630" Column="57" TopLine="606"/>
-      </Position4>
-      <Position5>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="329" Column="1" TopLine="307"/>
-      </Position5>
-      <Position6>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="850" Column="5" TopLine="829"/>
-      </Position6>
-      <Position7>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="321" Column="33" TopLine="307"/>
-      </Position7>
-      <Position8>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="512" Column="64" TopLine="496"/>
-      </Position8>
-      <Position9>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="511" Column="8" TopLine="495"/>
-      </Position9>
-      <Position10>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="313" Column="42" TopLine="298"/>
-      </Position10>
-      <Position11>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="512" Column="60" TopLine="497"/>
-      </Position11>
-      <Position12>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="522" Column="1" TopLine="498"/>
-      </Position12>
-      <Position13>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="852" Column="14" TopLine="826"/>
-      </Position13>
-      <Position14>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="779" Column="12" TopLine="762"/>
-      </Position14>
-      <Position15>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="552" Column="12" TopLine="537"/>
-      </Position15>
-      <Position16>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="324" Column="22" TopLine="309"/>
-      </Position16>
-      <Position17>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="626" Column="52" TopLine="611"/>
-      </Position17>
-      <Position18>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="773" Column="32" TopLine="750"/>
-      </Position18>
-      <Position19>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position19>
-      <Position20>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="362" Column="24" TopLine="339"/>
-      </Position20>
-      <Position21>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position21>
-      <Position22>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="342" Column="24" TopLine="327"/>
-      </Position22>
-      <Position23>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="521" Column="24" TopLine="506"/>
-      </Position23>
-      <Position24>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="565" Column="1" TopLine="552"/>
-      </Position24>
-      <Position25>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position25>
-      <Position26>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="854" Column="17" TopLine="844"/>
-      </Position26>
-      <Position27>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="855" Column="18" TopLine="846"/>
-      </Position27>
-      <Position28>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="631" Column="20" TopLine="616"/>
-      </Position28>
-      <Position29>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="372" Column="11" TopLine="354"/>
-      </Position29>
-      <Position30>
-        <Filename Value="ObjCParserUtils.pas"/>
-        <Caret Line="523" Column="33" TopLine="508"/>
-      </Position30>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
@@ -340,16 +59,4 @@
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
-  <Debugging>
-    <BreakPoints Count="2">
-      <Item1>
-        <Source Value="C:/Games/CodeTest2/Sources/examples/codecompletion.lpr"/>
-        <Line Value="47"/>
-      </Item1>
-      <Item2>
-        <Source Value="../../LazTest4/consolethreads.pas"/>
-        <Line Value="18"/>
-      </Item2>
-    </BreakPoints>
-  </Debugging>
 </CONFIG>
diff --git a/bindings/pascocoa/parser/testparser.sh b/bindings/pascocoa/parser/testparser.sh
new file mode 100755
index 000000000..6fc119871
--- /dev/null
+++ b/bindings/pascocoa/parser/testparser.sh
@@ -0,0 +1 @@
+./objcparser /System/Library/Frameworks/AppKit.framework/Headers/NSButton.h > NSButton.inc