diff --git a/components/tvplanit/examples/datastores/sqlite3/project1.lpi b/components/tvplanit/examples/datastores/sqlite3/project1.lpi
index 9baa22806..d341ed8ea 100644
--- a/components/tvplanit/examples/datastores/sqlite3/project1.lpi
+++ b/components/tvplanit/examples/datastores/sqlite3/project1.lpi
@@ -64,6 +64,9 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/tvplanit/examples/datastores/zeos/project1.lpi b/components/tvplanit/examples/datastores/zeos/project1.lpi
index 2e439348c..aa2437e51 100644
--- a/components/tvplanit/examples/datastores/zeos/project1.lpi
+++ b/components/tvplanit/examples/datastores/zeos/project1.lpi
@@ -24,22 +24,19 @@
         <Mode0 Name="default"/>
       </Modes>
     </RunParams>
-    <RequiredPackages Count="5">
+    <RequiredPackages Count="4">
       <Item1>
-        <PackageName Value="laz_visualplanit_zeos_design"/>
+        <PackageName Value="laz_visualplanit_zeos"/>
       </Item1>
       <Item2>
-        <PackageName Value="laz_visualplanit_zeos"/>
+        <PackageName Value="laz_visualplanit"/>
       </Item2>
       <Item3>
-        <PackageName Value="laz_visualplanit"/>
+        <PackageName Value="zcomponent"/>
       </Item3>
       <Item4>
-        <PackageName Value="zcomponent"/>
-      </Item4>
-      <Item5>
         <PackageName Value="LCL"/>
-      </Item5>
+      </Item4>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
diff --git a/components/tvplanit/examples/datastores/zeos/unit1.lfm b/components/tvplanit/examples/datastores/zeos/unit1.lfm
index d997cdd39..d9d7a5cd6 100644
--- a/components/tvplanit/examples/datastores/zeos/unit1.lfm
+++ b/components/tvplanit/examples/datastores/zeos/unit1.lfm
@@ -267,6 +267,7 @@ object Form1: TForm1
   end
   object ZConnection1: TZConnection
     ControlsCodePage = cCP_UTF8
+    AutoEncodeStrings = True
     Properties.Strings = (
       'AutoEncodeStrings=ON'
     )
@@ -326,8 +327,4 @@ object Form1: TForm1
     Left = 136
     Top = 335
   end
-  object ZTable1: TZTable
-    Left = 136
-    Top = 536
-  end
 end
diff --git a/components/tvplanit/examples/datastores/zeos/unit1.pas b/components/tvplanit/examples/datastores/zeos/unit1.pas
index 176a5fbe0..4e3bfefd1 100644
--- a/components/tvplanit/examples/datastores/zeos/unit1.pas
+++ b/components/tvplanit/examples/datastores/zeos/unit1.pas
@@ -11,9 +11,10 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, ComCtrls, VpBaseDS, VpZeosDs, VpDayView, VpWeekView, VpTaskList,
-  VpContactGrid, VpMonthView, VpResEditDlg, VpContactButtons, ZConnection,
-  ZDataset, ZDbcIntfs;
+  StdCtrls, ComCtrls, 
+  VpBaseDS, VpZeosDs, VpDayView, VpWeekView, VpTaskList, VpContactGrid, 
+  VpMonthView, VpResEditDlg, VpContactButtons, 
+  ZConnection, ZDbcIntfs;
 
 type
 
@@ -41,7 +42,6 @@ type
     VpWeekView1: TVpWeekView;
     VpZeosDatastore1: TVpZeosDatastore;
     ZConnection1: TZConnection;
-    ZTable1: TZTable;
     procedure BtnNewResClick(Sender: TObject);
     procedure BtnEditResClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
diff --git a/components/tvplanit/images/make_res.bat b/components/tvplanit/images/make_res.bat
index 500e3856e..7f24eb2e0 100644
--- a/components/tvplanit/images/make_res.bat
+++ b/components/tvplanit/images/make_res.bat
@@ -1,5 +1,5 @@
 lazres ..\source\design\vpreg.res @reg_palette_list.txt
-lazres ..\source\addons\zeos\vpregzeos.res @reg_palette_zeos_list.txt
+lazres ..\source\addons\zeos\design\vpregzeos.res @reg_palette_zeos_list.txt
 lazres ..\source\vpbasepng.res @regbasepng_files.txt
 
 :end
