* Rename all corelib units to the new naming convention.

* Updated the UI Designer to use the new unit names.

33 files changed, 564 insertions, 342 deletions

diff --git a/src/corelib/gfxbase.pas b/src/corelib/fpg_base.pas
index 775f5cdb..d90305fd 100644
--- a/src/corelib/gfxbase.pas
+++ b/src/corelib/fpg_base.pas
@@ -15,7 +15,7 @@
       The Big Bang starts here!  The starting unit for fpGUI.
 }
 
-unit gfxbase;
+unit fpg_base;
 
 {$mode objfpc}{$H+}
 
@@ -24,7 +24,7 @@ interface
 uses
   Classes,
   SysUtils,
-  gfx_impl;
+  fpg_impl;
 
 type
   TfpgCoord       = integer;     // we might use floating point coordinates in the future...
@@ -584,9 +584,9 @@ procedure SortRect(var left, top, right, bottom: integer);
 implementation
 
 uses
-  fpgfx,  // needed for fpgApplication & fpgNamedColor
-  gfx_utils, // needed for fpgFileList
-  gfx_constants,
+  fpg_main,  // needed for fpgApplication & fpgNamedColor
+  fpg_utils, // needed for fpgFileList
+  fpg_constants,
   typinfo;
 
 
diff --git a/src/corelib/gfx_cmdlineparams.pas b/src/corelib/fpg_cmdlineparams.pas
index 1e833f81..71aa5d03 100644
--- a/src/corelib/gfx_cmdlineparams.pas
+++ b/src/corelib/fpg_cmdlineparams.pas
@@ -14,11 +14,12 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
 
-unit gfx_cmdlineparams;
+unit fpg_cmdlineparams;
 
 {$mode objfpc}{$H+}
 
 interface
+
 uses
   Classes;
 
diff --git a/src/corelib/gfx_command_intf.pas b/src/corelib/fpg_command_intf.pas
index 61eb89cd..e63e6227 100644
--- a/src/corelib/gfx_command_intf.pas
+++ b/src/corelib/fpg_command_intf.pas
@@ -3,7 +3,7 @@
   know what design patterns are. The Command pattern is very similar to
   Delphi's TAction feature.
 }
-unit gfx_command_intf;
+unit fpg_command_intf;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/corelib/gfx_constants.pas b/src/corelib/fpg_constants.pas
index f204cbab..1029ff13 100644
--- a/src/corelib/gfx_constants.pas
+++ b/src/corelib/fpg_constants.pas
@@ -1,21 +1,36 @@
 {
-  Constants used throughout fpGUI will be defined here. This includes
-  language constants for localization.
-  
-  You only need to changes these defines if you want the default fpGUI language
-  to be something other than English.
-  
-  Soon the lang_*.inc files will be auto generated from the actual *.po files.
-  At which point only the .po files need to be maintained.
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      Constants used throughout fpGUI will be defined here. This includes
+      language constants for localization.
+
+      You only need to changes these defines if you want the default
+      fpGUI language to be something other than English.
+
+      Soon the lang_*.inc files will be auto generated from the
+      actual *.po files. At which point only the .po files need
+      to be maintained.
 }
-unit gfx_constants;
+
+unit fpg_constants;
 
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  SysUtils, gfxbase;
+  SysUtils, fpg_base;
 
 resourcestring
 
diff --git a/src/corelib/gfx_extinterpolation.pas b/src/corelib/fpg_extinterpolation.pas
index 0b3dd30b..c27b18c9 100644
--- a/src/corelib/gfx_extinterpolation.pas
+++ b/src/corelib/fpg_extinterpolation.pas
@@ -1,21 +1,34 @@
-unit gfx_extinterpolation;
-
 {
-Some more interpolation filters for TfpgCanvas.StretchDraw:
-Bessel, Gaussian and Sinc are infinite impulse response (IIR),
-the others are finite impulse response (FIR). The implementation
-of Bessel and Sinc are windowed with Blackman filter.
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
 
-This unit was ported from fcl-image which is part of FPC. A few
-more filters have also been added.
+    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.
+
+    Description:
+      Some more interpolation filters for TfpgCanvas.StretchDraw:
+      Bessel, Gaussian and Sinc are infinite impulse response (IIR),
+      the others are finite impulse response (FIR). The implementation
+      of Bessel and Sinc are windowed with Blackman filter.
+
+      This unit was ported from fcl-image which is part of FPC. A few
+      more filters have also been added.
 }
 
+unit fpg_extinterpolation;
+
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, gfxbase;
+  Classes, SysUtils, fpg_base;
 
 type
 
diff --git a/src/corelib/gfx_imagelist.pas b/src/corelib/fpg_imagelist.pas
index 123cb09a..6f2f4466 100644
--- a/src/corelib/gfx_imagelist.pas
+++ b/src/corelib/fpg_imagelist.pas
@@ -17,7 +17,7 @@
       treeview etc.
 }
 
-unit gfx_imagelist;
+unit fpg_imagelist;
 
 {$mode objfpc}{$H+}
 
@@ -28,8 +28,8 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx;
+  fpg_base,
+  fpg_main;
   
 type
 
@@ -79,8 +79,8 @@ type
 implementation
 
 uses
-  gfx_imgfmt_bmp,
-  gfx_utils;
+  fpg_imgfmt_bmp,
+  fpg_utils;
 
 { TfpgImageList }
 
diff --git a/src/corelib/gfx_imgfmt_bmp.pas b/src/corelib/fpg_imgfmt_bmp.pas
index 46e5f0a8..11298453 100644
--- a/src/corelib/gfx_imgfmt_bmp.pas
+++ b/src/corelib/fpg_imgfmt_bmp.pas
@@ -1,8 +1,22 @@
-{ 
-  BMP format image parser
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      BMP format image parser
 }
 
-unit gfx_imgfmt_bmp;
+
+unit fpg_imgfmt_bmp;
 
 {$mode objfpc}{$H+}
 
@@ -11,15 +25,17 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase{, fpcanvas};
+  fpg_main,
+  fpg_base;
 
 procedure ReadImage_BMP(img: TfpgImage; bmp: Pointer; bmpsize: longword);
 function  LoadImage_BMP(const AFileName: String): TfpgImage;
 function  CreateImage_BMP(bmp: Pointer; bmpsize: longword): TfpgImage;
 
+
 implementation
 
