* Rename all corelib units to the new naming convention.

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

32 files changed, 158 insertions, 308 deletions

diff --git a/src/gui/db/fpgui_db.pas b/src/gui/db/fpgui_db.pas
index ec91e8e3..dd2381de 100644
--- a/src/gui/db/fpgui_db.pas
+++ b/src/gui/db/fpgui_db.pas
@@ -28,7 +28,7 @@ interface
 uses
   Classes,
   db,
-  gfx_widget,
+  fpg_widget,
   gui_label{, gui_edit};
   
 type
diff --git a/src/gui/gui_animation.pas b/src/gui/gui_animation.pas
index bd15ebdd..5ad6042d 100644
--- a/src/gui/gui_animation.pas
+++ b/src/gui/gui_animation.pas
@@ -25,9 +25,9 @@ interface
 
 uses
   Classes,
-  gfx_widget,
-  gfxbase,
-  fpgfx;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
 
 type
 
@@ -77,8 +77,8 @@ implementation
 
 uses
   SysUtils,
-  gfx_imgfmt_bmp,
-  gfx_utils;
+  fpg_imgfmt_bmp,
+  fpg_utils;
 
 
 { TfpgBaseImgAnim }
diff --git a/src/gui/gui_basegrid.pas b/src/gui/gui_basegrid.pas
index aa9cc0b9..9916761a 100644
--- a/src/gui/gui_basegrid.pas
+++ b/src/gui/gui_basegrid.pas
@@ -27,9 +27,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
   gui_scrollbar;
   
 type
@@ -159,6 +159,7 @@ type
     procedure   MouseToCell(X, Y: Integer; var ACol, ARow: Integer);
   end;
 
+
 implementation
 
 { TfpgBaseGrid }