\ No newline at end of file
diff --git a/components/tvplanit/laz_visualplanit.lpk b/components/tvplanit/laz_visualplanit.lpk
index e7bbce579..18a09ac49 100644
--- a/components/tvplanit/laz_visualplanit.lpk
+++ b/components/tvplanit/laz_visualplanit.lpk
@@ -32,7 +32,7 @@ Portions created by TurboPower Software Inc. are Copyright (C) 2002 TurboPower S
 
 Contributor(s): "/>
     <Version Major="1" Minor="6"/>
-    <Files Count="75">
+    <Files Count="62">
       <Item1>
         <Filename Value="source\vpbase.pas"/>
         <UnitName Value="VpBase"/>
@@ -86,253 +86,201 @@ Contributor(s): "/>
         <UnitName Value="VpCanvasUtils"/>
       </Item13>
       <Item14>
-        <Filename Value="source\vpabout.lfm"/>
-        <Type Value="LFM"/>
-      </Item14>
-      <Item15>
         <Filename Value="source\vpabout.pas"/>
         <UnitName Value="VpAbout"/>
-      </Item15>
-      <Item16>
-        <Filename Value="source\vpalarmdlg.lfm"/>
-        <Type Value="LFM"/>
-      </Item16>
-      <Item17>
+      </Item14>
+      <Item15>
         <Filename Value="source\vpalarmdlg.pas"/>
         <UnitName Value="VpAlarmDlg"/>
-      </Item17>
-      <Item18>
+      </Item15>
+      <Item16>
         <Filename Value="source\vpcalendar.pas"/>
         <UnitName Value="VpCalendar"/>
-      </Item18>
-      <Item19>
+      </Item16>
+      <Item17>
         <Filename Value="source\vpcalendarpainter.pas"/>
         <UnitName Value="VpCalendarPainter"/>
-      </Item19>
-      <Item20>
+      </Item17>
+      <Item18>
         <Filename Value="source\vpcontactbuttons.pas"/>
         <UnitName Value="VpContactButtons"/>
-      </Item20>
-      <Item21>
-        <Filename Value="source\vpcontacteditdlg.lfm"/>
-        <Type Value="LFM"/>
-      </Item21>
-      <Item22>
+      </Item18>
+      <Item19>
         <Filename Value="source\vpcontacteditdlg.pas"/>
         <UnitName Value="VpContactEditDlg"/>
-      </Item22>
-      <Item23>
+      </Item19>
+      <Item20>
         <Filename Value="source\vpcontactgrid.pas"/>
         <UnitName Value="VpContactGrid"/>
-      </Item23>
-      <Item24>
+      </Item20>
+      <Item21>
         <Filename Value="source\vpcontactgridpainter.pas"/>
         <UnitName Value="VpContactGridPainter"/>
-      </Item24>
-      <Item25>
+      </Item21>
+      <Item22>
         <Filename Value="source\vpdayview.pas"/>
         <UnitName Value="VpDayView"/>
-      </Item25>
-      <Item26>
+      </Item22>
+      <Item23>
         <Filename Value="source\vpdayviewpainter.pas"/>
         <UnitName Value="VpDayViewPainter"/>
-      </Item26>
-      <Item27>
+      </Item23>
+      <Item24>
         <Filename Value="source\vpdlg.pas"/>
         <UnitName Value="VpDlg"/>
-      </Item27>
-      <Item28>
-        <Filename Value="source\vpedelem.lfm"/>
-        <Type Value="LFM"/>
-      </Item28>
-      <Item29>
+      </Item24>
+      <Item25>
         <Filename Value="source\vpedelem.pas"/>
         <UnitName Value="VpEdElem"/>
-      </Item29>
-      <Item30>
-        <Filename Value="source\vpedfmt.lfm"/>
-        <Type Value="LFM"/>
-      </Item30>
-      <Item31>
+      </Item25>
+      <Item26>
         <Filename Value="source\vpedfmt.pas"/>
         <UnitName Value="VpEdFmt"/>
-      </Item31>
-      <Item32>
-        <Filename Value="source\vpedfmtlst.lfm"/>
-        <Type Value="LFM"/>
-      </Item32>
-      <Item33>
+      </Item26>
+      <Item27>
         <Filename Value="source\vpedfmtlst.pas"/>
         <UnitName Value="VpEdFmtLst"/>