+
 function CreateImage_BMP(bmp: Pointer; bmpsize: longword): TfpgImage;
 begin
   Result := TfpgImage.Create;
diff --git a/src/corelib/fpgfx.pas b/src/corelib/fpg_main.pas
index 332060ba..58b8f6e4 100644
--- a/src/corelib/fpgfx.pas
+++ b/src/corelib/fpg_main.pas
@@ -1,4 +1,21 @@
-unit fpgfx;
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      The main unit trying everything together in corelib.
+}
+
+unit fpg_main;
 
 {$mode objfpc}{$H+}
 
@@ -9,14 +26,14 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase
+  fpg_base
   // This is the only place we have such IFDEF!!! Is this ok, or must we
   // implement it like we have done for the previous version of fpGFX?
   {$IFDEF MSWINDOWS}
-  ,gfx_gdi
+  ,fpg_gdi
   {$ENDIF}
   {$IFDEF UNIX}
-  ,gfx_x11
+  ,fpg_x11
   {$ENDIF}
   ;
 
@@ -362,13 +379,13 @@ implementation
 uses
   strutils,
   math,
-  gfx_imgfmt_bmp,
-  gfx_stdimages,
-  gfx_extinterpolation, // only so that it get auto compiled
-  gfx_translations,
-  gfx_constants,
-  gfx_UTF8utils,
-  gfx_widget,
+  fpg_imgfmt_bmp,
+  fpg_stdimages,
+  fpg_extinterpolation, // only so that it get auto compiled
+  fpg_translations,
+  fpg_constants,
+  fpg_stringutils,
+  fpg_widget,
   gui_dialogs,
   gui_hint;
 
@@ -394,7 +411,7 @@ begin
   FontDesc := AFontDesc;
 end;
 
-{$include gfx_msgqueue.inc}
+{$include fpg_msgqueue.inc}
 
 // Timer support
 
diff --git a/src/corelib/gfx_msgqueue.inc b/src/corelib/fpg_msgqueue.inc
index 20fed3ff..aed7f62b 100644
--- a/src/corelib/gfx_msgqueue.inc
+++ b/src/corelib/fpg_msgqueue.inc
@@ -1,6 +1,6 @@
-{%mainunit fpgfx.pas}
+{%mainunit fpg_main.pas}
 
-// fpGFX internal message queue implementation
+// fpGUI internal message queue implementation
 
 type
   // a simlpe linked list implementation
diff --git a/src/corelib/gfx_pofiles.pas b/src/corelib/fpg_pofiles.pas
index 4a50213a..806e1dc7 100644
--- a/src/corelib/gfx_pofiles.pas
+++ b/src/corelib/fpg_pofiles.pas
@@ -1,7 +1,19 @@
 {
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      Methods and classes for loading translations/localizations from po files.
 
-  Abstract:
-    Methods and classes for loading translations/localizations from po files.
 
   Example 1: Load a specific .po file:
 
@@ -30,7 +42,8 @@
       MessageDlg('Title','Text',mtInformation,[mbOk,mbCancel,mbYes],0);
     end;
 }
-unit gfx_pofiles;
+
+unit fpg_pofiles;
 
 {$mode objfpc}{$H+}{$INLINE ON}
 
@@ -42,7 +55,7 @@ uses
   Classes,
   SysUtils,
   Contnrs,
-  gfx_stringhashlist;
+  fpg_stringhashlist;
 
 type
   TPOFileItem = class(TObject)
@@ -90,10 +103,12 @@ procedure DebugLn(const s1, s2: string);
 procedure DebugLn(const s1, s2, s3: string);
 procedure DebugLn(const s1, s2, s3, s4: string);
 
+
 implementation
 
 uses
-  gfx_UTF8utils;
+  fpg_stringutils;
+
 
 procedure DebugLn(const s1: string);
 begin
diff --git a/src/corelib/gfx_popupwindow.pas b/src/corelib/fpg_popupwindow.pas
index 8fb37b2c..ee891f68 100644
--- a/src/corelib/gfx_popupwindow.pas
+++ b/src/corelib/fpg_popupwindow.pas
@@ -16,7 +16,7 @@
       ComboBox and Calendar controls.
 }
 
-unit gfx_popupwindow;
+unit fpg_popupwindow;
 
 {$mode objfpc}{$H+}
 
@@ -27,10 +27,10 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
-  gfx_impl;
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  fpg_impl;
   
 type
 
diff --git a/src/corelib/gfx_stdimages.pas b/src/corelib/fpg_stdimages.pas
index 8db025e7..07b5f338 100644
--- a/src/corelib/gfx_stdimages.pas
+++ b/src/corelib/fpg_stdimages.pas
@@ -1,15 +1,29 @@
 {
-  Standard fpGUI images that will be used in things like Message,
-  FileOpen, FileSave dialogs, Buttons, etc..
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      Standard fpGUI images that will be used in things like Message,
+      FileOpen, FileSave dialogs, Buttons, etc..
 }
-unit gfx_stdimages;
+
+unit fpg_stdimages;
 
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  fpgfx;
+  fpg_main;
 
 procedure fpgCreateStandardImages;
 
diff --git a/src/corelib/gfx_stringhashlist.pas b/src/corelib/fpg_stringhashlist.pas
index 1fb9521d..15bd36fd 100644
--- a/src/corelib/gfx_stringhashlist.pas
+++ b/src/corelib/fpg_stringhashlist.pas
@@ -1,32 +1,33 @@
 {
- *****************************************************************************
- *                                                                           *
- *  This file is part of the Lazarus Component Library (LCL)                 *
- *                                                                           *
- *  See the file COPYING.modifiedLGPL, 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.                     *
- *                                                                           *
- *****************************************************************************
-
-  Thanks to Markus Waldenburg.
-  
-  Ported this unit to fpGUI by Graeme Geldenhuys.
-  TStringHashList is supposed to be faster than FPC's TFPObjectHashTable. This
-  unit is used in gfx_pofile unit.
+    fpGUI  -  Free Pascal GUI Library
 
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      This file was originally part of the Lazarus Component Library (LCL).
+      Thanks to Markus Waldenburg.
+
+      Ported this unit to fpGUI by Graeme Geldenhuys.
+      TStringHashList is supposed to be faster than FPC's TFPObjectHashTable.
+      This unit is used in fpg_pofile unit.
 }
