diff --git a/ide/unitinfodlg.lfm b/ide/unitinfodlg.lfm
index 5ede6ff069..99677220ce 100644
--- a/ide/unitinfodlg.lfm
+++ b/ide/unitinfodlg.lfm
@@ -12,12 +12,15 @@ object UnitInfoDialog: TUnitInfoDialog
   Position = poScreenCenter
   LCLVersion = '0.9.27'
   object OkButton: TBitBtn
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
     Left = 419
     Height = 26
-    Top = 244
+    Top = 251
     Width = 75
     Anchors = [akRight, akBottom]
     AutoSize = True
+    BorderSpacing.Bottom = 6
     Cancel = True
     Caption = '&OK'
     Constraints.MinWidth = 75
@@ -30,7 +33,7 @@ object UnitInfoDialog: TUnitInfoDialog
   object Notebook: TNotebook
     AnchorSideBottom.Control = OkButton
     Left = 6
-    Height = 232
+    Height = 239
     Top = 6
     Width = 488
     Align = alTop
@@ -228,10 +231,10 @@ object UnitInfoDialog: TUnitInfoDialog
     object IncludePathsPage: TPage
       Caption = 'IncludePathsPage'
       ClientWidth = 480
-      ClientHeight = 206
+      ClientHeight = 213
       object IncludePathMemo: TMemo
         Left = 6
-        Height = 194
+        Height = 201
         Top = 6
         Width = 468
         Align = alClient
@@ -264,7 +267,7 @@ object UnitInfoDialog: TUnitInfoDialog
     AnchorSideBottom.Side = asrBottom
     Left = 6
     Height = 26
-    Top = 244
+    Top = 251
     Width = 130
     Anchors = [akTop, akLeft, akBottom]
     AutoSize = True
@@ -279,7 +282,7 @@ object UnitInfoDialog: TUnitInfoDialog
     AnchorSideBottom.Side = asrBottom
     Left = 256
     Height = 26
-    Top = 244
+    Top = 251
     Width = 157
     Anchors = [akTop, akRight, akBottom]
     AutoSize = True