-      </Item33>
-      <Item34>
-        <Filename Value="source\vpedshape.lfm"/>
-        <Type Value="LFM"/>
-      </Item34>
-      <Item35>
+      </Item27>
+      <Item28>
         <Filename Value="source\vpedshape.pas"/>
         <UnitName Value="VpEdShape"/>
-      </Item35>
-      <Item36>
-        <Filename Value="source\vpevnteditdlg.lfm"/>
-        <Type Value="LFM"/>
-      </Item36>
-      <Item37>
+      </Item28>
+      <Item29>
         <Filename Value="source\vpevnteditdlg.pas"/>
         <UnitName Value="VpEvntEditDlg"/>
-      </Item37>
-      <Item38>
+      </Item29>
+      <Item30>
         <Filename Value="source\vpfbds.pas"/>
         <UnitName Value="VpFBDS"/>
-      </Item38>
-      <Item39>
+      </Item30>
+      <Item31>
         <Filename Value="source\vpflxds.pas"/>
         <UnitName Value="VpFlxDS"/>
-      </Item39>
-      <Item40>
+      </Item31>
+      <Item32>
         <Filename Value="source\vpflxdsed1.pas"/>
         <UnitName Value="VpFlxDsEd1"/>
-      </Item40>
-      <Item41>
-        <Filename Value="source\vpflxdsed1.lfm"/>
-        <Type Value="LFM"/>
-      </Item41>
-      <Item42>
+      </Item32>
+      <Item33>
         <Filename Value="source\vpledlabel.pas"/>
         <UnitName Value="VpLEDLabel"/>
-      </Item42>
-      <Item43>
+      </Item33>
+      <Item34>
         <Filename Value="source\vplocalize.pas"/>
         <UnitName Value="VpLocalize"/>
-      </Item43>
-      <Item44>
+      </Item34>
+      <Item35>
         <Filename Value="source\vpmonthview.pas"/>
         <UnitName Value="VpMonthView"/>
-      </Item44>
-      <Item45>
+      </Item35>
+      <Item36>
         <Filename Value="source\vpmonthviewpainter.pas"/>
         <UnitName Value="VpMonthViewPainter"/>
-      </Item45>
-      <Item46>
+      </Item36>
+      <Item37>
         <Filename Value="source\vpnavbar.pas"/>
         <UnitName Value="VpNavBar"/>
-      </Item46>
-      <Item47>
+      </Item37>
+      <Item38>
         <Filename Value="source\vpnavbarpainter.pas"/>
         <UnitName Value="VpNavBarPainter"/>
-      </Item47>
-      <Item48>
+      </Item38>
+      <Item39>
         <Filename Value="source\vpprtfmt.pas"/>
         <UnitName Value="VpPrtFmt"/>
-      </Item48>
-      <Item49>
+      </Item39>
+      <Item40>
         <Filename Value="source\vpprtfmtcbox.pas"/>
         <UnitName Value="VpPrtFmtCBox"/>
-      </Item49>
-      <Item50>
+      </Item40>
+      <Item41>
         <Filename Value="source\vpprtfmtdlg.pas"/>
         <UnitName Value="VpPrtFmtDlg"/>
-      </Item50>
-      <Item51>
+      </Item41>
+      <Item42>
         <Filename Value="source\vpprtprv.pas"/>
         <UnitName Value="VpPrtPrv"/>
-      </Item51>
-      <Item52>
-        <Filename Value="source\vpprtprvdlg.lfm"/>
-        <Type Value="LFM"/>
-      </Item52>
-      <Item53>
+      </Item42>
+      <Item43>
         <Filename Value="source\vpprtprvdlg.pas"/>
         <UnitName Value="VpPrtPrvDlg"/>
-      </Item53>
-      <Item54>
-        <Filename Value="source\vpreseditdlg.lfm"/>
-        <Type Value="LFM"/>
-      </Item54>
-      <Item55>
+      </Item43>
+      <Item44>
         <Filename Value="source\vpreseditdlg.pas"/>
         <UnitName Value="VpResEditDlg"/>
-      </Item55>
-      <Item56>
-        <Filename Value="source\vpselresdlg.lfm"/>
-        <Type Value="LFM"/>
-      </Item56>
-      <Item57>
+      </Item44>
+      <Item45>
         <Filename Value="source\vpselresdlg.pas"/>
         <UnitName Value="VpSelResDlg"/>