-unit gfx_stringhashlist;
+
+unit fpg_stringhashlist;
 
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, gfx_constants;
+  Classes, SysUtils, fpg_constants;
 
 type
   PStringHashItem = ^TStringHashItem;
diff --git a/src/corelib/gfx_strings.pas b/src/corelib/fpg_strings.pas
index 68f25f0a..180910d7 100644
--- a/src/corelib/gfx_strings.pas
+++ b/src/corelib/fpg_strings.pas
@@ -1,9 +1,7 @@
 {
     fpGUI  -  Free Pascal GUI Library
 
-    Unit to handle WideString (UTF-16) strings.
-
-    Copyright (C) 2007 See the file AUTHORS.txt, included in this
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
     distribution, for details of the copyright.
 
     See the file COPYING.modifiedLGPL, included in this distribution,
@@ -12,6 +10,9 @@
     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.
+
+    Description:
+      Unit to handle WideString (UTF-16) strings.
 }
 
 
@@ -21,7 +22,7 @@
  //   Graeme:  I'm experimenting with something again.
 
 
-unit gfx_strings;
+unit fpg_strings;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/corelib/gfx_utf8utils.pas b/src/corelib/fpg_stringutils.pas
index af3fd73a..d7a0ca77 100644
--- a/src/corelib/gfx_utf8utils.pas
+++ b/src/corelib/fpg_stringutils.pas
@@ -1,8 +1,22 @@
 {
-  Some handly UTF8 functions copied from the Lazarus LCL. Comes from the
-  LCLProc unit. Surely we can move this into FPC?
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      Some handly UTF8 functions copied from the Lazarus LCL. Comes from the
+      LCLProc unit. Surely we can move this into FPC?
 }
-unit gfx_UTF8utils;
+
+unit fpg_stringutils;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/corelib/gfx_translations.pas b/src/corelib/fpg_translations.pas
index 251427e8..b4be413f 100644
--- a/src/corelib/gfx_translations.pas
+++ b/src/corelib/fpg_translations.pas
@@ -1,8 +1,21 @@
 {
-    Methods and classes for loading the translations/localizations.
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      Methods and classes for loading the translations/localizations.
 }
 
-unit gfx_translations;
+unit fpg_translations;
 
 {$mode objfpc}{$H+}
 
@@ -50,8 +63,8 @@ implementation
 
 uses
   GetText
-  ,gfx_pofiles
-  ,gfx_utils
+  ,fpg_pofiles
+  ,fpg_utils
   ;
   
 
diff --git a/src/corelib/gfx_utils.pas b/src/corelib/fpg_utils.pas
index 04d2aa31..2edd1eab 100644
--- a/src/corelib/gfx_utils.pas
+++ b/src/corelib/fpg_utils.pas
@@ -1,11 +1,28 @@
-unit gfx_utils;
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      Abstracted OS specific function to work in a cross-platfrom manner.
+}
+
+unit fpg_utils;
 
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, gfxbase;
+  Classes, SysUtils, fpg_base;
 
 // *** Platform specific functions ***
 
@@ -37,7 +54,7 @@ implementation
 
 
 // Platform specific encoding handling functions
-{$I gfx_utils_impl.inc}
+{$I fpg_utils_impl.inc}
 
 
 
diff --git a/src/corelib/gfx_widget.pas b/src/corelib/fpg_widget.pas
index d821e6e2..e471dd9d 100644
--- a/src/corelib/gfx_widget.pas
+++ b/src/corelib/fpg_widget.pas
@@ -1,4 +1,21 @@
-unit gfx_widget;
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      The base widget, which all GUI widgets inherit from.
+}
+
+unit fpg_widget;
 
 {$mode objfpc}{$H+}
 
@@ -9,15 +26,13 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase;
+  fpg_main,
+  fpg_base;
 
 type
   TFocusSearchDirection = (fsdFirst, fsdLast, fsdNext, fsdPrev);
 
 
-  { TfpgWidget }
-
   TfpgWidget = class(TfpgWindow)
   private
     FAlignRect: TfpgRect;
@@ -152,7 +167,7 @@ function FindKeyboardFocus: TfpgWidget;
 implementation
 
 uses
-  math, gfx_constants, gui_hint;
+  math, fpg_constants, gui_hint;
 
 
 var
diff --git a/src/corelib/gfx_wuline.pas b/src/corelib/fpg_wuline.pas
index e2472a2e..1f159d08 100644
--- a/src/corelib/gfx_wuline.pas
+++ b/src/corelib/fpg_wuline.pas
@@ -19,14 +19,14 @@
       Here is an implementation in C++
         http://www.codeproject.com/gdi/antialias.asp
 }
-unit gfx_wuline;
+unit fpg_wuline;
 
 {$mode objfpc}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, gfxbase, fpgfx;
+  Classes, SysUtils, fpg_base, fpg_main;
 
 
 procedure WuLine(ACanvas: TfpgCanvas; Point1, Point2: TPoint; AColor: TfpgColor);
diff --git a/src/corelib/gdi/gfx_gdi.pas b/src/corelib/gdi/fpg_gdi.pas
index 5ffc09fd..c3b66751 100644
--- a/src/corelib/gdi/gfx_gdi.pas
+++ b/src/corelib/gdi/fpg_gdi.pas
@@ -15,7 +15,7 @@
       This defines the CoreLib backend interface to the Windows GDI API.
 }
 
-unit gfx_gdi;
+unit fpg_gdi;
 
 {$mode objfpc}{$H+}
 
@@ -27,8 +27,8 @@ uses
   Windows,
   Classes,
   SysUtils,
-  gfxbase,
-  gfx_impl;
+  fpg_base,
+  fpg_impl;
 
 { Constants missing on windows unit }
 const
@@ -237,12 +237,13 @@ type
 implementation
 
 uses
-  fpgfx,
-  gfx_widget,
-  gui_form, // how can we remove this dependency?
-  gfx_UTF8Utils,
-  math,
-  gfx_popupwindow;
+  fpg_main,
+  fpg_widget,
+  fpg_popupwindow,
+  fpg_stringutils,
+  gui_form,
+  math;
+
 
 var
   wapplication: TfpgApplication;
@@ -251,7 +252,7 @@ var
 
 
 // some required keyboard functions
-{$INCLUDE gdikeys.inc}
+{$INCLUDE fpg_keys_gdi.inc}
 
 function fpgColorToWin(col: TfpgColor): longword;
 var
