diff --git a/components/geckoport/version2/fpmake.pp b/components/geckoport/version2/fpmake.pp
index 82716ab5b..6f01c4fa6 100644
--- a/components/geckoport/version2/fpmake.pp
+++ b/components/geckoport/version2/fpmake.pp
@@ -19,7 +19,7 @@ begin
     P:=AddPackage('gecko') as TLazPackage;
     p.AfterInstall := @TLazInstaller(Installer).DoRegisterLazarusPackages;
 
-    P.Version:='0.9.0-1';
+    P.Version:='2.9.0-1';
     P.OSes:=AllUnixOSes+[Win32,Win64];
     P.Author := 'Takanori Ito';
     P.License := 'MPL 1.1';
@@ -46,6 +46,148 @@ begin
       Dependencies.AddUnit('nsInit');
       Dependencies.AddUnit('nsMemory');
       Dependencies.AddUnit('nsError');
+      Dependencies.AddInclude('domstubs.inc');
+      Dependencies.AddInclude('forwarddecl.inc');
+
+      Dependencies.AddInclude('nsidomdocument.inc');
+      Dependencies.AddInclude('nsidomelement.inc');
+      Dependencies.AddInclude('nsishentry.inc');
+      Dependencies.AddInclude('nsiwebprogresslistener.inc');
+      Dependencies.AddInclude('nsidomnodeiterator.inc');
+      Dependencies.AddInclude('nsioutputstream.inc');
+      Dependencies.AddInclude('nsidomcharacterdata.inc');
+      Dependencies.AddInclude('nsidomwindow.inc');
+      Dependencies.AddInclude('nsicontentsecuritypolicy.inc');
+      Dependencies.AddInclude('nsidomfileerror.inc');
+      Dependencies.AddInclude('nsidomeventtarget.inc');
+      Dependencies.AddInclude('nsiwebbrowsersetup.inc');
+      Dependencies.AddInclude('nsiprintsession.inc');
+      Dependencies.AddInclude('nsiwebbrowserchromefocus.inc');
+      Dependencies.AddInclude('nsiinterfacerequestor.inc');
+      Dependencies.AddInclude('nsidomscreen.inc');
+      Dependencies.AddInclude('nsidommediaquerylist.inc');
+      Dependencies.AddInclude('nsidomofflineresourcelist.inc');
+      Dependencies.AddInclude('nsicomponentregistrar.inc');
+      Dependencies.AddInclude('nsipromptservice2.inc');
+      Dependencies.AddInclude('imgidecoderobserver.inc');
+      Dependencies.AddInclude('nsidommimetype.inc');
+      Dependencies.AddInclude('nsicollection.inc');
+      Dependencies.AddInclude('nsidomeventlistener.inc');
+      Dependencies.AddInclude('nsidomnamednodemap.inc');
+      Dependencies.AddInclude('nsidocshellloadinfo.inc');
+      Dependencies.AddInclude('nsibfcacheentry.inc');
+      Dependencies.AddInclude('nsipromptservice.inc');
+      Dependencies.AddInclude('nsiioservice.inc');
+      Dependencies.AddInclude('nsiwebnavigation.inc');
+      Dependencies.AddInclude('nsiprincipal.inc');
+      Dependencies.AddInclude('nsidomevent.inc');
+      Dependencies.AddInclude('nsidompkcs11.inc');
+      Dependencies.AddInclude('nsidomstylesheet.inc');
+      Dependencies.AddInclude('nsiobjectinputstream.inc');
+      Dependencies.AddInclude('nsibinaryinputstream.inc');
+      Dependencies.AddInclude('nsiservicemanager.inc');
+      Dependencies.AddInclude('nsicontentviewer.inc');
+      Dependencies.AddInclude('nsiauthpromptcallback.inc');
+      Dependencies.AddInclude('nsidomlocation.inc');
+      Dependencies.AddInclude('imgirequest.inc');
+      Dependencies.AddInclude('nsicontroller.inc');
+      Dependencies.AddInclude('nsiprotocolhandler.inc');
+      Dependencies.AddInclude('nsishistory.inc');
+      Dependencies.AddInclude('nsilocalfile.inc');
+      Dependencies.AddInclude('nsidomcdatasection.inc');
+      Dependencies.AddInclude('nsidomstoragelist.inc');
+      Dependencies.AddInclude('nsidomnavigator.inc');
+      Dependencies.AddInclude('nsidomnodelist.inc');
+      Dependencies.AddInclude('nsidomstorageitem.inc');
+      Dependencies.AddInclude('nsiwebbrowserfind.inc');
+      Dependencies.AddInclude('nsiprompt.inc');
+      Dependencies.AddInclude('nsidomdocumenttype.inc');
+      Dependencies.AddInclude('nsibinaryoutputstream.inc');
+      Dependencies.AddInclude('nsidocshelltreeitem.inc');
+      Dependencies.AddInclude('nsidocumentcharsetinfo.inc');
+      Dependencies.AddInclude('nsidocshell.inc');
+      Dependencies.AddInclude('nsistreamlistener.inc');
+      Dependencies.AddInclude('nsirequest.inc');
+      Dependencies.AddInclude('nsisupportsarray.inc');
+      Dependencies.AddInclude('nsicommandparams.inc');
+      Dependencies.AddInclude('nsiweakreference.inc');
+      Dependencies.AddInclude('nsihttpheadervisitor.inc');
+      Dependencies.AddInclude('nsidomnodefilter.inc');
+      Dependencies.AddInclude('nsiauthinformation.inc');
+      Dependencies.AddInclude('nsiserializable.inc');
+      Dependencies.AddInclude('nsidomxulcommanddispatcher.inc');
+      Dependencies.AddInclude('nsicomponentmanager.inc');
+      Dependencies.AddInclude('nsidomperformancenavigation.inc');
+      Dependencies.AddInclude('nsidomperformance.inc');
+      Dependencies.AddInclude('nsiloadgroup.inc');
+      Dependencies.AddInclude('nsidommimetypearray.inc');
+      Dependencies.AddInclude('nsidomprocessinginstruction.inc');
+      Dependencies.AddInclude('nsiwindowcreator.inc');
+      Dependencies.AddInclude('nsidomfile.inc');
+      Dependencies.AddInclude('nsidomdomstringlist.inc');
+      Dependencies.AddInclude('nsiembeddingsitewindow.inc');
+      Dependencies.AddInclude('nsidomhistory.inc');
+      Dependencies.AddInclude('nsichannel.inc');
+      Dependencies.AddInclude('nsidebug.inc');
+      Dependencies.AddInclude('nsicancelable.inc');
+      Dependencies.AddInclude('imgicontainerobserver.inc');
+      Dependencies.AddInclude('nsidomattr.inc');
+      Dependencies.AddInclude('nsidocshelltreenode.inc');
+      Dependencies.AddInclude('nsienumerator.inc');
+      Dependencies.AddInclude('nsidomstorageobsolete.inc');
+      Dependencies.AddInclude('nsidirectoryservice.inc');
+      Dependencies.AddInclude('nsiwebbrowser.inc');
+      Dependencies.AddInclude('nsidomnode.inc');
+      Dependencies.AddInclude('nsiproperties.inc');
+      Dependencies.AddInclude('nsisimpleenumerator.inc');
+      Dependencies.AddInclude('nsidomcrypto.inc');
+      Dependencies.AddInclude('nsifile.inc');
+      Dependencies.AddInclude('nsiprintsettings.inc');
+      Dependencies.AddInclude('nsirequestobserver.inc');
+      Dependencies.AddInclude('nsidomcomment.inc');
+      Dependencies.AddInclude('nsiwebprogress.inc');
+      Dependencies.AddInclude('nsishistorylistener.inc');
+      Dependencies.AddInclude('nsimemory.inc');
+      Dependencies.AddInclude('nsiwebbrowserchrome.inc');
+      Dependencies.AddInclude('nsianimationframelistener.inc');
+      Dependencies.AddInclude('nsidomuserdatahandler.inc');
+      Dependencies.AddInclude('nsivariant.inc');
+      Dependencies.AddInclude('nsiwebbrowserfocus.inc');
+      Dependencies.AddInclude('nsidompluginarray.inc');
+      Dependencies.AddInclude('nsiinputstream.inc');
+      Dependencies.AddInclude('nsiwebbrowserprint.inc');
+      Dependencies.AddInclude('nsihistoryentry.inc');
+      Dependencies.AddInclude('nsidomplugin.inc');
+      Dependencies.AddInclude('nsiwindowwatcher.inc');
+      Dependencies.AddInclude('nsitracerefcnt.inc');
+      Dependencies.AddInclude('nsidomperformancetiming.inc');
+      Dependencies.AddInclude('nsidomstylesheetlist.inc');
+      Dependencies.AddInclude('nsidombarprop.inc');
+      Dependencies.AddInclude('nsiatom.inc');
+      Dependencies.AddInclude('nsitooltiplistener.inc');
+      Dependencies.AddInclude('nsiselection.inc');
+      Dependencies.AddInclude('nsidomtreewalker.inc');
+      Dependencies.AddInclude('nsidomdocumentfragment.inc');
+      Dependencies.AddInclude('imgicontainer.inc');
+      Dependencies.AddInclude('nsiuri.inc');
+      Dependencies.AddInclude('nsiauthprompt.inc');
+      Dependencies.AddInclude('nsimodule.inc');
+      Dependencies.AddInclude('nsicontrollers.inc');
+      Dependencies.AddInclude('nsidomwindowcollection.inc');
+      Dependencies.AddInclude('nsifactory.inc');
+      Dependencies.AddInclude('nsidommedialist.inc');
+      Dependencies.AddInclude('nsiobserver.inc');
+      Dependencies.AddInclude('nsidocshelltreeowner.inc');
+      Dependencies.AddInclude('nsiuricontentlistener.inc');
+      Dependencies.AddInclude('nsieventsource.inc');
+      Dependencies.AddInclude('nsidomdomimplementation.inc');
+      Dependencies.AddInclude('nsihttpchannel.inc');
+      Dependencies.AddInclude('nsibasewindow.inc');
+      Dependencies.AddInclude('nsisecurebrowserui.inc');
+      Dependencies.AddInclude('nsiobjectoutputstream.inc');
+      Dependencies.AddInclude('nsidomstorage.inc');
+      Dependencies.AddInclude('nsicontextmenulistener2.inc');
+      Dependencies.AddInclude('nsidomtext.inc');
       end;
 
     with P.Targets.AddUnit('nsInit.pas') do
@@ -105,13 +247,8 @@ begin
       Dependencies.AddUnit('nsXPCOM');
       Dependencies.AddUnit('nsXPCOM_std19');
       end;
-
-    with P.Targets.AddUnit('each-version\nsXPCOM_std19.pas') do
-      begin
-      Dependencies.AddUnit('nsTypes');
-      Dependencies.AddUnit('nsGeckoStrings');
-      end;
 }
+
     with P.Targets.AddUnit('nsNetUtil.pas') do
       begin
       Dependencies.AddUnit('nsTypes');