-      </Item57>
-      <Item58>
+      </Item45>
+      <Item46>
         <Filename Value="source\vptaskeditdlg.pas"/>
         <UnitName Value="VpTaskEditDlg"/>
-      </Item58>
-      <Item59>
+      </Item46>
+      <Item47>
         <Filename Value="source\vptasklist.pas"/>
         <UnitName Value="VpTaskList"/>
-      </Item59>
-      <Item60>
+      </Item47>
+      <Item48>
         <Filename Value="source\vptasklistpainter.pas"/>
         <UnitName Value="VpTasklistPainter"/>
-      </Item60>
-      <Item61>
+      </Item48>
+      <Item49>
         <Filename Value="source\vptimerpool.pas"/>
         <UnitName Value="VpTimerPool"/>
-      </Item61>
-      <Item62>
-        <Filename Value="source\vpwavdlg.lfm"/>
-        <Type Value="LFM"/>
-      </Item62>
-      <Item63>
+      </Item49>
+      <Item50>
         <Filename Value="source\vpwavdlg.pas"/>
         <UnitName Value="VpWavDlg"/>
-      </Item63>
-      <Item64>
+      </Item50>
+      <Item51>
         <Filename Value="source\vpweekview.pas"/>
         <UnitName Value="VpWeekView"/>
-      </Item64>
-      <Item65>
+      </Item51>
+      <Item52>
         <Filename Value="source\vpweekviewpainter.pas"/>
         <UnitName Value="VpWeekViewPainter"/>
-      </Item65>
-      <Item66>
+      </Item52>
+      <Item53>
         <Filename Value="source\vpxbase.pas"/>
         <UnitName Value="VpXBase"/>
-      </Item66>
-      <Item67>
+      </Item53>
+      <Item54>
         <Filename Value="source\vpxchrflt.pas"/>
         <UnitName Value="VpXChrFlt"/>
-      </Item67>
-      <Item68>
+      </Item54>
+      <Item55>
         <Filename Value="source\vpxmlds.pas"/>
         <UnitName Value="VpXmlDS"/>
-      </Item68>
-      <Item69>
+      </Item55>
+      <Item56>
         <Filename Value="source\vpxparsr.pas"/>
         <UnitName Value="VpXParsr"/>
-      </Item69>
-      <Item70>
+      </Item56>
+      <Item57>
         <Filename Value="source\vpclock.pas"/>
         <UnitName Value="VpClock"/>
-      </Item70>
-      <Item71>
+      </Item57>
+      <Item58>
         <Filename Value="source\vpjsonds.pas"/>
         <UnitName Value="VpJSONDs"/>
-      </Item71>
-      <Item72>
+      </Item58>
+      <Item59>
         <Filename Value="source\vpvcard.pas"/>
         <UnitName Value="VpVCard"/>
-      </Item72>
-      <Item73>
+      </Item59>
+      <Item60>
         <Filename Value="source\vpbasedatafiles.pas"/>
         <UnitName Value="VpBaseDataFiles"/>
-      </Item73>
-      <Item74>
+      </Item60>
+      <Item61>
         <Filename Value="source\vpical.pas"/>
         <UnitName Value="VpICAL"/>
-      </Item74>
-      <Item75>
+      </Item61>
+      <Item62>
         <Filename Value="source\vpfileds.pas"/>
         <UnitName Value="VpFileDS"/>
-      </Item75>
+      </Item62>
     </Files>
     <CompatibilityMode Value="True"/>
     <i18n>
diff --git a/components/tvplanit/laz_visualplanit_zeos.lpk b/components/tvplanit/laz_visualplanit_zeos.lpk
index cb10a12aa..ab84a7240 100644
--- a/components/tvplanit/laz_visualplanit_zeos.lpk
+++ b/components/tvplanit/laz_visualplanit_zeos.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="source\include;source\addons\zeos"/>
+        <IncludeFiles Value="source\include"/>
         <OtherUnitFiles Value="source\addons\zeos"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\zeos_run"/>
       </SearchPaths>
@@ -22,7 +22,6 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
     <Files Count="1">
       <Item1>
         <Filename Value="source\addons\zeos\vpzeosds.pas"/>
-        <Type Value="Include"/>
       </Item1>
     </Files>
     <CompatibilityMode Value="True"/>