diff --git a/src/corelib/gdi/gdikeys.inc b/src/corelib/gdi/fpg_keys_gdi.inc
index be892483..e7d79f25 100644
--- a/src/corelib/gdi/gdikeys.inc
+++ b/src/corelib/gdi/fpg_keys_gdi.inc
@@ -1,18 +1,21 @@
 {
-    fpGFX  -  Free Pascal Graphics Library
+   fpGUI  -  Free Pascal GUI Library
 
-    Win32 GDI target implementation: Keycode translation helpers
+   Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+   distribution, for details of the copyright.
 
-    See the file COPYING.modifiedLGPL, included in this distribution,
-    for details about the copyright.
+   See the file COPYING.modifiedLGPL, included in this distribution,
+   for details about redistributing fpGUI.
 
-    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.
+   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.
 
- **********************************************************************}
+   Description:
+     Win32 GDI target implementation: Keycode translation helpers
+}
 
-{%mainunit gfx_gdi.pas}
+{%mainunit fpg_gdi.pas}
 
 function VirtKeyToKeycode(VirtKey: Byte): Word;
 const
diff --git a/src/corelib/gdi/gfx_utils_impl.inc b/src/corelib/gdi/fpg_utils_impl.inc
index 3862dc23..5d72ca88 100644
--- a/src/corelib/gdi/gfx_utils_impl.inc
+++ b/src/corelib/gdi/fpg_utils_impl.inc
@@ -1,7 +1,8 @@
-{%mainunit gfx_utils.pas}
+{%mainunit fpg_utils.pas}
 
 uses
-  Registry, Shellapi;
+  Registry,
+  Shellapi;
   
 // GDI specific implementations of encoding functions
 
diff --git a/src/corelib/gdi/fpgui_toolkit.lpk b/src/corelib/gdi/fpgui_toolkit.lpk
index 4158ab1b..ab4189f9 100644
--- a/src/corelib/gdi/fpgui_toolkit.lpk
+++ b/src/corelib/gdi/fpgui_toolkit.lpk
@@ -36,76 +36,76 @@
         <Type Value="Include"/>
       </Item1>
       <Item2>
-        <Filename Value="..\fpgfx.pas"/>
-        <UnitName Value="fpgfx"/>
+        <Filename Value="..\fpg_base.pas"/>
+        <UnitName Value="fpg_base"/>
       </Item2>
       <Item3>
-        <Filename Value="..\gfxbase.pas"/>
-        <UnitName Value="gfxbase"/>
+        <Filename Value="..\fpg_main.pas"/>
+        <UnitName Value="fpg_main"/>
       </Item3>
       <Item4>
-        <Filename Value="..\gfx_cmdlineparams.pas"/>
-        <UnitName Value="gfx_cmdlineparams"/>
+        <Filename Value="..\fpg_cmdlineparams.pas"/>
+        <UnitName Value="fpg_cmdlineparams"/>
       </Item4>
       <Item5>
-        <Filename Value="..\gfx_command_intf.pas"/>
-        <UnitName Value="gfx_command_intf"/>
+        <Filename Value="..\fpg_command_intf.pas"/>
+        <UnitName Value="fpg_command_intf"/>
       </Item5>
       <Item6>
-        <Filename Value="..\gfx_constants.pas"/>
-        <UnitName Value="gfx_constants"/>
+        <Filename Value="..\fpg_constants.pas"/>
+        <UnitName Value="fpg_constants"/>
       </Item6>
       <Item7>
-        <Filename Value="..\gfx_extinterpolation.pas"/>
-        <UnitName Value="gfx_extinterpolation"/>
+        <Filename Value="..\fpg_extinterpolation.pas"/>
+        <UnitName Value="fpg_extinterpolation"/>
       </Item7>
       <Item8>
-        <Filename Value="..\gfx_imagelist.pas"/>
-        <UnitName Value="gfx_imagelist"/>
+        <Filename Value="..\fpg_imagelist.pas"/>
+        <UnitName Value="fpg_imagelist"/>
       </Item8>
       <Item9>
-        <Filename Value="..\gfx_imgfmt_bmp.pas"/>
-        <UnitName Value="gfx_imgfmt_bmp"/>
+        <Filename Value="..\fpg_imgfmt_bmp.pas"/>
+        <UnitName Value="fpg_imgfmt_bmp"/>
       </Item9>
       <Item10>
-        <Filename Value="..\gfx_msgqueue.inc"/>
+        <Filename Value="..\fpg_msgqueue.inc"/>
         <Type Value="Include"/>
       </Item10>
       <Item11>
-        <Filename Value="..\gfx_pofiles.pas"/>
-        <UnitName Value="gfx_pofiles"/>
+        <Filename Value="..\fpg_pofiles.pas"/>
+        <UnitName Value="fpg_pofiles"/>
       </Item11>
       <Item12>
-        <Filename Value="..\gfx_popupwindow.pas"/>
-        <UnitName Value="gfx_popupwindow"/>
+        <Filename Value="..\fpg_popupwindow.pas"/>
+        <UnitName Value="fpg_popupwindow"/>
       </Item12>
       <Item13>
-        <Filename Value="..\gfx_stdimages.pas"/>
-        <UnitName Value="gfx_stdimages"/>
+        <Filename Value="..\fpg_stdimages.pas"/>
+        <UnitName Value="fpg_stdimages"/>
       </Item13>
       <Item14>
-        <Filename Value="..\gfx_stringhashlist.pas"/>
-        <UnitName Value="gfx_stringhashlist"/>
+        <Filename Value="..\fpg_stringhashlist.pas"/>
+        <UnitName Value="fpg_stringhashlist"/>
       </Item14>
       <Item15>
-        <Filename Value="..\gfx_translations.pas"/>
-        <UnitName Value="gfx_translations"/>
+        <Filename Value="..\fpg_translations.pas"/>
+        <UnitName Value="fpg_translations"/>
       </Item15>
       <Item16>
-        <Filename Value="..\gfx_utf8utils.pas"/>
-        <UnitName Value="gfx_UTF8utils"/>
+        <Filename Value="..\fpg_stringutils.pas"/>
+        <UnitName Value="fpg_stringutils"/>
       </Item16>
       <Item17>
-        <Filename Value="..\gfx_utils.pas"/>
-        <UnitName Value="gfx_utils"/>
+        <Filename Value="..\fpg_utils.pas"/>
+        <UnitName Value="fpg_utils"/>
       </Item17>
       <Item18>
