diff --git a/.gitattributes b/.gitattributes
index b56a7ab508..7692121945 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -920,7 +920,6 @@ packages/dts/fpmake.pp svneol=native#text/plain
 packages/dts/src/dts.pas svneol=native#text/plain
 packages/extra/Makefile svneol=native#text/plain
 packages/extra/Makefile.fpc svneol=native#text/plain
-packages/extra/a52/fpmake.inc svneol=native#text/plain
 packages/extra/amunits/Makefile svneol=native#text/plain
 packages/extra/amunits/Makefile.fpc svneol=native#text/plain
 packages/extra/amunits/README -text
@@ -1076,8 +1075,6 @@ packages/extra/amunits/utilunits/tagsarray.pas svneol=native#text/plain
 packages/extra/amunits/utilunits/timerutils.pas svneol=native#text/plain
 packages/extra/amunits/utilunits/vartags.pas svneol=native#text/plain
 packages/extra/amunits/utilunits/wbargs.pas svneol=native#text/plain
-packages/extra/aspell/fpmake.inc svneol=native#text/plain
-packages/extra/bfd/fpmake.inc svneol=native#text/plain
 packages/extra/cdrom/Makefile svneol=native#text/plain
 packages/extra/cdrom/Makefile.fpc svneol=native#text/plain
 packages/extra/cdrom/README -text
@@ -1520,9 +1517,6 @@ packages/extra/gtk/gtk/gtkwindow.pp svneol=native#text/plain
 packages/extra/gtk/gtkgl/Makefile.fpc svneol=native#text/plain
 packages/extra/gtk/gtkgl/gtkglarea.pp svneol=native#text/plain
 packages/extra/gtk/gtkgl/gtkgldemo.pp svneol=native#text/plain
-packages/extra/gtk2/fpmake.inc svneol=native#text/plain
-packages/extra/gtk2/fpmake.pp svneol=native#text/plain
-packages/extra/gtk2/gtk2forlazarus.lpk -text
 packages/extra/hermes/Makefile -text
 packages/extra/hermes/Makefile.fpc -text
 packages/extra/hermes/clear.inc -text