diff --git a/src/gui/gui_bevel.pas b/src/gui/gui_bevel.pas
deleted file mode 100644
index f62e18af..00000000
--- a/src/gui/gui_bevel.pas
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    fpGUI  -  Free Pascal GUI Toolkit
-
-    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:
-      Defines a Bevel control. Also known as a Panel or Frame control.
-}
-
-
-
-{ **********************************************************
-
-          DO NOT USE!  THIS UNIT IS DEPRECATED.
-
-    Use gui_panel.pas instead.
-
-  *********************************************************}
-  
-unit gui_bevel;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  Classes,
-  SysUtils,
-  fpgfx,
-  gfxbase,
-  gfx_widget;
-  
-type
-
-  TBevelShape = (bsBox, bsFrame, bsTopLine, bsBottomLine, bsLeftLine,
-                 bsRightLine, bsSpacer);
-
-  TBevelStyle = (bsLowered, bsRaised);
-  
-
-  TfpgBevel = class(TfpgWidget)
-  private
-    FBevelShape: TBevelShape;
-    FBevelStyle: TBevelStyle;
-    procedure   SetBevelShape(const AValue: TBevelShape);
-    procedure   SetBevelStyle(const AValue: TBevelStyle);
-  protected
-    procedure   HandlePaint; override;
-  public
-    constructor Create(AOwner: TComponent); override;
-  published
-    property    BackgroundColor;
-    property    Shape: TBevelShape read FBevelShape write SetBevelShape default bsBox;
-    property    Style: TBevelStyle read FBevelStyle write SetBevelStyle default bsRaised;
-    property    OnClick;
-    property    OnDoubleClick;
-  end;
-
-{
-function CreateBevel(AOwner: TComponent; ALeft, ATop, AWidth, AHeight: TfpgCoord;
-           AShape: TBevelShape; AStyle: TBevelStyle): TfpgBevel;
-}
-
-implementation
-
-{
-function CreateBevel(AOwner: TComponent; ALeft, ATop, AWidth,
-  AHeight: TfpgCoord; AShape: TBevelShape; AStyle: TBevelStyle): TfpgBevel;
-begin
-  Result := TfpgBevel.Create(AOwner);
-  Result.Left     := ALeft;
-  Result.Top      := ATop;
-  Result.Width    := AWidth;
-  Result.Height   := AHeight;
-  Result.Shape    := AShape;
-  Result.Style    := AStyle;
-end;
-}
-
-{ TfpgBevel }
-
-procedure TfpgBevel.SetBevelShape(const AValue: TBevelShape);
-begin
-  if FBevelShape = AValue then
-    Exit; //==>
-  FBevelShape := AValue;
-  Repaint;
-end;
-
-procedure TfpgBevel.SetBevelStyle(const AValue: TBevelStyle);
-begin
-  if FBevelStyle = AValue then
-    Exit; //==>
-  FBevelStyle := AValue;
-  Repaint;
-end;
-
-procedure TfpgBevel.HandlePaint;
-begin
-  inherited HandlePaint;
-  Canvas.Clear(BackgroundColor);
-  
-//  Canvas.SetLineStyle(2, lsSolid);
-//  Canvas.SetColor(clWindowBackground);
-//  Canvas.DrawRectangle(1, 1, Width - 1, Height - 1);
-  Canvas.SetLineStyle(1, lsSolid);
-
-  if Style = bsRaised then
-    Canvas.SetColor(clHilite2)
-  else
-    Canvas.SetColor(clShadow2);
-
-  if Shape in [bsBox, bsFrame, bsTopLine] then
-    Canvas.DrawLine(0, 0, Width - 1, 0);
-  if Shape in [bsBox, bsFrame, bsLeftLine] then
-    Canvas.DrawLine(0, 1, 0, Height - 1);
-  if Shape in [bsFrame, bsRightLine] then
-    Canvas.DrawLine(Width - 2, 1, Width - 2, Height - 1);
-  if Shape in [bsFrame, bsBottomLine] then
-    Canvas.DrawLine(1, Height - 2, Width - 1, Height - 2);
-
-  if Style = bsRaised then
-    Canvas.SetColor(clShadow2)
-  else
-    Canvas.SetColor(clHilite2);
-
-  if Shape in [bsFrame, bsTopLine] then
-    Canvas.DrawLine(1, 1, Width - 2, 1);
-  if Shape in [bsFrame, bsLeftLine] then
-    Canvas.DrawLine(1, 2, 1, Height - 2);
-  if Shape in [bsBox, bsFrame, bsRightLine] then
-    Canvas.DrawLine(Width - 1, 0, Width - 1, Height - 1);
-  if Shape in [bsBox, bsFrame, bsBottomLine] then
-    Canvas.DrawLine(0, Height - 1, Width, Height - 1);
-end;
-
-constructor TfpgBevel.Create(AOwner: TComponent);
-begin
-  inherited Create(AOwner);
-  FBevelShape   := bsBox;
-  FBevelStyle   := bsRaised;
-  FWidth        := 80;
-  FHeight       := 80;
-  FFocusable    := True;  // otherwise children can't get focus
-  FBackgroundColor := Parent.BackgroundColor;
-end;
-
-end.
-
diff --git a/src/gui/gui_button.pas b/src/gui/gui_button.pas
index 6fa2c361..01a05145 100644
--- a/src/gui/gui_button.pas
+++ b/src/gui/gui_button.pas
@@ -24,10 +24,10 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
-  gfx_command_intf;
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  fpg_command_intf;
 
 type
 
@@ -404,55 +404,55 @@ procedure TfpgBaseButton.HandlePaint;
         end;
       end
     else // if ImageLayout in [ilImageTop, ilImageBottom] then
-      begin
+    begin
       TextX := (Width - textWidth) div 2;
       // center horizontaly
       if FShowImage and assigned (FImage) then
-        begin
+      begin
         ImageX := (Width - FImage.Width) div 2;
         // vertical places if image and text
         if FImageMargin = -1 then
-          begin  // Free space between border and image is the same as between border and text
+        begin  // Free space between border and image is the same as between border and text
           if FImageSpacing = -1 then // free space between image/text = border/text = border/image
-            begin
+          begin
             w := (Height - FImage.Height - textHeight) div 3;
             if w < 3 then  // minimal margin from border for rectangle/focusrect/...
               w := 3;
             if FImageLayout = ilImageTop then
-              begin
+            begin
               ImageY := w;
               TextY := Height - w - textHeight;
-              end
+            end
             else // if FImageLayout = ilImageBottom then
-              begin
+            begin
               ImageY := Height - w - FImage.Height;
               TextY := w;