-        <Filename Value="..\gfx_widget.pas"/>
-        <UnitName Value="gfx_widget"/>
+        <Filename Value="..\fpg_widget.pas"/>
+        <UnitName Value="fpg_widget"/>
       </Item18>
       <Item19>
-        <Filename Value="..\gfx_wuline.pas"/>
-        <UnitName Value="gfx_wuline"/>
+        <Filename Value="..\fpg_wuline.pas"/>
+        <UnitName Value="fpg_wuline"/>
       </Item19>
       <Item20>
         <Filename Value="..\keys.inc"/>
@@ -288,19 +288,19 @@
         <UnitName Value="fpgui_db"/>
       </Item64>
       <Item65>
-        <Filename Value="gfx_utils_impl.inc"/>
+        <Filename Value="fpg_utils_impl.inc"/>
         <Type Value="Include"/>
       </Item65>
       <Item66>
-        <Filename Value="gfx_gdi.pas"/>
-        <UnitName Value="gfx_gdi"/>
+        <Filename Value="fpg_gdi.pas"/>
+        <UnitName Value="fpg_gdi"/>
       </Item66>
       <Item67>
-        <Filename Value="gfx_impl.pas"/>
-        <UnitName Value="gfx_impl"/>
+        <Filename Value="fpg_impl.pas"/>
+        <UnitName Value="fpg_impl"/>
       </Item67>
       <Item68>
-        <Filename Value="gdikeys.inc"/>
+        <Filename Value="fpg_keys_gdi.inc"/>
         <Type Value="Include"/>
       </Item68>
       <Item69>
diff --git a/src/corelib/gdi/fpgui_toolkit.pas b/src/corelib/gdi/fpgui_toolkit.pas
index 93dd9265..bce70477 100644
--- a/src/corelib/gdi/fpgui_toolkit.pas
+++ b/src/corelib/gdi/fpgui_toolkit.pas
@@ -7,16 +7,16 @@ unit fpgui_toolkit;
 interface
 
 uses
-  fpgfx, gfxbase, gfx_cmdlineparams, gfx_command_intf, gfx_constants, 
-    gfx_extinterpolation, gfx_imagelist, gfx_imgfmt_bmp, gfx_pofiles, 
-    gfx_popupwindow, gfx_stdimages, gfx_stringhashlist, gfx_translations, 
-    gfx_UTF8utils, gfx_utils, gfx_widget, gfx_wuline, gui_animation, 
+  fpg_base, fpg_main, fpg_cmdlineparams, fpg_command_intf, fpg_constants, 
+    fpg_extinterpolation, fpg_imagelist, fpg_imgfmt_bmp, fpg_pofiles, 
+    fpg_popupwindow, fpg_stdimages, fpg_stringhashlist, fpg_translations, 
+    fpg_stringutils, fpg_utils, fpg_widget, fpg_wuline, gui_animation, 
     gui_basegrid, gui_bevel, gui_button, gui_checkbox, gui_combobox, 
     gui_customgrid, gui_dialogs, gui_editcombo, gui_edit, gui_form, gui_gauge, 
     gui_grid, gui_hyperlink, gui_iniutils, gui_label, gui_listbox, 
     gui_listview, gui_memo, gui_menu, gui_mru, gui_panel, gui_popupcalendar, 
     gui_progressbar, gui_radiobutton, gui_scrollbar, gui_style, gui_tab, 
-    gui_trackbar, gui_tree, fpgui_db, gfx_gdi, gfx_impl, gui_splitter, 
+    gui_trackbar, gui_tree, fpgui_db, fpg_gdi, fpg_impl, gui_splitter, 
     gui_hint; 
 
 implementation
diff --git a/src/corelib/x11/fpg_impl.pas b/src/corelib/x11/fpg_impl.pas
new file mode 100644
index 00000000..81b8012c
--- /dev/null
+++ b/src/corelib/x11/fpg_impl.pas
@@ -0,0 +1,36 @@
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      This translates platform specific classes to platform independant
+      classes.
+}
+
+unit fpg_impl;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  x;
+  
+type
+    TfpgWinHandle = TXID;
+    TfpgDCHandle  = TXID;
+
+
+implementation
+
+end.
+
diff --git a/src/corelib/x11/x11_keyconv.pas b/src/corelib/x11/fpg_keyconv_x11.pas
index fe25b7a4..80c53417 100644
--- a/src/corelib/x11/x11_keyconv.pas
+++ b/src/corelib/x11/fpg_keyconv_x11.pas
@@ -1,4 +1,22 @@
-unit x11_keyconv;
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      This was keycode lookup tables used when fpGUI used WideStrings.
+      This unit is not used anymore.
+}
+
+unit fpg_keyconv_x11;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/corelib/x11/_netlayer.pas b/src/corelib/x11/fpg_netlayer_x11.pas
index ab07c10a..b6d0dd70 100644
--- a/src/corelib/x11/_netlayer.pas
+++ b/src/corelib/x11/fpg_netlayer_x11.pas
@@ -1,4 +1,21 @@
-unit _netlayer;
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      Xlib netlayer support
+}
+
+unit fpg_netlayer_x11;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/corelib/x11/gfx_utils_impl.inc b/src/corelib/x11/fpg_utils_impl.inc
index 499de82d..2099addb 100644
--- a/src/corelib/x11/gfx_utils_impl.inc
+++ b/src/corelib/x11/fpg_utils_impl.inc
@@ -1,4 +1,4 @@
-{%mainunit gfx_utils.pas}
+{%mainunit fpg_utils.pas}
 
 uses
   Unix;
diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/fpg_x11.pas
index a5fc8e9e..66fa7a62 100644
--- a/src/corelib/x11/gfx_x11.pas
+++ b/src/corelib/x11/fpg_x11.pas
@@ -1,4 +1,21 @@
-unit gfx_x11;
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    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.
+
+    Description:
+      This unit implements X11 / Xlib support for fpGUI.
+}
+
+unit fpg_x11;
 
 {$mode objfpc}{$H+}
 
@@ -13,10 +30,10 @@ uses
   Xlib,
   XUtil,
   ctypes,
-  x11_xft,
-  _netlayer,
-  gfxbase,
-  gfx_impl;
+  fpg_xft_x11,
+  fpg_netlayer_x11,
+  fpg_base,
+  fpg_impl;
   
 const
   IconBitmapWidth = 16;
