diff --git a/.gitattributes b/.gitattributes
index 210652bd73..2547c8639c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1088,10 +1088,8 @@ packages/fcl-base/examples/tstelgtk.pp svneol=native#text/plain
 packages/fcl-base/examples/txmlreg.pp svneol=native#text/plain
 packages/fcl-base/examples/xmldump.pp svneol=native#text/plain
 packages/fcl-base/fpmake.pp svneol=native#text/plain
-packages/fcl-base/src/amiga/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/avl_tree.pp svneol=native#text/plain
 packages/fcl-base/src/base64.pp svneol=native#text/plain
-packages/fcl-base/src/beos/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/blowfish.pp svneol=native#text/plain
 packages/fcl-base/src/bufstream.pp svneol=native#text/plain
 packages/fcl-base/src/cachecls.pp svneol=native#text/plain
@@ -1103,19 +1101,14 @@ packages/fcl-base/src/felog.inc svneol=native#text/plain
 packages/fcl-base/src/fptimer.pp svneol=native#text/plain
 packages/fcl-base/src/gettext.pp svneol=native#text/plain
 packages/fcl-base/src/go32v2/custapp.inc svneol=native#text/plain
-packages/fcl-base/src/go32v2/eventlog.inc svneol=native#text/plain
-packages/fcl-base/src/haiku/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/idea.pp svneol=native#text/plain
 packages/fcl-base/src/inicol.pp svneol=native#text/plain
 packages/fcl-base/src/inifiles.pp svneol=native#text/plain
 packages/fcl-base/src/iostream.pp svneol=native#text/plain
 packages/fcl-base/src/libtar.pp svneol=native#text/plain
 packages/fcl-base/src/maskutils.pp svneol=native#text/plain
-packages/fcl-base/src/morphos/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/netware/custapp.inc svneol=native#text/plain
-packages/fcl-base/src/netware/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/netwlibc/custapp.inc svneol=native#text/plain
-packages/fcl-base/src/netwlibc/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/os2/custapp.inc svneol=native#text/plain
 packages/fcl-base/src/os2/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/pooledmm.pp svneol=native#text/plain
@@ -1138,7 +1131,6 @@ packages/fcl-base/src/win/fclel.mc -text
 packages/fcl-base/src/win/fclel.rc -text
 packages/fcl-base/src/win/fclel.res -text
 packages/fcl-base/src/win/fileinfo.pp svneol=native#text/plain
-packages/fcl-base/src/wince/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/wince/fileinfo.pp svneol=native#text/plain
 packages/fcl-base/src/wtex.pp svneol=native#text/plain
 packages/fcl-db/Makefile svneol=native#text/plain