-              end;
-            end
+            end;
+          end
           else // fixed space between image/text
-            begin
+          begin
             w := (Height - FImageSpacing - FImage.Height - textHeight) div 2;
             if w < 3 then  // minimal margin from border for rectangle/focusrect/...
               w := 3;
             if FImageLayout = ilImageTop then
-              begin
+            begin
               ImageY := w;
               TextY := w + FImage.Height + FImageSpacing;
-              end
+            end
             else // if FImageLayout = ilImageRight then
-              begin
+            begin
               ImageY := Height - w - FImage.Height;
               TextY := w;
-              end;
             end;
-          end
+          end;
+        end
         else  // Fixed image
-          begin
+        begin
           if FImageLayout = ilImageTop then
-            begin
+          begin
             ImageY := FImageMargin + 3;
             if FImageSpacing = -1 then
-              begin
+            begin
               w := (Height - FImage.Height - ImageY - textHeight) div 2;
               if w < 0 then
                 w := 0;
@@ -460,33 +460,33 @@ procedure TfpgBaseButton.HandlePaint;
             else
               w := FImageSpacing;
             TextY := ImageY + FImage.Height + w;
-            end
+          end
           else // if FImageLayout = ilImageRight then
-            begin
+          begin
             ImageY := Height - FImageMargin - 3 - FImage.Height;
             if FImageSpacing = -1 then
-              begin
+            begin
               w := (Height - FImageMargin - FImage.Height - textHeight) div 2;
               if w < 3 then
                 w := 3;
               TextY := w;
-              end
+            end
             else
-              begin
+            begin
               textY := ImageY - textHeight - FImageSpacing;
               if textY < 3 then
                 textY := 3;
-              end;
-            end;
+             end;
           end;
-        end
+        end;
+      end
       else
-        begin  // no image,
+      begin  // no image,
         ImageY := 0;
         ImageX := 0;
         TextY := (Height - textHeight) div 2;
-        end;
       end;
+    end;
   end;
 
 
diff --git a/src/gui/gui_checkbox.pas b/src/gui/gui_checkbox.pas
index 412f77d6..17146eb3 100644
--- a/src/gui/gui_checkbox.pas
+++ b/src/gui/gui_checkbox.pas
@@ -24,14 +24,12 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
   
 type
 
-  { TfpgCheckBox }
-
   TfpgCheckBox = class(TfpgWidget)
   private
     FChecked: boolean;
diff --git a/src/gui/gui_combobox.pas b/src/gui/gui_combobox.pas
index 9bdd215a..7fc2ef18 100644
--- a/src/gui/gui_combobox.pas
+++ b/src/gui/gui_combobox.pas
@@ -50,10 +50,10 @@ interface
 uses
   Classes,
   SysUtils,
-  gfx_widget,
-  gfxbase,
-  fpgfx,
-  gfx_popupwindow;
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  fpg_popupwindow;
 
 type
   // widget options
diff --git a/src/gui/gui_customgrid.pas b/src/gui/gui_customgrid.pas
index 7b5aa52f..f3f989dc 100644
--- a/src/gui/gui_customgrid.pas
+++ b/src/gui/gui_customgrid.pas
@@ -32,8 +32,8 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
+  fpg_base,
+  fpg_main,
   gui_basegrid;
   
 type
diff --git a/src/gui/gui_dialogs.pas b/src/gui/gui_dialogs.pas
index 8f6a6f24..0f1035fb 100644
--- a/src/gui/gui_dialogs.pas
+++ b/src/gui/gui_dialogs.pas
@@ -33,10 +33,10 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_imgfmt_bmp,
-  gfx_constants,
+  fpg_base,
+  fpg_main,
+  fpg_imgfmt_bmp,
+  fpg_constants,
   gui_form,
   gui_button,
   gui_label,
