diff --git a/components/tdi/Demo/TDIDemo.lpi b/components/tdi/Demo/TDIDemo.lpi
index 03f555b99..2dc73d967 100644
--- a/components/tdi/Demo/TDIDemo.lpi
+++ b/components/tdi/Demo/TDIDemo.lpi
@@ -73,7 +73,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="11"/>
+    <Version Value="9"/>
     <PathDelim Value="\"/>
     <Target>
       <Filename Value="TDIDemo"/>
@@ -93,9 +93,6 @@
       </Options>
     </Linking>
     <Other>
-      <CompilerMessages>
-        <MsgFileName Value=""/>
-      </CompilerMessages>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
diff --git a/components/tdi/Demo/TDIDemo.lpr b/components/tdi/Demo/TDIDemo.lpr
index c56704619..dac2561ac 100644
--- a/components/tdi/Demo/TDIDemo.lpr
+++ b/components/tdi/Demo/TDIDemo.lpr
@@ -20,7 +20,6 @@ begin
    DeleteFile( HeapTraceFile );
    SetHeapTraceOutput( HeapTraceFile );
 
-   RequireDerivedFormResource := True;
   Application.Initialize;
   Application.CreateForm(TfMainForm, fMainForm) ;
   Application.CreateForm(TForm2, Form2) ;
diff --git a/components/tdi/Demo/TDIDemo.lps b/components/tdi/Demo/TDIDemo.lps
index 2ec759687..acf629f8d 100644
--- a/components/tdi/Demo/TDIDemo.lps
+++ b/components/tdi/Demo/TDIDemo.lps
@@ -4,15 +4,15 @@
     <PathDelim Value="\"/>
     <Version Value="9"/>
     <BuildModes Active="Default"/>
-    <Units Count="87">
+    <Units Count="88">
       <Unit0>
         <Filename Value="TDIDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TDIDemo"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="9"/>
-        <CursorPos X="22" Y="21"/>
-        <UsageCount Value="180"/>
+        <TopLine Value="5"/>
+        <CursorPos X="1" Y="23"/>
+        <UsageCount Value="183"/>
       </Unit0>
       <Unit1>
         <Filename Value="mainform.pas"/>
@@ -23,7 +23,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="10" Y="8"/>
-        <UsageCount Value="180"/>
+        <UsageCount Value="183"/>
       </Unit1>
       <Unit2>
         <Filename Value="uform1.pas"/>
@@ -32,13 +32,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uForm1"/>
-        <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
         <TopLine Value="76"/>
         <CursorPos X="25" Y="86"/>
-        <UsageCount Value="180"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
+        <UsageCount Value="183"/>
       </Unit2>
       <Unit3>
         <Filename Value="uform2.pas"/>
@@ -47,13 +44,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uForm2"/>
-        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="78"/>
+        <TopLine Value="76"/>
         <CursorPos X="18" Y="80"/>
-        <UsageCount Value="102"/>
-        <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
+        <UsageCount Value="105"/>
       </Unit3>
       <Unit4>
         <Filename Value="umainform.pas"/>
@@ -61,23 +55,23 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uMainForm"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="75"/>
-        <CursorPos X="71" Y="82"/>
-        <UsageCount Value="87"/>
+        <TopLine Value="1"/>
+        <CursorPos X="1" Y="1"/>
+        <UsageCount Value="89"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\tdiclass.pas"/>
         <UnitName Value="TDIClass"/>
-        <EditorIndex Value="4"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="198"/>
-        <CursorPos X="5" Y="215"/>
-        <UsageCount Value="87"/>
+        <TopLine Value="962"/>
+        <CursorPos X="43" Y="982"/>
+        <UsageCount Value="89"/>
         <Bookmarks Count="6">
           <Item0 X="3" Y="1041" ID="3"/>
           <Item1 X="1" Y="346" ID="2"/>
@@ -105,12 +99,10 @@
       <Unit8>
         <Filename Value="..\tdireg.pas"/>
         <UnitName Value="TDIReg"/>
-        <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="19" Y="20"/>
-        <UsageCount Value="35"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="37"/>
       </Unit8>
       <Unit9>
         <Filename Value="..\..\..\TOOLS\DJ_FormPrincipal.pas"/>
@@ -150,26 +142,24 @@
       <Unit13>
         <Filename Value="umainform.lfm"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="2474"/>