@@ -282,13 +299,13 @@ uses
   baseunix,
   // Graeme: temporary. libc is not available for FreeBSD.
   {$if defined(linux) and defined(cpu386)}libc,{$endif}
-  fpgfx,
-  gfx_widget,
-  gui_form,
+  fpg_main,
+  fpg_widget,
+  fpg_popupwindow,
+  fpg_stringutils,  // used for GetTextWidth
+  gui_form,         // for modal event support
   cursorfont,
-  gfx_popupwindow,
-  xatom,          // used for XA_WM_NAME
-  gfx_utf8utils;  // used for GetTextWidth
+  xatom;            // used for XA_WM_NAME
 
 var
   xapplication: TfpgApplication;
diff --git a/src/corelib/x11/x11_xft.pas b/src/corelib/x11/fpg_xft_x11.pas
index 805797cd..f517ecf9 100644
--- a/src/corelib/x11/x11_xft.pas
+++ b/src/corelib/x11/fpg_xft_x11.pas
@@ -1,24 +1,23 @@
 {
-    fpGFX  -  Free Pascal Graphics Library
-    Copyright (C) 2006-2007 by Graeme Geldenhuys
-      member of the fpGFX development team.
+    fpGUI  -  Free Pascal GUI Library
 
-    Xft interface functions
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
 
-    See the file COPYING.fpGFX, included in this distribution,
-    for details about the copyright.
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
 
     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.
 
- **********************************************************************}
+    Description:
+      Xft interface functions
+}
 
-
-unit x11_xft;
+unit fpg_xft_x11;
 
 {$mode objfpc}{$H+}
-
 {$linklib Xft}
 
 interface
diff --git a/src/corelib/x11/fpgui_toolkit.lpk b/src/corelib/x11/fpgui_toolkit.lpk
index ddbd27b9..e3a6b911 100644
--- a/src/corelib/x11/fpgui_toolkit.lpk
+++ b/src/corelib/x11/fpgui_toolkit.lpk
@@ -29,82 +29,82 @@
     <License Value="Modified LGPL
 "/>
     <Version Minor="6" Release="2"/>
-    <Files Count="72">
+    <Files Count="71">
       <Item1>
         <Filename Value="../stdimages.inc"/>
         <Type Value="Include"/>
       </Item1>
       <Item2>
-        <Filename Value="../fpgfx.pas"/>
-        <UnitName Value="fpgfx"/>
+        <Filename Value="../fpg_base.pas"/>
+        <UnitName Value="fpg_base"/>
       </Item2>
       <Item3>
-        <Filename Value="../gfxbase.pas"/>
-        <UnitName Value="gfxbase"/>
+        <Filename Value="../fpg_main.pas"/>
+        <UnitName Value="fpg_main"/>
       </Item3>
       <Item4>
-        <Filename Value="../gfx_cmdlineparams.pas"/>
-        <UnitName Value="gfx_cmdlineparams"/>
+        <Filename Value="../fpg_cmdlineparams.pas"/>
+        <UnitName Value="fpg_cmdlineparams"/>
       </Item4>
       <Item5>
-        <Filename Value="../gfx_command_intf.pas"/>
-        <UnitName Value="gfx_command_intf"/>
+        <Filename Value="../fpg_command_intf.pas"/>
+        <UnitName Value="fpg_command_intf"/>
       </Item5>
       <Item6>
-        <Filename Value="../gfx_constants.pas"/>
-        <UnitName Value="gfx_constants"/>
+        <Filename Value="../fpg_constants.pas"/>
+        <UnitName Value="fpg_constants"/>
       </Item6>
       <Item7>
-        <Filename Value="../gfx_extinterpolation.pas"/>
-        <UnitName Value="gfx_extinterpolation"/>
+        <Filename Value="../fpg_extinterpolation.pas"/>
+        <UnitName Value="fpg_extinterpolation"/>
       </Item7>
       <Item8>
-        <Filename Value="../gfx_imagelist.pas"/>
-        <UnitName Value="gfx_imagelist"/>
+        <Filename Value="../fpg_imagelist.pas"/>
+        <UnitName Value="fpg_imagelist"/>
       </Item8>
       <Item9>
-        <Filename Value="../gfx_imgfmt_bmp.pas"/>
-        <UnitName Value="gfx_imgfmt_bmp"/>
+        <Filename Value="../fpg_imgfmt_bmp.pas"/>
+        <UnitName Value="fpg_imgfmt_bmp"/>
       </Item9>
       <Item10>
-        <Filename Value="../gfx_msgqueue.inc"/>
+        <Filename Value="../fpg_msgqueue.inc"/>
         <Type Value="Include"/>
       </Item10>
       <Item11>
-        <Filename Value="../gfx_pofiles.pas"/>
-        <UnitName Value="gfx_pofiles"/>
+        <Filename Value="../fpg_pofiles.pas"/>
+        <UnitName Value="fpg_pofiles"/>
       </Item11>
       <Item12>
-        <Filename Value="../gfx_popupwindow.pas"/>
-        <UnitName Value="gfx_popupwindow"/>
+        <Filename Value="../fpg_popupwindow.pas"/>
+        <UnitName Value="fpg_popupwindow"/>
       </Item12>
       <Item13>
-        <Filename Value="../gfx_stdimages.pas"/>
-        <UnitName Value="gfx_stdimages"/>
+        <Filename Value="../fpg_stdimages.pas"/>
+        <UnitName Value="fpg_stdimages"/>
       </Item13>
       <Item14>
-        <Filename Value="../gfx_stringhashlist.pas"/>
-        <UnitName Value="gfx_stringhashlist"/>
+        <Filename Value="../fpg_stringhashlist.pas"/>
+        <UnitName Value="fpg_stringhashlist"/>
       </Item14>
       <Item15>
-        <Filename Value="../gfx_translations.pas"/>
-        <UnitName Value="gfx_translations"/>
+        <Filename Value="../fpg_translations.pas"/>
+        <UnitName Value="fpg_translations"/>
       </Item15>
       <Item16>
-        <Filename Value="../gfx_utf8utils.pas"/>
-        <UnitName Value="gfx_UTF8utils"/>
+        <Filename Value="../fpg_stringutils.pas"/>
+        <UnitName Value="fpg_stringutils"/>
       </Item16>
       <Item17>