diff --git a/components/tvplanit/laz_visualplanit_zeos_design.lpk b/components/tvplanit/laz_visualplanit_zeos_design.lpk
index c767e30ef..241216bee 100644
--- a/components/tvplanit/laz_visualplanit_zeos_design.lpk
+++ b/components/tvplanit/laz_visualplanit_zeos_design.lpk
@@ -3,14 +3,14 @@
   <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="laz_visualplanit_zeos_design"/>
-    <Type Value="RunAndDesignTime"/>
+    <Type Value="DesignTime"/>
     <Author Value="W. Pamler"/>
     <CompilerOptions>
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="source\include;source\addons\zeos"/>
-        <OtherUnitFiles Value="source\addons\zeos"/>
+        <IncludeFiles Value="source\include"/>
+        <OtherUnitFiles Value="source\addons\zeos\design"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\zeos_design"/>
       </SearchPaths>
     </CompilerOptions>
@@ -18,20 +18,16 @@
     <Version Major="1" Minor="6"/>
     <Files Count="1">
       <Item1>
-        <Filename Value="source\addons\zeos\vpregzeos.pas"/>
+        <Filename Value="source\addons\zeos\design\vpregzeos.pas"/>
         <HasRegisterProc Value="True"/>
-        <AddToUsesPkgSection Value="False"/>
         <UnitName Value="VpRegZEOS"/>
       </Item1>
     </Files>
     <CompatibilityMode Value="True"/>
-    <RequiredPkgs Count="2">
+    <RequiredPkgs Count="1">
       <Item1>
         <PackageName Value="laz_visualplanit_zeos"/>
       </Item1>
-      <Item2>
-        <PackageName Value="FCL"/>
-      </Item2>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>
diff --git a/components/tvplanit/source/addons/zeos/vpregzeos.pas b/components/tvplanit/source/addons/zeos/design/vpregzeos.pas
similarity index 86%
rename from components/tvplanit/source/addons/zeos/vpregzeos.pas
rename to components/tvplanit/source/addons/zeos/design/vpregzeos.pas
index bf3f515f1..c0532037b 100644
--- a/components/tvplanit/source/addons/zeos/vpregzeos.pas
+++ b/components/tvplanit/source/addons/zeos/design/vpregzeos.pas
@@ -1,14 +1,13 @@
 unit VpRegZEOS;
   {-Registration unit for the ZEOS database components}
 
-{$I Vp.INC}        // Compiler version defines
+{$I vp.inc}        // Compiler version defines
 {$R vpregzeos.res} // Palette glyphs
 
 interface
 
 uses
  {$IFDEF DELPHI}
- // Windows,
   {$IFDEF VERSION6} DesignIntf, DesignEditors, {$ELSE} DsgnIntf, {$ENDIF}
  {$ENDIF}
   Classes;
diff --git a/components/tvplanit/source/addons/zeos/vpregzeos.res b/components/tvplanit/source/addons/zeos/design/vpregzeos.res
similarity index 100%
rename from components/tvplanit/source/addons/zeos/vpregzeos.res
rename to components/tvplanit/source/addons/zeos/design/vpregzeos.res
diff --git a/components/tvplanit/source/vpcanvasutils.pas b/components/tvplanit/source/vpcanvasutils.pas
index 6c407192f..418486856 100644
--- a/components/tvplanit/source/vpcanvasutils.pas
+++ b/components/tvplanit/source/vpcanvasutils.pas
@@ -75,7 +75,7 @@
 
 }
 
-{$I Vp.INC}
+{$I vp.inc}
 
 unit VpCanvasUtils;
 
diff --git a/components/tvplanit/source/vpconst.pas b/components/tvplanit/source/vpconst.pas
index e395e1c25..ac1d487e1 100644
--- a/components/tvplanit/source/vpconst.pas
+++ b/components/tvplanit/source/vpconst.pas
@@ -26,7 +26,7 @@
 {*                                                                            *}
 {* ***** END LICENSE BLOCK *****                                              *}
 
-{.$I Vp.INC}
+{.$I vp.inc}
 
 unit VpConst;
 
diff --git a/components/tvplanit/source/vpcontacteditdlg.pas b/components/tvplanit/source/vpcontacteditdlg.pas
index cf15793de..040a6e85a 100644
--- a/components/tvplanit/source/vpcontacteditdlg.pas
+++ b/components/tvplanit/source/vpcontacteditdlg.pas
@@ -26,7 +26,7 @@
 {*                                                                            *}
 {* ***** END LICENSE BLOCK *****                                              *}
 