diff --git a/.gitignore b/.gitignore
index b83792ca05..c4ea5dcbe1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -591,20 +591,6 @@ packages/extra/amunits/utilunits/*.ppu
 packages/extra/amunits/utilunits/*.s
 packages/extra/amunits/utilunits/fpcmade.*
 packages/extra/amunits/utilunits/units
-packages/extra/bfd/*.bak
-packages/extra/bfd/*.exe
-packages/extra/bfd/*.o
-packages/extra/bfd/*.ppu
-packages/extra/bfd/*.s
-packages/extra/bfd/fpcmade.*
-packages/extra/bfd/units
-packages/extra/bzip2/*.bak
-packages/extra/bzip2/*.exe
-packages/extra/bzip2/*.o
-packages/extra/bzip2/*.ppu
-packages/extra/bzip2/*.s
-packages/extra/bzip2/fpcmade.*
-packages/extra/bzip2/units
 packages/extra/cdrom/*.bak
 packages/extra/cdrom/*.exe
 packages/extra/cdrom/*.o
@@ -827,20 +813,6 @@ packages/extra/gtk/gtkgl/*.s
 packages/extra/gtk/gtkgl/fpcmade.*
 packages/extra/gtk/gtkgl/units
 packages/extra/gtk/units
-packages/extra/gtk2/*.bak
-packages/extra/gtk2/*.exe
-packages/extra/gtk2/*.o
-packages/extra/gtk2/*.ppu
-packages/extra/gtk2/*.s
-packages/extra/gtk2/examples/*.bak
-packages/extra/gtk2/examples/*.exe
-packages/extra/gtk2/examples/*.o
-packages/extra/gtk2/examples/*.ppu
-packages/extra/gtk2/examples/*.s
-packages/extra/gtk2/examples/fpcmade.*
-packages/extra/gtk2/examples/units
-packages/extra/gtk2/fpcmade.*
-packages/extra/gtk2/units
 packages/extra/hermes/*.bak
 packages/extra/hermes/*.exe
 packages/extra/hermes/*.o
diff --git a/packages/extra/a52/fpmake.inc b/packages/extra/a52/fpmake.inc
deleted file mode 100644
index d7ca2d47ea..0000000000
--- a/packages/extra/a52/fpmake.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-    StartPackage('a52');
-    {$IF defined(ALLPACKAGES)}
-    Directory:='extra/a52';
-    {$ELSEIF defined(EXTRAPACKAGES)}
-    Directory:='a52';
-    {$ENDIF}
-    OS:=[linux,win32];
-    T:=Targets.AddUnit('a52');
-    EndPackage;
diff --git a/packages/extra/aspell/fpmake.inc b/packages/extra/aspell/fpmake.inc
deleted file mode 100644
index 146a6a789f..0000000000
--- a/packages/extra/aspell/fpmake.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-    StartPackage('aspell');
-    {$IF defined(ALLPACKAGES)}
-    Directory:='extra/aspell';
-    {$ELSEIF defined(EXTRAPACKAGES)}
-    Directory:='pcp';
-    {$ENDIF}
-    OS:=[linux,netbsd,freebsd,openbsd,solaris,darwin];
-    T:=Targets.AddUnit('aspell');
-    T:=Targets.AddUnit('scheck');
-    EndPackage;
diff --git a/packages/extra/bfd/fpmake.inc b/packages/extra/bfd/fpmake.inc
deleted file mode 100644
index 5df131cdde..0000000000
--- a/packages/extra/bfd/fpmake.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-    StartPackage('bfd');
-    {$IF defined(ALLPACKAGES)}
-    Directory:='extra/bfd';
-    {$ELSEIF defined(EXTRAPACKAGES)}
-    Directory:='bfd';
-    {$ENDIF}
-    OS:=[linux,netbsd,freebsd,openbsd,darwin];
-    T:=Targets.AddUnit('bfd');
-    EndPackage;
diff --git a/packages/extra/gtk2/fpmake.inc b/packages/extra/gtk2/fpmake.inc
deleted file mode 100644
index a1338b65bb..0000000000
--- a/packages/extra/gtk2/fpmake.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-    StartPackage('gtk2');
-    {$IF defined(ALLPACKAGES)}
-    Directory:='extra/gtk2';
-    {$ELSEIF defined(EXTRAPACKAGES)}
-    Directory:='gtk2';
-    {$ENDIF}
-    OS:=[linux,freebsd,win32];
-    T:=Targets.AddUnit('buildgtk2');
-    T.Install:=False;
-    T:=Targets.AddUnit('glib/glib2');
-    T:=Targets.AddUnit('atk/atk');
-    T:=Targets.AddUnit('pango/pango');
-    T:=Targets.AddUnit('gtk+/gdk-pixbuf/gdk2pixbuf');
-    T:=Targets.AddUnit('gtk+/gdk/gdk2');
-    T:=Targets.AddUnit('gtk+/gtk/gtk2');
-    T:=Targets.AddUnit('libglade/libglade2');
-    T:=Targets.AddUnit('gtkglext/gtkglext');
-    T:=Targets.AddUnit('gtkglext/gdkglext');
-    EndPackage;
diff --git a/packages/extra/gtk2/fpmake.pp b/packages/extra/gtk2/fpmake.pp
deleted file mode 100644
index d4b6178682..0000000000
--- a/packages/extra/gtk2/fpmake.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-{$mode objfpc}{$H+}
-program fpmake;
-
-uses fpmkunit;
-
-Var
-  T : TTarget;
-
-begin
-  With Installer do 
-    begin
-    { Base packages }
-    {$i fpmake.inc}
-    Run;
-    end;
-end.
-
diff --git a/packages/extra/gtk2/gtk2forlazarus.lpk b/packages/extra/gtk2/gtk2forlazarus.lpk
deleted file mode 100644
index 60176c1e4f..0000000000
--- a/packages/extra/gtk2/gtk2forlazarus.lpk
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<CONFIG>
-  <Package Version="2">
-    <Name Value="gtk2forLazarus"/>
-    <Author Value="Mattias Gaertner, Olaf Leidinger"/>
-    <CompilerOptions>
-      <Version Value="4"/>
-      <SearchPaths>
-        <OtherUnitFiles Value="glib/;atk/;pango/;gtk+/gdk-pixbuf/;gtk+/gdk/;gtk+/gtk/"/>
-        <UnitOutputDirectory Value="lib/$(TargetCPU)/$(TargetOS)"/>
-        <LCLWidgetType Value="gtk"/>
-      </SearchPaths>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-        <ExecuteAfter>
-          <Command Value="mk_gtk2fpc_link_res.sh lib/$(TargetCPU)/$(TargetOS)"/>
-          <ShowAllMessages Value="True"/>
-        </ExecuteAfter>
-      </Other>
-    </CompilerOptions>
-    <Description Value="GTK2 package for Lazarus"/>
-    <License Value="LGPL2"/>
-    <Files Count="7">
-      <Item1>
-        <Filename Value="glib/glib2.pas"/>
-        <UnitName Value="glib2"/>
-      </Item1>
-      <Item2>
-        <Filename Value="atk/atk.pas"/>
-        <UnitName Value="atk"/>
-      </Item2>
-      <Item3>
-        <Filename Value="pango/pango.pas"/>
-        <UnitName Value="pango"/>
-      </Item3>
-      <Item4>
-        <Filename Value="gtk+/gdk-pixbuf/gdk2pixbuf.pas"/>
-        <UnitName Value="gdk2pixbuf"/>
-      </Item4>
-      <Item5>
-        <Filename Value="gtk+/gdk/gdk2.pas"/>
-        <UnitName Value="gdk2"/>
-      </Item5>
-      <Item6>
-        <Filename Value="gtk+/gtk/gtk2.pas"/>
-        <UnitName Value="gtk2"/>
-      </Item6>
-      <Item7>
-        <Filename Value="mk_gtk2fpc_link_res.sh"/>
-        <Type Value="Text"/>
-      </Item7>
-    </Files>
-    <Type Value="RunAndDesignTime"/>
-    <RequiredPkgs Count="1">
-      <Item1>
-        <PackageName Value="FCL"/>
-        <MinVersion Major="1" Valid="True"/>
-      </Item1>
-    </RequiredPkgs>
-    <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)/"/>
-    </UsageOptions>
-    <PublishOptions>
-      <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
-    </PublishOptions>
-  </Package>
-</CONFIG>