-        <CursorPos X="32" Y="2480"/>
+        <TopLine Value="977"/>
+        <CursorPos X="32" Y="976"/>
         <ExtraEditorCount Value="1"/>
         <ExtraEditor1>
           <WindowIndex Value="0"/>
           <TopLine Value="41"/>
           <CursorPos X="25" Y="60"/>
         </ExtraEditor1>
-        <UsageCount Value="6"/>
+        <UsageCount Value="10"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
       </Unit13>
       <Unit14>
         <Filename Value="..\tdiconst.pas"/>
         <UnitName Value="TDIConst"/>
-        <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="4"/>
         <CursorPos X="54" Y="22"/>
-        <UsageCount Value="50"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="52"/>
       </Unit14>
       <Unit15>
         <Filename Value="C:\lazarus\lcl\controls.pp"/>
@@ -183,8 +173,8 @@
         <Filename Value="C:\lazarus\components\lazcontrols\extendednotebook.pas"/>
         <UnitName Value="ExtendedNotebook"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="35"/>
-        <CursorPos X="78" Y="42"/>
+        <TopLine Value="23"/>
+        <CursorPos X="3" Y="35"/>
         <UsageCount Value="13"/>
       </Unit16>
       <Unit17>
@@ -361,7 +351,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="5128"/>
         <CursorPos X="1" Y="5148"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit39>
       <Unit40>
         <Filename Value="C:\lazarus\lcl\include\wincontrol.inc"/>
@@ -379,7 +369,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="997"/>
         <CursorPos X="3" Y="999"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit41>
       <Unit42>
         <Filename Value="C:\lazarus\lcl\include\customform.inc"/>
@@ -424,7 +414,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="361"/>
         <CursorPos X="1" Y="375"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit47>
       <Unit48>
         <Filename Value="C:\lazarus\lcl\widgetset\wslclclasses.pp"/>
@@ -432,7 +422,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="421"/>
         <CursorPos X="3" Y="414"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit48>
       <Unit49>
         <Filename Value="C:\lazarus\lcl\lclproc.pas"/>
@@ -683,7 +673,6 @@
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
         <UsageCount Value="7"/>
-        <DefaultSyntaxHighlighter Value="Delphi"/>
       </Unit81>
       <Unit82>
         <Filename Value="..\..\rx\curredit.pas"/>
@@ -711,12 +700,10 @@
       </Unit84>
       <Unit85>
         <Filename Value="..\read-me.txt"/>
-        <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
         <TopLine Value="76"/>
         <CursorPos X="1" Y="38"/>
-        <UsageCount Value="24"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="26"/>
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit85>
       <Unit86>
@@ -727,131 +714,107 @@
         <CursorPos X="1" Y="1"/>
         <UsageCount Value="7"/>
       </Unit86>
+      <Unit87>
+        <Filename Value="C:\lazarus\lcl\lresources.pp"/>
+        <UnitName Value="LResources"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1655"/>
+        <CursorPos X="1" Y="1667"/>
+        <UsageCount Value="10"/>
+      </Unit87>
     </Units>
     <General>
       <ActiveWindowIndexAtStart Value="0"/>
     </General>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="22" HistoryIndex="21">
       <Position1>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="183" Column="53" TopLine="166"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="10" Column="19" TopLine="1"/>
       </Position1>
       <Position2>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="256" Column="27" TopLine="238"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="10" Column="19" TopLine="1"/>
       </Position2>
       <Position3>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="318" Column="23" TopLine="312"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position3>
       <Position4>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="360" Column="7" TopLine="347"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="153" Column="44" TopLine="141"/>
       </Position4>
       <Position5>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="38" Column="5" TopLine="27"/>
       </Position5>
       <Position6>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="317" Column="1" TopLine="307"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="37" Column="9" TopLine="24"/>
       </Position6>
       <Position7>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="72" Column="36" TopLine="62"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="31" Column="19" TopLine="24"/>
       </Position7>
       <Position8>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="317" Column="1" TopLine="300"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="144" Column="22" TopLine="138"/>
       </Position8>
       <Position9>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="359" Column="26" TopLine="348"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="144" Column="22" TopLine="138"/>
       </Position9>
       <Position10>
         <Filename Value="umainform.pas"/>