-{$I Vp.INC}
+{$I vp.inc}
 
 unit VpContactEditDlg;
 
diff --git a/components/tvplanit/source/vpdbds.pas b/components/tvplanit/source/vpdbds.pas
index 077a22610..e70d1c975 100644
--- a/components/tvplanit/source/vpdbds.pas
+++ b/components/tvplanit/source/vpdbds.pas
@@ -30,7 +30,7 @@
   {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 {$IFEND}
 
-{$I Vp.INC}
+{$I vp.inc}
 
 unit VpDBDS;
 
diff --git a/components/tvplanit/source/vpedfmtlst.pas b/components/tvplanit/source/vpedfmtlst.pas
index 01658532b..e3361a25a 100644
--- a/components/tvplanit/source/vpedfmtlst.pas
+++ b/components/tvplanit/source/vpedfmtlst.pas
@@ -32,7 +32,7 @@ unit VpEdFmtLst;
   {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 {$IFEND}
 
-{$I Vp.INC}
+{$I vp.inc}
 
 interface
 
diff --git a/components/tvplanit/source/vpfileds.pas b/components/tvplanit/source/vpfileds.pas
index 472a6d475..b0d5ebe08 100644
--- a/components/tvplanit/source/vpfileds.pas
+++ b/components/tvplanit/source/vpfileds.pas
@@ -4,7 +4,7 @@
   {$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 {$IFEND}  
 
-{$I Vp.INC}
+{$I vp.inc}
 
 unit VpFileDS;
 
diff --git a/components/tvplanit/source/vpprtfmtcbox.pas b/components/tvplanit/source/vpprtfmtcbox.pas
index 1229e67b5..1c986ece9 100644
--- a/components/tvplanit/source/vpprtfmtcbox.pas
+++ b/components/tvplanit/source/vpprtfmtcbox.pas
@@ -26,7 +26,7 @@
 {*                                                                            *}
 {* ***** END LICENSE BLOCK *****                                              *}
 
-{$I Vp.INC}
+{$I vp.inc}
 
 unit VpPrtFmtCBox;
 
diff --git a/components/tvplanit/source/vpprtfmtdlg.pas b/components/tvplanit/source/vpprtfmtdlg.pas
index 8a2e8e6eb..35f7ee95f 100644
--- a/components/tvplanit/source/vpprtfmtdlg.pas
+++ b/components/tvplanit/source/vpprtfmtdlg.pas
@@ -26,7 +26,7 @@
 {*                                                                            *}
 {* ***** END LICENSE BLOCK *****                                              *}
 
-{$I Vp.INC}
+{$I vp.inc}
 
 unit VpPrtFmtDlg;
 
diff --git a/components/tvplanit/source/vpsr.pas b/components/tvplanit/source/vpsr.pas
index c87aad8c4..bdadfc7e8 100644
--- a/components/tvplanit/source/vpsr.pas
+++ b/components/tvplanit/source/vpsr.pas
@@ -35,7 +35,7 @@ unit VpSR;
 
 interface
 
-{$I include/vpsr.inc}
+{$I vpsr.inc}
 
 type
   // For acquiring the labels that go with each telephone field, i.e. Home, work, fax etc...                                 }
diff --git a/components/tvplanit/source/vpxbase.pas b/components/tvplanit/source/vpxbase.pas
index 69380998e..64803621c 100644
--- a/components/tvplanit/source/vpxbase.pas
+++ b/components/tvplanit/source/vpxbase.pas
@@ -26,7 +26,7 @@
 {*                                                                            *}
 {* ***** END LICENSE BLOCK *****                                              *}
 
-{$I Vp.INC}
+{$I vp.inc}
 
 unit VpXBase;
 
diff --git a/components/tvplanit/source/vpxchrflt.pas b/components/tvplanit/source/vpxchrflt.pas
index 4971ec5f0..7ab4b7ebb 100644
--- a/components/tvplanit/source/vpxchrflt.pas
+++ b/components/tvplanit/source/vpxchrflt.pas
@@ -26,7 +26,7 @@
 {*                                                                            *}
 {* ***** END LICENSE BLOCK *****                                              *}
 
-{$I Vp.INC}
+{$I vp.inc}
 
 unit VpXChrFlt;