diff --git a/components/tvplanit/source/vpcalendarpainter.pas b/components/tvplanit/source/vpcalendarpainter.pas
index fa9fb6c4a..87f85cf3f 100644
--- a/components/tvplanit/source/vpcalendarpainter.pas
+++ b/components/tvplanit/source/vpcalendarpainter.pas
@@ -1,5 +1,7 @@
 unit VpCalendarPainter;
 
+{$I vp.inc}
+
 interface
 
 uses
@@ -297,7 +299,7 @@ begin
     DecodeDate(RenderDate, Y, M, D);
     try
       {$IFDEF VERSION6}
-      if not TryEncodeDate (Y, M, clDay, lDate) then
+      if not TryEncodeDate (Y, M, TVpCalendarOpener(FCalendar).clDay, lDate) then
         lBadDate := true;
       {$ELSE}
       lDate := EncodeDate(Y, M, TVpCalendarOpener(FCalendar).clDay);
diff --git a/components/tvplanit/source/vpcontactgridpainter.pas b/components/tvplanit/source/vpcontactgridpainter.pas
index 2ddf46ce0..2f6882c5b 100644
--- a/components/tvplanit/source/vpcontactgridpainter.pas
+++ b/components/tvplanit/source/vpcontactgridpainter.pas
@@ -1,5 +1,7 @@
 unit VpContactGridPainter;
 
+{$I vp.inc}
+
 interface
 
 uses
diff --git a/components/tvplanit/source/vpdayviewpainter.pas b/components/tvplanit/source/vpdayviewpainter.pas
index 51fb9a36e..984c07178 100644
--- a/components/tvplanit/source/vpdayviewpainter.pas
+++ b/components/tvplanit/source/vpdayviewpainter.pas
@@ -1,8 +1,8 @@
+{$I vp.inc}
+
 unit VpDayViewPainter;
 
 interface
-{$I vp.inc}
-
 
 uses
   SysUtils, LCLType, LCLIntf, Types,
diff --git a/components/tvplanit/source/vptasklistpainter.pas b/components/tvplanit/source/vptasklistpainter.pas
index 6c35c2671..a1155cb50 100644
--- a/components/tvplanit/source/vptasklistpainter.pas
+++ b/components/tvplanit/source/vptasklistpainter.pas
@@ -1,5 +1,7 @@
 unit VpTasklistPainter;
 
+{$I vp.inc}
+
 interface
 
 uses