@@ -210,9 +210,9 @@ function SelectFileDialog(aDialogType: boolean = sfdOpen;
 implementation
 
 uses
-  gfx_widget,
-  gfx_utils,
-  gfx_utf8utils
+  fpg_widget,
+  fpg_utils,
+  fpg_stringutils
   {$IFDEF MSWINDOWS}
   ,Windows   // used by File Dialog
   {$ENDIF}
diff --git a/src/gui/gui_edit.pas b/src/gui/gui_edit.pas
index 178cf1e7..1ea1bf2c 100644
--- a/src/gui/gui_edit.pas
+++ b/src/gui/gui_edit.pas
@@ -24,9 +24,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
   gui_menu;
 
 type
@@ -296,8 +296,8 @@ function CreateEditCurrency(AOwner: TComponent; x, y, w, h: TfpgCoord;
 implementation
 
 uses
-  gfx_UTF8utils,
-  gfx_constants,
+  fpg_stringutils,
+  fpg_constants,
   gui_hint;
 
 const
diff --git a/src/gui/gui_editcombo.pas b/src/gui/gui_editcombo.pas
index 39c7dc6a..d8f182ef 100644
--- a/src/gui/gui_editcombo.pas
+++ b/src/gui/gui_editcombo.pas
@@ -54,10 +54,10 @@ interface
 uses
   Classes,
   SysUtils,
-  gfx_widget,
-  gfxbase,
-  fpgfx,
-  gfx_popupwindow,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  fpg_popupwindow,
   gui_combobox;
 
 type
@@ -138,10 +138,10 @@ function CreateEditCombo(AOwner: TComponent; x, y, w: TfpgCoord; AList:TStringLi
 implementation
 
 uses
+  fpg_stringutils,
+  fpg_constants,
   gui_listbox,
   gui_dialogs,
-  gfx_UTF8utils,
-  gfx_constants,
   math;
 
 var
diff --git a/src/gui/gui_form.pas b/src/gui/gui_form.pas
index fc2bdfad..230cfd44 100644
--- a/src/gui/gui_form.pas
+++ b/src/gui/gui_form.pas
@@ -25,8 +25,8 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  gfx_widget;
+  fpg_base,
+  fpg_widget;
 
 type
   TWindowPosition = (wpUser, wpAuto, wpScreenCenter);
@@ -123,8 +123,8 @@ function WidgetParentForm(wg: TfpgWidget): TfpgForm;
 implementation
 
 uses
-  fpgfx,
-  gfx_popupwindow,
+  fpg_main,
+  fpg_popupwindow,
   gui_menu;
   
 type
diff --git a/src/gui/gui_gauge.pas b/src/gui/gui_gauge.pas
index 97da4eb9..68fb864f 100644
--- a/src/gui/gui_gauge.pas
+++ b/src/gui/gui_gauge.pas
@@ -24,9 +24,9 @@ interface
 
 uses
   Classes, SysUtils, math,
-  fpgfx,
-  gfxbase,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
 
 type
 
@@ -107,7 +107,7 @@ function CreateGauge (AOwner: TComponent; ALeft, ATop, AWidth,
 implementation
 
 uses
-  gfx_wuline;
+  fpg_wuline;
 
 { This procedure draws a filled arc with a color gradient  -
   to be moved in CanvasBase? }
diff --git a/src/gui/gui_grid.pas b/src/gui/gui_grid.pas
index 6d343f24..41b19402 100644
--- a/src/gui/gui_grid.pas
+++ b/src/gui/gui_grid.pas
@@ -33,8 +33,8 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
+  fpg_base,
+  fpg_main,
   gui_basegrid,
   gui_customgrid;
   
@@ -157,7 +157,7 @@ function CreateStringGrid(AOwner: TComponent; x, y, w, h: TfpgCoord; AColumnCoun
 implementation
 
 uses
-  gfx_constants;
+  fpg_constants;
 
 function CreateStringGrid(AOwner: TComponent; x, y, w, h: TfpgCoord; AColumnCount: integer = 0): TfpgStringGrid;
 begin
diff --git a/src/gui/gui_hint.pas b/src/gui/gui_hint.pas
index 70fad4b5..58e0441f 100644
--- a/src/gui/gui_hint.pas
+++ b/src/gui/gui_hint.pas
@@ -26,8 +26,8 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase,
+  fpg_base,
+  fpg_main,
   gui_form,
   gui_label;
   
diff --git a/src/gui/gui_hyperlink.pas b/src/gui/gui_hyperlink.pas
index a4310fb9..48efdf9e 100644
--- a/src/gui/gui_hyperlink.pas
+++ b/src/gui/gui_hyperlink.pas
@@ -26,9 +26,9 @@ interface
 uses
   Classes,
   Sysutils,
-  gui_label,
-  fpgfx,
-  gfxbase;
+  fpg_base,
+  fpg_main,
+  gui_label;
 
 type
 
@@ -65,7 +65,7 @@ end;
 implementation
 
 uses
-  gfx_utils;
+  fpg_utils;
 
 
 { TfpgHyperlink }
diff --git a/src/gui/gui_iniutils.pas b/src/gui/gui_iniutils.pas
index dd4087f1..b961cbb4 100644
--- a/src/gui/gui_iniutils.pas
+++ b/src/gui/gui_iniutils.pas
@@ -52,8 +52,8 @@ function gINI(const AFileName: string = ''): TfpgINIFile;
 implementation
 
 uses
-  fpgfx
-  ,gfx_constants;
+  fpg_main,
+  fpg_constants;
 
 var
   uINI: TfpgINIFile;
diff --git a/src/gui/gui_label.pas b/src/gui/gui_label.pas
index ed7ade85..c4c2d271 100644
--- a/src/gui/gui_label.pas
+++ b/src/gui/gui_label.pas
@@ -24,9 +24,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
 
 type
 
diff --git a/src/gui/gui_listbox.pas b/src/gui/gui_listbox.pas
index 67803847..5dd626ff 100644
--- a/src/gui/gui_listbox.pas
+++ b/src/gui/gui_listbox.pas
@@ -34,11 +34,11 @@ interface
 uses
   Classes,
   SysUtils,
-  gfx_widget,
-  gui_scrollbar,
-  gfxbase,
-  fpgfx;
-  
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  gui_scrollbar;
+
 type
 
   // My thinking was that we could use this class as the base class for anything
diff --git a/src/gui/gui_listview.pas b/src/gui/gui_listview.pas
index 45e51fcc..948038fe 100644
--- a/src/gui/gui_listview.pas
+++ b/src/gui/gui_listview.pas
@@ -24,9 +24,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
   gui_scrollbar;
   
 type
@@ -268,7 +268,7 @@ type
 implementation
 
 uses
-  gfx_constants;
+  fpg_constants;
   
 
 type
diff --git a/src/gui/gui_memo.pas b/src/gui/gui_memo.pas
index 7774289b..b9780779 100644
--- a/src/gui/gui_memo.pas
+++ b/src/gui/gui_memo.pas
@@ -26,9 +26,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
   gui_scrollbar,
   gui_menu;
 
@@ -127,9 +127,8 @@ function CreateMemo(AOwner: TComponent; x, y, w, h: TfpgCoord): TfpgMemo;
 implementation
 
 uses
-  gfx_UTF8utils;
-  
-  
+  fpg_stringutils;
+
 type
   // custom stringlist that will notify the memo of item changes
   TfpgMemoStrings = class(TStringList)
diff --git a/src/gui/gui_menu.pas b/src/gui/gui_menu.pas
index f5c8aeeb..4c415345 100644
--- a/src/gui/gui_menu.pas
+++ b/src/gui/gui_menu.pas
@@ -33,12 +33,12 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
-  gfx_popupwindow,
-  gfx_UTF8utils,
-  gfx_command_intf;
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  fpg_popupwindow,
+  fpg_stringutils,
+  fpg_command_intf;
   
 type
   TfpgHotKeyDef = string;
diff --git a/src/gui/gui_panel.pas b/src/gui/gui_panel.pas
index da9e1875..7b988a96 100644
--- a/src/gui/gui_panel.pas
+++ b/src/gui/gui_panel.pas
@@ -25,9 +25,9 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
 
 type
 
diff --git a/src/gui/gui_popupcalendar.pas b/src/gui/gui_popupcalendar.pas
index 16c7a023..a31d2cf1 100644
--- a/src/gui/gui_popupcalendar.pas
+++ b/src/gui/gui_popupcalendar.pas
@@ -45,9 +45,17 @@ unit gui_popupcalendar;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_button, gui_combobox, gui_grid,
-  gui_dialogs, gfx_popupwindow;
+  SysUtils,
+  Classes,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  fpg_popupwindow,
+  gui_edit,
+  gui_button,
+  gui_combobox,
+  gui_grid,
+  gui_dialogs;
 
 type
 
@@ -155,9 +163,9 @@ type
 implementation
 
 uses
-  gui_scrollbar
-  ,gfx_constants
-  ;
+  gui_scrollbar,
+  fpg_constants;
+
 
 {@VFD_NEWFORM_IMPL}
 
diff --git a/src/gui/gui_progressbar.pas b/src/gui/gui_progressbar.pas
index a0c0491f..14619bee 100644
--- a/src/gui/gui_progressbar.pas
+++ b/src/gui/gui_progressbar.pas
@@ -24,9 +24,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
   
 type
   TfpgCustomProgressBar = class(TfpgWidget)
@@ -71,8 +71,10 @@ type
     property    TextColor;
   end;
 
+
 implementation
 
+
 { TfpgCustomProgressBar }
 
 procedure TfpgCustomProgressBar.SetMax(const AValue: longint);
diff --git a/src/gui/gui_radiobutton.pas b/src/gui/gui_radiobutton.pas
index 33b76bd2..33322a26 100644
--- a/src/gui/gui_radiobutton.pas
+++ b/src/gui/gui_radiobutton.pas
@@ -24,9 +24,9 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
 
 type
 
@@ -76,8 +76,10 @@ type
   
 function CreateRadioButton(AOwner: TComponent; x, y: TfpgCoord; AText: string): TfpgRadioButton;
 
+
 implementation
 
+
 function CreateRadioButton(AOwner: TComponent; x, y: TfpgCoord; AText: string): TfpgRadioButton;
 begin
   Result := TfpgRadioButton.Create(AOwner);
diff --git a/src/gui/gui_scrollbar.pas b/src/gui/gui_scrollbar.pas
index 5bfde1c9..9e207303 100644
--- a/src/gui/gui_scrollbar.pas
+++ b/src/gui/gui_scrollbar.pas
@@ -32,9 +32,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
 
 type
   TScrollNotifyEvent = procedure(Sender: TObject; position: integer) of object;
diff --git a/src/gui/gui_splitter.pas b/src/gui/gui_splitter.pas
index 0c204ab0..ac556d03 100644
--- a/src/gui/gui_splitter.pas
+++ b/src/gui/gui_splitter.pas
@@ -24,9 +24,9 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
   
 const
   clColorGrabBar = $839EFE; // Pale navy blue
diff --git a/src/gui/gui_style.pas b/src/gui/gui_style.pas
index 9cd32df2..7a5b1e91 100644
--- a/src/gui/gui_style.pas
+++ b/src/gui/gui_style.pas
@@ -28,9 +28,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
   
   
 type
@@ -203,12 +203,9 @@ type
   end;
 
 
-
-
 implementation
 
 
-
 { TfpgCommonStyle }
 
 procedure TfpgCommonStyle.DrawControl(element: TfpgControlElement;
diff --git a/src/gui/gui_tab.pas b/src/gui/gui_tab.pas
index b39863c6..69a93244 100644
--- a/src/gui/gui_tab.pas
+++ b/src/gui/gui_tab.pas
@@ -33,9 +33,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
   gui_button;
   
 type
@@ -138,7 +138,7 @@ type
 implementation
 
 uses
-  gfx_UTF8utils;
+  fpg_stringutils;
   
   
 // compare function used by FPages.Sort
diff --git a/src/gui/gui_trackbar.pas b/src/gui/gui_trackbar.pas
index 08d9b5fe..c8f1ce56 100644
--- a/src/gui/gui_trackbar.pas
+++ b/src/gui/gui_trackbar.pas
@@ -37,9 +37,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
   
 type
   TTrackBarChange = procedure(Sender: TObject; APosition: integer) of object;
diff --git a/src/gui/gui_tree.pas b/src/gui/gui_tree.pas
index 8571f89b..7e76e4c4 100644
--- a/src/gui/gui_tree.pas
+++ b/src/gui/gui_tree.pas
@@ -39,10 +39,10 @@ interface
 uses
   Classes,
   SysUtils,
-  gfx_widget,
-  gfxbase,
-  fpgfx,
-  gfx_imagelist,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
+  fpg_imagelist,
   gui_scrollbar,
   gui_menu;