-        <Filename Value="../gfx_utils.pas"/>
-        <UnitName Value="gfx_utils"/>
+        <Filename Value="../fpg_utils.pas"/>
+        <UnitName Value="fpg_utils"/>
       </Item17>
       <Item18>
-        <Filename Value="../gfx_widget.pas"/>
-        <UnitName Value="gfx_widget"/>
+        <Filename Value="../fpg_widget.pas"/>
+        <UnitName Value="fpg_widget"/>
       </Item18>
       <Item19>
-        <Filename Value="../gfx_wuline.pas"/>
-        <UnitName Value="gfx_wuline"/>
+        <Filename Value="../fpg_wuline.pas"/>
+        <UnitName Value="fpg_wuline"/>
       </Item19>
       <Item20>
         <Filename Value="../keys.inc"/>
@@ -147,28 +147,28 @@
         <Type Value="Include"/>
       </Item29>
       <Item30>
-        <Filename Value="gfx_impl.pas"/>
-        <UnitName Value="gfx_impl"/>
+        <Filename Value="fpg_impl.pas"/>
+        <UnitName Value="fpg_impl"/>
       </Item30>
       <Item31>
-        <Filename Value="gfx_utils_impl.inc"/>
+        <Filename Value="fpg_utils_impl.inc"/>
         <Type Value="Include"/>
       </Item31>
       <Item32>
-        <Filename Value="gfx_x11.pas"/>
-        <UnitName Value="gfx_x11"/>
+        <Filename Value="fpg_x11.pas"/>
+        <UnitName Value="fpg_x11"/>
       </Item32>
       <Item33>
-        <Filename Value="_netlayer.pas"/>
-        <UnitName Value="_netlayer"/>
+        <Filename Value="fpg_netlayer_x11.pas"/>
+        <UnitName Value="fpg_netlayer_x11"/>
       </Item33>
       <Item34>
-        <Filename Value="x11_keyconv.pas"/>
-        <UnitName Value="x11_keyconv"/>
+        <Filename Value="fpg_keyconv_x11.pas"/>
+        <UnitName Value="fpg_keyconv_x11"/>
       </Item34>
       <Item35>
-        <Filename Value="x11_xft.pas"/>
-        <UnitName Value="x11_xft"/>
+        <Filename Value="fpg_xft_x11.pas"/>
+        <UnitName Value="fpg_xft_x11"/>
       </Item35>
       <Item36>
         <Filename Value="../../gui/promptuserdialog.inc"/>
@@ -183,141 +183,137 @@
         <UnitName Value="gui_basegrid"/>
       </Item38>
       <Item39>
-        <Filename Value="../../gui/gui_bevel.pas"/>
-        <UnitName Value="gui_bevel"/>
-      </Item39>
-      <Item40>
         <Filename Value="../../gui/gui_button.pas"/>
         <UnitName Value="gui_button"/>
-      </Item40>
-      <Item41>
+      </Item39>
+      <Item40>
         <Filename Value="../../gui/gui_checkbox.pas"/>
         <UnitName Value="gui_checkbox"/>
-      </Item41>
-      <Item42>
+      </Item40>
+      <Item41>
         <Filename Value="../../gui/gui_combobox.pas"/>
         <UnitName Value="gui_combobox"/>
-      </Item42>
-      <Item43>
+      </Item41>
+      <Item42>
         <Filename Value="../../gui/gui_customgrid.pas"/>
         <UnitName Value="gui_customgrid"/>
-      </Item43>
-      <Item44>
+      </Item42>
+      <Item43>
         <Filename Value="../../gui/gui_dialogs.pas"/>
         <UnitName Value="gui_dialogs"/>
-      </Item44>
-      <Item45>
+      </Item43>
+      <Item44>
         <Filename Value="../../gui/gui_editcombo.pas"/>
         <UnitName Value="gui_editcombo"/>
-      </Item45>
-      <Item46>
+      </Item44>
+      <Item45>
         <Filename Value="../../gui/gui_edit.pas"/>
         <UnitName Value="gui_edit"/>
-      </Item46>
-      <Item47>
+      </Item45>
+      <Item46>
         <Filename Value="../../gui/gui_form.pas"/>
         <UnitName Value="gui_form"/>
-      </Item47>
-      <Item48>
+      </Item46>
+      <Item47>
         <Filename Value="../../gui/gui_gauge.pas"/>
         <UnitName Value="gui_gauge"/>
-      </Item48>
-      <Item49>
+      </Item47>
+      <Item48>
         <Filename Value="../../gui/gui_grid.pas"/>
         <UnitName Value="gui_grid"/>
-      </Item49>
-      <Item50>
+      </Item48>
+      <Item49>
         <Filename Value="../../gui/gui_hyperlink.pas"/>
         <UnitName Value="gui_hyperlink"/>
-      </Item50>
-      <Item51>
+      </Item49>
+      <Item50>
         <Filename Value="../../gui/gui_iniutils.pas"/>
         <UnitName Value="gui_iniutils"/>
-      </Item51>
-      <Item52>
+      </Item50>
+      <Item51>
         <Filename Value="../../gui/gui_label.pas"/>
         <UnitName Value="gui_label"/>
-      </Item52>
-      <Item53>
+      </Item51>
+      <Item52>
         <Filename Value="../../gui/gui_listbox.pas"/>
         <UnitName Value="gui_listbox"/>
-      </Item53>
-      <Item54>
+      </Item52>
+      <Item53>
         <Filename Value="../../gui/gui_listview.pas"/>
         <UnitName Value="gui_listview"/>
-      </Item54>
-      <Item55>
+      </Item53>
+      <Item54>
         <Filename Value="../../gui/gui_memo.pas"/>
         <UnitName Value="gui_memo"/>
-      </Item55>
-      <Item56>
+      </Item54>
+      <Item55>
         <Filename Value="../../gui/gui_menu.pas"/>
         <UnitName Value="gui_menu"/>
-      </Item56>
-      <Item57>
+      </Item55>
+      <Item56>
         <Filename Value="../../gui/gui_mru.pas"/>
         <UnitName Value="gui_mru"/>
-      </Item57>
-      <Item58>
+      </Item56>
+      <Item57>
         <Filename Value="../../gui/gui_panel.pas"/>
         <UnitName Value="gui_panel"/>
-      </Item58>
-      <Item59>
+      </Item57>
+      <Item58>
         <Filename Value="../../gui/gui_popupcalendar.pas"/>
         <UnitName Value="gui_popupcalendar"/>