diff --git a/ide/unitinfodlg.lrs b/ide/unitinfodlg.lrs
index fba387ae58..6590275336 100644
--- a/ide/unitinfodlg.lrs
+++ b/ide/unitinfodlg.lrs
@@ -5,81 +5,83 @@ LazarusResources.Add('TUnitInfoDialog','FORMDATA',[
   +#3'Top'#3#251#0#5'Width'#3#244#1#13'ActiveControl'#7#8'OkButton'#11'BorderSt'
   +'yle'#7#13'bsSizeToolWin'#7'Caption'#6#14'UnitInfoDialog'#12'ClientHeight'#3
   +#27#1#11'ClientWidth'#3#244#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14
-  +'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#7'TBitBtn'#8'OkButton'#4'Left'
-  +#3#163#1#6'Height'#2#26#3'Top'#3#244#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'
-  +#8'akBottom'#0#8'AutoSize'#9#6'Cancel'#9#7'Caption'#6#3'&OK'#20'Constraints.'
-  +'MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyp'
-  +'hs'#2#0#8'TabOrder'#2#0#0#0#9'TNotebook'#8'Notebook'#24'AnchorSideBottom.Co'
-  +'ntrol'#7#8'OkButton'#4'Left'#2#6#6'Height'#3#232#0#3'Top'#2#6#5'Width'#3#232
-  +#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBotto'
-  +'m'#0#20'BorderSpacing.Around'#2#6#9'PageIndex'#2#2#8'TabOrder'#2#1#0#5'TPag'
-  +'e'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11'ClientWidth'#3#224#1#12
-  +'ClientHeight'#3#206#0#0#6'TLabel'#6'ULines'#4'Left'#2#12#6'Height'#2#13#3'T'
-  +'op'#2'\'#5'Width'#2''''#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#6'UL'
-  +'ines'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#6
-  +'TLabel'#8'OutLines'#22'AnchorSideLeft.Control'#7#6'ULines'#19'AnchorSideLef'
-  +'t.Side'#7#9'asrBottom'#4'Left'#2'?'#6'Height'#2#13#3'Top'#2'\'#5'Width'#2'3'
-  +#18'BorderSpacing.Left'#2#12#7'Caption'#6#8'OutLines'#11'ParentColor'#8#0#0#6
-  +'TLabel'#7'OutPath'#22'AnchorSideLeft.Control'#7#5'UPath'#19'AnchorSideLeft.'
-  +'Side'#7#9'asrBottom'#4'Left'#2':'#6'Height'#2#13#3'Top'#2'p'#5'Width'#2'.'
-  +#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutPath'#11'ParentColor'#8#0#0#6
-  +'TLabel'#5'UPath'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'p'#5'Width'#2'"'#9'Al'
-  +'ignment'#7#14'taRightJustify'#7'Caption'#6#5'UPath'#10'Font.Style'#11#6'fsB'
-  +'old'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#11'UIncludedBy'#4'L'
-  +'eft'#2#12#6'Height'#2#13#3'Top'#3#132#0#5'Width'#2'H'#9'Alignment'#7#14'taR'
-  +'ightJustify'#7'Caption'#6#11'UIncludedBy'#10'Font.Style'#11#6'fsBold'#0#11
-  +'ParentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#13'OutIncludedBy'#22'AnchorSi'
-  +'deLeft.Control'#7#11'UIncludedBy'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4
-  +'Left'#2'`'#6'Height'#2#13#3'Top'#3#132#0#5'Width'#2'T'#18'BorderSpacing.Lef'
-  +'t'#2#12#7'Caption'#6#13'OutIncludedBy'#11'ParentColor'#8#0#0#6'TLabel'#7'Ou'
-  +'tSize'#22'AnchorSideLeft.Control'#7#5'USize'#19'AnchorSideLeft.Side'#7#9'as'
-  +'rBottom'#4'Left'#2'9'#6'Height'#2#13#3'Top'#2'H'#5'Width'#2'-'#18'BorderSpa'
-  +'cing.Left'#2#12#7'Caption'#6#7'OutSize'#11'ParentColor'#8#0#0#6'TLabel'#5'U'
-  +'Size'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'H'#5'Width'#2'!'#9'Alignment'#7
-  +#14'taRightJustify'#7'Caption'#6#5'USize'#10'Font.Style'#11#6'fsBold'#0#11'P'
-  +'arentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#10'UInProject'#4'Left'#2#12#6
-  +'Height'#2#13#3'Top'#2'4'#5'Width'#2':'#9'Alignment'#7#14'taRightJustify'#7
-  +'Caption'#6#10'UInProject'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10
-  +'ParentFont'#8#0#0#6'TLabel'#12'OutInProject'#22'AnchorSideLeft.Control'#7#10
-  +'UInProject'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'R'#6'Height'#2
-  +#13#3'Top'#2'4'#5'Width'#2'F'#18'BorderSpacing.Left'#2#12#7'Caption'#6#12'Ou'
-  +'tInProject'#11'ParentColor'#8#0#0#6'TLabel'#7'OutType'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#5'UType'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'='#6'Hei'
-  +'ght'#2#13#3'Top'#2' '#5'Width'#2'1'#18'BorderSpacing.Left'#2#12#7'Caption'#6
-  +#7'OutType'#11'ParentColor'#8#0#0#6'TLabel'#5'UType'#4'Left'#2#12#6'Height'#2
-  +#13#3'Top'#2' '#5'Width'#2'%'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6
-  +#5'UType'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0
-  +#0#6'TLabel'#7'OutName'#22'AnchorSideLeft.Control'#7#5'UName'#19'AnchorSideL'
-  +'eft.Side'#7#9'asrBottom'#4'Left'#2'A'#6'Height'#2#13#3'Top'#2#12#5'Width'#2
-  +'5'#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutName'#11'ParentColor'#8#0#0
-  +#6'TLabel'#5'UName'#4'Left'#2#12#6'Height'#2#13#3'Top'#2#12#5'Width'#2')'#9
-  +'Alignment'#7#14'taRightJustify'#7'Caption'#6#5'UName'#10'Font.Style'#11#6'f'
-  +'sBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#7'TButton'#15'ClearIncluded'
-  +'By'#21'AnchorSideTop.Control'#7#11'UIncludedBy'#4'Left'#2#12#6'Height'#2#26
-  +#3'Top'#3#152#0#5'Width'#2'k'#8'AutoSize'#9#17'BorderSpacing.Top'#2#20#7'Cap'
-  +'tion'#6#15'ClearIncludedBy'#7'OnClick'#7#20'clearIncludedByClick'#8'TabOrde'
-  +'r'#2#0#0#0#0#5'TPage'#13'UnitPathsPage'#7'Caption'#6#13'UnitPathsPage'#11'C'
-  +'lientWidth'#3#224#1#12'ClientHeight'#3#206#0#0#5'TMemo'#12'UnitPathMemo'#4
+  +'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#7'TBitBtn'#8'OkButton'#24'Anch'
+  +'orSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3#163#1#6'Height'#2#26#3'Top'#3#251#0#5'Width'#2'K'#7'Anchors'#11#7'a'
+  +'kRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Bottom'#2#6#6'Cancel'#9
+  +#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4
+  +'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#9'TNotebook'
+  +#8'Notebook'#24'AnchorSideBottom.Control'#7#8'OkButton'#4'Left'#2#6#6'Height'
+  +#3#239#0#3'Top'#2#6#5'Width'#3#232#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akT'
+  +'op'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#9'PageI'
+  +'ndex'#2#2#8'TabOrder'#2#1#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'Genera'
+  +'lPage'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#206#0#0#6'TLabel'#6'ULine'
+  +'s'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'\'#5'Width'#2''''#9'Alignment'#7#14
+  +'taRightJustify'#7'Caption'#6#6'ULines'#10'Font.Style'#11#6'fsBold'#0#11'Par'
+  +'entColor'#8#10'ParentFont'#8#0#0#6'TLabel'#8'OutLines'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#6'ULines'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'?'#6'He'
+  +'ight'#2#13#3'Top'#2'\'#5'Width'#2'3'#18'BorderSpacing.Left'#2#12#7'Caption'
+  +#6#8'OutLines'#11'ParentColor'#8#0#0#6'TLabel'#7'OutPath'#22'AnchorSideLeft.'
+  +'Control'#7#5'UPath'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2':'#6'H'
+  +'eight'#2#13#3'Top'#2'p'#5'Width'#2'.'#18'BorderSpacing.Left'#2#12#7'Caption'
+  +#6#7'OutPath'#11'ParentColor'#8#0#0#6'TLabel'#5'UPath'#4'Left'#2#12#6'Height'
+  +#2#13#3'Top'#2'p'#5'Width'#2'"'#9'Alignment'#7#14'taRightJustify'#7'Caption'
+  +#6#5'UPath'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8
+  +#0#0#6'TLabel'#11'UIncludedBy'#4'Left'#2#12#6'Height'#2#13#3'Top'#3#132#0#5
+  +'Width'#2'H'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#11'UIncludedBy'
+  +#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#6'TLab'
+  +'el'#13'OutIncludedBy'#22'AnchorSideLeft.Control'#7#11'UIncludedBy'#19'Ancho'
+  +'rSideLeft.Side'#7#9'asrBottom'#4'Left'#2'`'#6'Height'#2#13#3'Top'#3#132#0#5
+  +'Width'#2'T'#18'BorderSpacing.Left'#2#12#7'Caption'#6#13'OutIncludedBy'#11'P'
+  +'arentColor'#8#0#0#6'TLabel'#7'OutSize'#22'AnchorSideLeft.Control'#7#5'USize'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'9'#6'Height'#2#13#3'Top'#2
+  +'H'#5'Width'#2'-'#18'BorderSpacing.Left'#2#12#7'Caption'#6#7'OutSize'#11'Par'
+  +'entColor'#8#0#0#6'TLabel'#5'USize'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'H'#5
+  +'Width'#2'!'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#5'USize'#10'Font'
+  +'.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#10
+  +'UInProject'#4'Left'#2#12#6'Height'#2#13#3'Top'#2'4'#5'Width'#2':'#9'Alignme'
+  +'nt'#7#14'taRightJustify'#7'Caption'#6#10'UInProject'#10'Font.Style'#11#6'fs'
+  +'Bold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#12'OutInProject'#22
+  +'AnchorSideLeft.Control'#7#10'UInProject'#19'AnchorSideLeft.Side'#7#9'asrBot'
+  +'tom'#4'Left'#2'R'#6'Height'#2#13#3'Top'#2'4'#5'Width'#2'F'#18'BorderSpacing'
+  +'.Left'#2#12#7'Caption'#6#12'OutInProject'#11'ParentColor'#8#0#0#6'TLabel'#7
+  +'OutType'#22'AnchorSideLeft.Control'#7#5'UType'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#4'Left'#2'='#6'Height'#2#13#3'Top'#2' '#5'Width'#2'1'#18'BorderS'
+  +'pacing.Left'#2#12#7'Caption'#6#7'OutType'#11'ParentColor'#8#0#0#6'TLabel'#5
+  +'UType'#4'Left'#2#12#6'Height'#2#13#3'Top'#2' '#5'Width'#2'%'#9'Alignment'#7
+  +#14'taRightJustify'#7'Caption'#6#5'UType'#10'Font.Style'#11#6'fsBold'#0#11'P'
+  +'arentColor'#8#10'ParentFont'#8#0#0#6'TLabel'#7'OutName'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'UName'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#2'A'#6'He'
+  +'ight'#2#13#3'Top'#2#12#5'Width'#2'5'#18'BorderSpacing.Left'#2#12#7'Caption'
+  +#6#7'OutName'#11'ParentColor'#8#0#0#6'TLabel'#5'UName'#4'Left'#2#12#6'Height'
+  +#2#13#3'Top'#2#12#5'Width'#2')'#9'Alignment'#7#14'taRightJustify'#7'Caption'
+  +#6#5'UName'#10'Font.Style'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8
+  +#0#0#7'TButton'#15'ClearIncludedBy'#21'AnchorSideTop.Control'#7#11'UIncluded'
+  +'By'#4'Left'#2#12#6'Height'#2#26#3'Top'#3#152#0#5'Width'#2'k'#8'AutoSize'#9
+  +#17'BorderSpacing.Top'#2#20#7'Caption'#6#15'ClearIncludedBy'#7'OnClick'#7#20
+  +'clearIncludedByClick'#8'TabOrder'#2#0#0#0#0#5'TPage'#13'UnitPathsPage'#7'Ca'
+  +'ption'#6#13'UnitPathsPage'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#206#0
+  +#0#5'TMemo'#12'UnitPathMemo'#4'Left'#2#6#6'Height'#3#194#0#3'Top'#2#6#5'Widt'
+  +'h'#3#212#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#8'ReadOnly'#9
+  +#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'#16'IncludePa'
+  +'thsPage'#7'Caption'#6#16'IncludePathsPage'#11'ClientWidth'#3#224#1#12'Clien'
+  ,'tHeight'#3#213#0#0#5'TMemo'#15'IncludePathMemo'#4'Left'#2#6#6'Height'#3#201
+  +#0#3'Top'#2#6#5'Width'#3#212#1#5'Align'#7#8'alClient'#20'BorderSpacing.Aroun'
+  +'d'#2#6#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#5
+  +'TPage'#21'CompleteUnitPathsPage'#7'Caption'#6#21'CompleteUnitPathsPage'#11
+  +'ClientWidth'#3#224#1#12'ClientHeight'#3#206#0#0#5'TMemo'#11'SrcPathMemo'#4
   +'Left'#2#6#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#212#1#5'Align'#7#8'alClie'
   +'nt'#20'BorderSpacing.Around'#2#6#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBo'
-  +'th'#8'TabOrder'#2#0#0#0#0#5'TPage'#16'IncludePathsPage'#7'Caption'#6#16'Inc'
-  +'ludePathsPage'#11'ClientWidth'#3#224#1#12'ClientHeight'#3#206#0#0#5'TMemo'
-  +#15'IncludePathMemo'#4'Left'#2#6#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#212
-  ,#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#8'ReadOnly'#9#10'Scro'
-  +'llBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#5'TPage'#21'CompleteUnitPath'
-  +'sPage'#7'Caption'#6#21'CompleteUnitPathsPage'#11'ClientWidth'#3#224#1#12'Cl'
-  +'ientHeight'#3#206#0#0#5'TMemo'#11'SrcPathMemo'#4'Left'#2#6#6'Height'#3#194#0
-  +#3'Top'#2#6#5'Width'#3#212#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'
-  +#2#6#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#0#7
-  +'TButton'#19'CodeToolsDefsButton'#21'AnchorSideTop.Control'#7#8'OkButton'#24
-  +'AnchorSideBottom.Control'#7#8'OkButton'#21'AnchorSideBottom.Side'#7#9'asrBo'
-  +'ttom'#4'Left'#2#6#6'Height'#2#26#3'Top'#3#244#0#5'Width'#3#130#0#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#19'CodeTools'
-  +'DefsButton'#7'OnClick'#7#24'CodeToolsDefsButtonClick'#8'TabOrder'#2#2#0#0#7
-  +'TButton'#26'GotoIncludeDirectiveButton'#21'AnchorSideTop.Control'#7#8'OkBut'
-  +'ton'#23'AnchorSideRight.Control'#7#8'OkButton'#24'AnchorSideBottom.Control'
-  +#7#8'OkButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#0#1#6'Heig'
-  +'ht'#2#26#3'Top'#3#244#0#5'Width'#3#157#0#7'Anchors'#11#5'akTop'#7'akRight'#8
-  +'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#26'GotoI'
-  +'ncludeDirectiveButton'#11'ModalResult'#2#6#8'TabOrder'#2#3#0#0#0
+  +'th'#8'TabOrder'#2#0#0#0#0#0#7'TButton'#19'CodeToolsDefsButton'#21'AnchorSid'
+  +'eTop.Control'#7#8'OkButton'#24'AnchorSideBottom.Control'#7#8'OkButton'#21'A'
+  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#26#3'Top'#3#251
+  +#0#5'Width'#3#130#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoSiz'
+  +'e'#9#7'Caption'#6#19'CodeToolsDefsButton'#7'OnClick'#7#24'CodeToolsDefsButt'
+  +'onClick'#8'TabOrder'#2#2#0#0#7'TButton'#26'GotoIncludeDirectiveButton'#21'A'
+  +'nchorSideTop.Control'#7#8'OkButton'#23'AnchorSideRight.Control'#7#8'OkButto'
+  +'n'#24'AnchorSideBottom.Control'#7#8'OkButton'#21'AnchorSideBottom.Side'#7#9
+  +'asrBottom'#4'Left'#3#0#1#6'Height'#2#26#3'Top'#3#251#0#5'Width'#3#157#0#7'A'
+  +'nchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing'
+  +'.Right'#2#6#7'Caption'#6#26'GotoIncludeDirectiveButton'#11'ModalResult'#2#6
+  +#8'TabOrder'#2#3#0#0#0
 ]);