diff --git a/.gitignore b/.gitignore
index 2efc6ec8d2..0d3dc98f9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -222,20 +222,6 @@ packages/fcl-base/examples/intl/*.s
 packages/fcl-base/examples/intl/fpcmade.*
 packages/fcl-base/examples/intl/units
 packages/fcl-base/examples/units
-packages/fcl-base/src/amiga/*.bak
-packages/fcl-base/src/amiga/*.exe
-packages/fcl-base/src/amiga/*.o
-packages/fcl-base/src/amiga/*.ppu
-packages/fcl-base/src/amiga/*.s
-packages/fcl-base/src/amiga/fpcmade.*
-packages/fcl-base/src/amiga/units
-packages/fcl-base/src/beos/*.bak
-packages/fcl-base/src/beos/*.exe
-packages/fcl-base/src/beos/*.o
-packages/fcl-base/src/beos/*.ppu
-packages/fcl-base/src/beos/*.s
-packages/fcl-base/src/beos/fpcmade.*
-packages/fcl-base/src/beos/units
 packages/fcl-base/src/go32v2/*.bak
 packages/fcl-base/src/go32v2/*.exe
 packages/fcl-base/src/go32v2/*.o
diff --git a/packages/fcl-base/fpmake.pp b/packages/fcl-base/fpmake.pp
index c0c303fb94..70638d2db2 100644
--- a/packages/fcl-base/fpmake.pp
+++ b/packages/fcl-base/fpmake.pp
@@ -49,7 +49,8 @@ begin
       T.ResourceStrings:=true;
       with T.Dependencies do
         begin
-          AddInclude('eventlog.inc');
+          AddInclude('eventlog.inc',AllUnixOSes+[Win32,Win64]);
+          AddInclude('felog.inc',AllOSes-AllUnixOSes-[Win32,Win64]);
         end;
     T:=P.Targets.AddUnit('fptimer.pp',AllWindowsOSes+AllUnixOSes);
     T:=P.Targets.AddUnit('gettext.pp');
diff --git a/packages/fcl-base/src/amiga/eventlog.inc b/packages/fcl-base/src/amiga/eventlog.inc
deleted file mode 100644
index 66d35ac57a..0000000000
--- a/packages/fcl-base/src/amiga/eventlog.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2003 by the Free Pascal development team
-
-    Generic event logging facility.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{ ---------------------------------------------------------------------
-    Include event log that maps to file event log.
-  ---------------------------------------------------------------------}
-
-{$i felog.inc}
-
-
diff --git a/packages/fcl-base/src/beos/eventlog.inc b/packages/fcl-base/src/beos/eventlog.inc
deleted file mode 100644
index 66d35ac57a..0000000000
--- a/packages/fcl-base/src/beos/eventlog.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2003 by the Free Pascal development team
-
-    Generic event logging facility.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{ ---------------------------------------------------------------------
-    Include event log that maps to file event log.
-  ---------------------------------------------------------------------}
-
-{$i felog.inc}
-
-
diff --git a/packages/fcl-base/src/eventlog.pp b/packages/fcl-base/src/eventlog.pp
index 79701de3c6..3a711c4fcb 100644
--- a/packages/fcl-base/src/eventlog.pp
+++ b/packages/fcl-base/src/eventlog.pp
@@ -108,10 +108,14 @@ Resourcestring
   SLogDebug     = 'Debug';
   SLogCustom    = 'Custom (%d)';
   SErrLogFailedMsg = 'Failed to log entry (Error: %s)';
-  
+
 implementation
 
-{$i eventlog.inc}
+{$if defined(win32) or defined(win64) or defined(unix)}
+ {$i eventlog.inc}
+{$else}
+ {$i felog.inc}
+{$endif}
 
 { TEventLog }
 
@@ -197,7 +201,7 @@ begin
   except
     On E : Exception do
       S:=E.Message;
-  end;  
+  end;
   If (S<>'') and RaiseExceptionOnError then
     Raise ELogError.CreateFmt(SErrLogFailedMsg,[S]);
 end;
diff --git a/packages/fcl-base/src/go32v2/eventlog.inc b/packages/fcl-base/src/go32v2/eventlog.inc
deleted file mode 100644
index 13c2e8cb34..0000000000
--- a/packages/fcl-base/src/go32v2/eventlog.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2003 by the Free Pascal development team
-
-    DOS event logging facility.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{ ---------------------------------------------------------------------
-    Include event log that maps to file event log.
-  ---------------------------------------------------------------------}
-
-{$i felog.inc}
-
-
diff --git a/packages/fcl-base/src/haiku/eventlog.inc b/packages/fcl-base/src/haiku/eventlog.inc
deleted file mode 100644
index 66d35ac57a..0000000000
--- a/packages/fcl-base/src/haiku/eventlog.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2003 by the Free Pascal development team
-
-    Generic event logging facility.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{ ---------------------------------------------------------------------
-    Include event log that maps to file event log.
-  ---------------------------------------------------------------------}
-
-{$i felog.inc}
-
-
diff --git a/packages/fcl-base/src/morphos/eventlog.inc b/packages/fcl-base/src/morphos/eventlog.inc
deleted file mode 100644
index 66d35ac57a..0000000000
--- a/packages/fcl-base/src/morphos/eventlog.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2003 by the Free Pascal development team
-
-    Generic event logging facility.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{ ---------------------------------------------------------------------
-    Include event log that maps to file event log.
-  ---------------------------------------------------------------------}
-
-{$i felog.inc}
-
-
diff --git a/packages/fcl-base/src/netware/eventlog.inc b/packages/fcl-base/src/netware/eventlog.inc
deleted file mode 100644
index 72405f97f5..0000000000
--- a/packages/fcl-base/src/netware/eventlog.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2003 by the Free Pascal development team
-
-    Netware event logging facility.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{ ---------------------------------------------------------------------
-    Include event log that maps to file event log.
-    There is an event log on netware but it is not documented
-  ---------------------------------------------------------------------}
-
-{$i felog.inc}
-
-
diff --git a/packages/fcl-base/src/netwlibc/eventlog.inc b/packages/fcl-base/src/netwlibc/eventlog.inc
deleted file mode 100644
index 78fee2ff7d..0000000000
--- a/packages/fcl-base/src/netwlibc/eventlog.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2004 by the Free Pascal development team
-
-    Netware event logging facility.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{ ---------------------------------------------------------------------
-    Include event log that maps to file event log.
-    There is an event log on netware but it is not documented
-  ---------------------------------------------------------------------}
-
-{$i felog.inc}
-
-
diff --git a/packages/fcl-base/src/wince/eventlog.inc b/packages/fcl-base/src/wince/eventlog.inc
deleted file mode 100644
index 13c2e8cb34..0000000000
--- a/packages/fcl-base/src/wince/eventlog.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2003 by the Free Pascal development team
-
-    DOS event logging facility.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{ ---------------------------------------------------------------------
-    Include event log that maps to file event log.
-  ---------------------------------------------------------------------}
-
-{$i felog.inc}
-
-