-        <Caret Line="10" Column="19" TopLine="1"/>
+        <Caret Line="81" Column="79" TopLine="75"/>
       </Position10>
       <Position11>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="376" Column="13" TopLine="371"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="80" Column="5" TopLine="75"/>
       </Position11>
       <Position12>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="2" Column="76" TopLine="1"/>
+        <Filename Value="umainform.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position12>
       <Position13>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="13" Column="20" TopLine="1"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position13>
       <Position14>
         <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="1235" Column="1" TopLine="1214"/>
+        <Caret Line="104" Column="20" TopLine="87"/>
       </Position14>
       <Position15>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="10" Column="19" TopLine="1"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="811" Column="32" TopLine="798"/>
       </Position15>
       <Position16>
-        <Filename Value="umainform.pas"/>
+        <Filename Value="..\tdiclass.pas"/>
         <Caret Line="1" Column="1" TopLine="1"/>
       </Position16>
       <Position17>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="9" Column="56" TopLine="28"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="67" Column="14" TopLine="50"/>
       </Position17>
       <Position18>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="153" Column="44" TopLine="141"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="78" Column="74" TopLine="61"/>
       </Position18>
       <Position19>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="38" Column="5" TopLine="27"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="144" Column="14" TopLine="127"/>
       </Position19>
       <Position20>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="37" Column="9" TopLine="24"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="442" Column="24" TopLine="425"/>
       </Position20>
       <Position21>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="31" Column="19" TopLine="24"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="474" Column="26" TopLine="456"/>
       </Position21>
       <Position22>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="144" Column="22" TopLine="138"/>
+        <Filename Value="..\tdiclass.pas"/>
+        <Caret Line="650" Column="24" TopLine="630"/>
       </Position22>
-      <Position23>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="15" Column="3" TopLine="4"/>
-      </Position23>
-      <Position24>
-        <Filename Value="uform1.pas"/>
-        <Caret Line="84" Column="3" TopLine="82"/>
-      </Position24>
-      <Position25>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="202" Column="43" TopLine="189"/>
-      </Position25>
-      <Position26>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="206" Column="38" TopLine="195"/>
-      </Position26>
-      <Position27>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="208" Column="42" TopLine="195"/>
-      </Position27>
-      <Position28>
-        <Filename Value="..\tdiclass.pas"/>
-        <Caret Line="211" Column="30" TopLine="195"/>
-      </Position28>
-      <Position29>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="144" Column="22" TopLine="138"/>
-      </Position29>
-      <Position30>
-        <Filename Value="umainform.pas"/>
-        <Caret Line="81" Column="79" TopLine="75"/>
-      </Position30>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/components/tdi/Demo/uform1.lfm b/components/tdi/Demo/uform1.lfm
index 2a4dbe864..69ecd5abe 100644
--- a/components/tdi/Demo/uform1.lfm
+++ b/components/tdi/Demo/uform1.lfm
@@ -1,7 +1,7 @@
 object Form1: TForm1
-  Left = 623
+  Left = 615
   Height = 300
-  Top = 319
+  Top = 317
   Width = 500
   Caption = 'Form1'
   ClientHeight = 300
@@ -17,7 +17,7 @@ object Form1: TForm1
   OnCloseQuery = FormCloseQuery
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
-  LCLVersion = '1.1'
+  LCLVersion = '0.9.30.4'
   object bClose: TButton
     Left = 392
     Height = 25
diff --git a/components/tdi/Demo/uform2.lfm b/components/tdi/Demo/uform2.lfm
index 0c18b37bb..70b0f0127 100644
--- a/components/tdi/Demo/uform2.lfm
+++ b/components/tdi/Demo/uform2.lfm
@@ -1,7 +1,7 @@
 object Form2: TForm2
-  Left = 564
+  Left = 555
   Height = 252
-  Top = 330
+  Top = 328
   Width = 499
   Caption = 'Form2'
   ClientHeight = 252
@@ -13,7 +13,7 @@ object Form2: TForm2
   OnHide = FormHide
   OnKeyDown = FormKeyDown
   OnShow = FormShow
-  LCLVersion = '1.1'
+  LCLVersion = '0.9.30.4'
   object Edit1: TEdit
     Left = 48
     Height = 23
diff --git a/components/tdi/Demo/umainform.lfm b/components/tdi/Demo/umainform.lfm
index c64aefa65..136a3194d 100644
--- a/components/tdi/Demo/umainform.lfm
+++ b/components/tdi/Demo/umainform.lfm
@@ -1,7 +1,7 @@
 object fMainForm: TfMainForm
