7 files changed, 40 insertions, 34 deletions
diff --git a/extras/tiopf/gui/tiDialogs.pas b/extras/tiopf/gui/tiDialogs.pas
index 547ecf87..374c17b2 100644
--- a/extras/tiopf/gui/tiDialogs.pas
+++ b/extras/tiopf/gui/tiDialogs.pas
@@ -10,11 +10,10 @@ unit tiDialogs;
 interface
 
 uses
-  Classes
-  ,SysUtils
-  ,Variants
-  ;
-  
+  Classes,
+  SysUtils,
+  Variants;
+
   
   // Call showMessage, but accepts a variant. Good for debugging.
   procedure tiShowMessage(const AArray: Array of Const); overload;
@@ -45,13 +44,13 @@ uses
 implementation
 
 uses
-  fpgfx
-  ,gui_form
-  ,gui_memo
-  ,tiGUIINI
-  ,tiUtils
-  ,gui_dialogs
-  ;
+  fpg_main,
+  fpg_form,
+  fpg_memo,
+  fpg_dialogs,
+  tiGUIINI,
+  tiUtils;
+
 
 procedure tiShowMessage(const AArray: array of const);
 const
diff --git a/extras/tiopf/gui/tiGUIConstants.pas b/extras/tiopf/gui/tiGUIConstants.pas
index a5fec6ce..80a7bbf1 100644
--- a/extras/tiopf/gui/tiGUIConstants.pas
+++ b/extras/tiopf/gui/tiGUIConstants.pas
@@ -5,7 +5,7 @@ unit tiGUIConstants;
 interface
 
 uses
-  gfxbase
+  fpg_base
   ;
 
 const
diff --git a/extras/tiopf/gui/tiGUIINI.pas b/extras/tiopf/gui/tiGUIINI.pas
index d1f34d29..5e25ec7e 100644
--- a/extras/tiopf/gui/tiGUIINI.pas
+++ b/extras/tiopf/gui/tiGUIINI.pas
@@ -10,7 +10,7 @@ unit tiGUIINI;
 interface
 uses
   tiINI
-  ,gui_form
+  ,fpg_form
   ;
 
 type
@@ -26,7 +26,7 @@ function gGUIINI(const AFileName: string = ''): TtiGuiINIFile;
 
 implementation
 uses
-  fpgfx
+  fpg_main
   ;
 
 var
diff --git a/extras/tiopf/gui/tiListMediators.pas b/extras/tiopf/gui/tiListMediators.pas
index cfe04437..1f9e72e9 100644
--- a/extras/tiopf/gui/tiListMediators.pas
+++ b/extras/tiopf/gui/tiListMediators.pas
@@ -13,9 +13,9 @@ uses
   Classes,
   SysUtils,
   tiBaseMediator,
-  gui_listview,
-  gui_grid,
-  gui_listbox,
+  fpg_listview,
+  fpg_grid,
+  fpg_listbox,
   tiObject;
 
 type
diff --git a/extras/tiopf/gui/tiLogToGUI.pas b/extras/tiopf/gui/tiLogToGUI.pas
index b43c0220..5504663e 100644
--- a/extras/tiopf/gui/tiLogToGUI.pas
+++ b/extras/tiopf/gui/tiLogToGUI.pas
@@ -15,8 +15,15 @@ unit tiLogToGUI;
 
 interface
 uses
-  Classes, SysUtils,
-  gfx_widget, gui_form, gui_memo, gui_menu, gui_panel, gui_button, fpgfx,
+  Classes,
+  SysUtils,
+  fpg_widget,
+  fpg_form,
+  fpg_memo,
+  fpg_menu,
+  fpg_panel,
+  fpg_button,
+  fpg_main,
   tiLog;
 
 type
@@ -50,7 +57,7 @@ type
 
 implementation
 uses
-  gfxbase,
+  fpg_base,
   tiUtils,
   tiGUIUtils,
   tiCommandLineParams,
diff --git a/extras/tiopf/gui/tiMediators.pas b/extras/tiopf/gui/tiMediators.pas
index 7a856070..403bfc72 100644
--- a/extras/tiopf/gui/tiMediators.pas
+++ b/extras/tiopf/gui/tiMediators.pas
@@ -17,15 +17,15 @@ uses
   tiObject
   ,Classes
   ,tiBaseMediator
-  ,fpgfx
-  ,gfx_widget
-  ,gui_edit
-  ,gui_checkbox
-  ,gui_label
-  ,gui_trackbar
-  ,gui_combobox
-  ,gui_memo
-  ,gui_popupcalendar
+  ,fpg_main
+  ,fpg_widget
+  ,fpg_edit
+  ,fpg_checkbox
+  ,fpg_label
+  ,fpg_trackbar
+  ,fpg_combobox
+  ,fpg_memo
+  ,fpg_popupcalendar
   ;
 
 type
@@ -195,9 +195,9 @@ uses
   SysUtils
   ,TypInfo
   ,tiExcept
-  ,gui_dialogs      // for TfpgMessageDialog
+  ,fpg_dialogs      // for TfpgMessageDialog
+  ,fpg_base         // for predefined colors
   ,tiGUIConstants   // for error color
-  ,gfxbase          // for predefined colors
   ;
 
 const
diff --git a/extras/tiopf/gui/tiRtfReport.pas b/extras/tiopf/gui/tiRtfReport.pas
index af0d15bf..543d8ae9 100644
--- a/extras/tiopf/gui/tiRtfReport.pas
+++ b/extras/tiopf/gui/tiRtfReport.pas
@@ -25,7 +25,7 @@ interface
 
 uses
   Classes, SysUtils, contnrs, TypInfo{, Jpeg},
-  Db, Variants, tiObject, gfxbase;
+  Db, Variants, tiObject, fpg_base;
 
 type
   TtiRtfParser = class;
@@ -448,7 +448,7 @@ implementation
 
 uses
   math        // IntPower() function
-  ,fpgfx      // fpgApplication.HandleExeception()
+  ,fpg_main   // fpgApplication.HandleExeception()
   ;
 
 resourcestring