-      </Item59>
-      <Item60>
+      </Item58>
+      <Item59>
         <Filename Value="../../gui/gui_progressbar.pas"/>
         <UnitName Value="gui_progressbar"/>
-      </Item60>
-      <Item61>
+      </Item59>
+      <Item60>
         <Filename Value="../../gui/gui_radiobutton.pas"/>
         <UnitName Value="gui_radiobutton"/>
-      </Item61>
-      <Item62>
+      </Item60>
+      <Item61>
         <Filename Value="../../gui/gui_scrollbar.pas"/>
         <UnitName Value="gui_scrollbar"/>
-      </Item62>
-      <Item63>
+      </Item61>
+      <Item62>
         <Filename Value="../../gui/gui_style.pas"/>
         <UnitName Value="gui_style"/>
-      </Item63>
-      <Item64>
+      </Item62>
+      <Item63>
         <Filename Value="../../gui/gui_tab.pas"/>
         <UnitName Value="gui_tab"/>
-      </Item64>
-      <Item65>
+      </Item63>
+      <Item64>
         <Filename Value="../../gui/gui_trackbar.pas"/>
         <UnitName Value="gui_trackbar"/>
-      </Item65>
-      <Item66>
+      </Item64>
+      <Item65>
         <Filename Value="../../gui/gui_tree.pas"/>
         <UnitName Value="gui_tree"/>
+      </Item65>
+      <Item66>
+        <Filename Value="../../gui/logo.inc"/>
+        <Type Value="Include"/>
       </Item66>
       <Item67>
-        <Filename Value="../../gui/logo.inc"/>
+        <Filename Value="../../gui/messagedialog.inc"/>
         <Type Value="Include"/>
       </Item67>
       <Item68>
-        <Filename Value="../../gui/messagedialog.inc"/>
+        <Filename Value="../../gui/newdirdialog.inc"/>
         <Type Value="Include"/>
       </Item68>
       <Item69>
-        <Filename Value="../../gui/newdirdialog.inc"/>
-        <Type Value="Include"/>
-      </Item69>
-      <Item70>
         <Filename Value="../../gui/db/fpgui_db.pas"/>
         <UnitName Value="fpgui_db"/>
-      </Item70>
-      <Item71>
+      </Item69>
+      <Item70>
         <Filename Value="../../gui/gui_splitter.pas"/>
         <UnitName Value="gui_splitter"/>
-      </Item71>
-      <Item72>
+      </Item70>
+      <Item71>
         <Filename Value="../../gui/gui_hint.pas"/>
         <UnitName Value="gui_hint"/>
-      </Item72>
+      </Item71>
     </Files>
     <LazDoc Paths="../../../docs/xml/corelib/;../../../docs/xml/corelib/x11/;../../../docs/xml/corelib/gdi/;../../../docs/xml/gui/"/>
     <RequiredPkgs Count="1">
diff --git a/src/corelib/x11/fpgui_toolkit.pas b/src/corelib/x11/fpgui_toolkit.pas
index 89d04a35..504536a2 100644
--- a/src/corelib/x11/fpgui_toolkit.pas
+++ b/src/corelib/x11/fpgui_toolkit.pas
@@ -1,5 +1,5 @@
-{ This file was automatically created by Lazarus. Do not edit!
-This source is only used to compile and install the package.
+{ This file was automatically created by Lazarus. do not edit!
+  This source is only used to compile and install the package.
  }
 
 unit fpgui_toolkit; 
@@ -7,17 +7,17 @@ unit fpgui_toolkit;
 interface
 
 uses
-  fpgfx, gfxbase, gfx_cmdlineparams, gfx_command_intf, gfx_constants, 
-    gfx_extinterpolation, gfx_imagelist, gfx_imgfmt_bmp, gfx_pofiles, 
-    gfx_popupwindow, gfx_stdimages, gfx_stringhashlist, gfx_translations, 
-    gfx_UTF8utils, gfx_utils, gfx_widget, gfx_wuline, gfx_impl, gfx_x11, 
-    _netlayer, x11_keyconv, x11_xft, gui_animation, gui_basegrid, gui_bevel, 
-    gui_button, gui_checkbox, gui_combobox, gui_customgrid, gui_dialogs, 
-    gui_editcombo, gui_edit, gui_form, gui_gauge, gui_grid, gui_hyperlink, 
-    gui_iniutils, gui_label, gui_listbox, gui_listview, gui_memo, gui_menu, 
-    gui_mru, gui_panel, gui_popupcalendar, gui_progressbar, gui_radiobutton, 
-    gui_scrollbar, gui_style, gui_tab, gui_trackbar, gui_tree, fpgui_db, 
-    gui_splitter, gui_hint; 
+  fpg_base, fpg_main, fpg_cmdlineparams, fpg_command_intf, fpg_constants, 
+  fpg_extinterpolation, fpg_imagelist, fpg_imgfmt_bmp, fpg_pofiles, 
+  fpg_popupwindow, fpg_stdimages, fpg_stringhashlist, fpg_translations, 
+  fpg_stringutils, fpg_utils, fpg_widget, fpg_wuline, fpg_impl, fpg_x11, 
+  fpg_netlayer_x11, fpg_keyconv_x11, fpg_xft_x11, gui_animation, gui_basegrid, 
+  gui_button, gui_checkbox, gui_combobox, gui_customgrid, gui_dialogs, 
+  gui_editcombo, gui_edit, gui_form, gui_gauge, gui_grid, gui_hyperlink, 
+  gui_iniutils, gui_label, gui_listbox, gui_listview, gui_memo, gui_menu, 
+  gui_mru, gui_panel, gui_popupcalendar, gui_progressbar, gui_radiobutton, 
+  gui_scrollbar, gui_style, gui_tab, gui_trackbar, gui_tree, fpgui_db, 
+  gui_splitter, gui_hint;
 
 implementation
 
diff --git a/src/corelib/x11/gfx_impl.pas b/src/corelib/x11/gfx_impl.pas
deleted file mode 100644
index 897e0cbf..00000000
--- a/src/corelib/x11/gfx_impl.pas
+++ /dev/null
@@ -1,18 +0,0 @@
-unit gfx_impl;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  x;
-  
-type
-    TfpgWinHandle = TXID;
-    TfpgDCHandle  = TXID;
-
-
-implementation
-
-end.
-