-  Left = 428
+  Left = 409
   Height = 484
-  Top = 154
+  Top = 156
   Width = 799
   Caption = 'fMainForm'
   ClientHeight = 464
@@ -46,7 +46,7 @@ object fMainForm: TfMainForm
     OnChange = TDINoteBook1Change
     OnCloseTabClicked = TDINoteBook1CloseTabClicked
     OnMouseDown = TDINoteBook1MouseDown
-    Options = [nboShowCloseButtons, nboMultiLine, nboKeyboardTabSwitch, nboShowAddTabButton]
+    Options = [nboMultiLine]
     TabDragMode = dmAutomatic
     TabDragAcceptMode = dmAutomatic
     BackgroundImage = Image1
@@ -89,6 +89,7 @@ object fMainForm: TfMainForm
         Top = 0
         Width = 571
         Align = alTop
+        Anchors = [akTop, akLeft, akRight, akBottom]
         Lines.Strings = (
           'Memo1'
         )
diff --git a/components/tdi/tdiclass.pas b/components/tdi/tdiclass.pas
index fa59e85ff..fe2121339 100644
--- a/components/tdi/tdiclass.pas
+++ b/components/tdi/tdiclass.pas
@@ -33,7 +33,7 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, ComCtrls, ExtCtrls, Menus,
-  ExtendedNotebook, Buttons, Graphics, LMessages  ;
+  ExtendedNotebook, Buttons, Graphics, LMessages, LCLVersion  ;
 
 const
   TDIM_CLOSEPAGE = LM_INTERFACELAST + 500;
@@ -165,10 +165,12 @@ type
 
     procedure RemoveInvalidPages ;
   protected
-    function CanChange: Boolean; override;
+    function CanChange: Boolean;
+       {$if (lcl_major > 0) or (lcl_release > 30)} override; {$endif}
     procedure DoChange; override;
     procedure Loaded; override;
-    procedure RemovePage(Index: Integer); override;
+    procedure RemovePage(Index: Integer);
+       {$if (lcl_major > 0) or (lcl_release > 30)} override; {$endif}
 
     procedure msg_ClosePage(var Msg: TLMessage); message TDIM_CLOSEPAGE;
 
@@ -587,7 +589,11 @@ begin
   end ;
   FTabsMenuItem.Add(NewMenuItem);
 
-  if (nboKeyboardTabSwitch in Options) then
+  if {$if (lcl_major > 0) or (lcl_release > 30)}
+      (nboKeyboardTabSwitch in Options)
+     {$else}
+      True
+     {$endif} then
   begin
     FNextMenuItem := TMenuItem.Create( FTabsMenuItem );
     with FNextMenuItem do
@@ -808,7 +814,7 @@ begin
           CreateCloseMenuItem;
 
         FCloseMenuItem.Visible := True ;
-        FCloseMenuItem.Enabled   := ( ActivePageIndex >= FFixedPages );
+        FCloseMenuItem.Enabled := ( ActivePageIndex >= FFixedPages );
       end ;
   end ;
 
@@ -946,7 +952,7 @@ begin
 
   with FCloseAllTabsMenuItem do
   begin
-    Enabled    := (PageCount > 0);
+    Enabled    := (PageCount > FFixedPages);
     Caption    := TDIActions.CloseAllTabs.Caption;
     Visible    := TDIActions.CloseAllTabs.Visible;
     ImageIndex := TDIActions.CloseAllTabs.ImageIndex;
@@ -1024,7 +1030,10 @@ begin
     end ;
   end ;
 
-  Result := Result and (inherited CanChange) ;
+  Result := Result
+    {$if (lcl_major > 0) or (lcl_release > 30)}
+      and (inherited CanChange)
+    {$endif};
 end ;
 
 procedure TTDINoteBook.DoChange ;
@@ -1081,7 +1090,11 @@ begin
 
     if CanRemovePage then
     begin
-      inherited RemovePage(APage.PageIndex) ;
+      {$if (lcl_major > 0) or (lcl_release > 30)}
+        inherited RemovePage(APage.PageIndex) ;
+      {$else}
+        APage.Free;
+      {$endif}
 
       if PageCount < 1 then  // On this case, DoChange is not fired //
         CheckInterface;