diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas
index 1e22b57a34..81abe79ba3 100644
--- a/components/codetools/linkscanner.pas
+++ b/components/codetools/linkscanner.pas
@@ -2299,20 +2299,21 @@ end;
 
 function TLinkScanner.IncludeDirective: boolean;
 // {$i filename} or {$include filename}
+// filename can be 'filename with spaces'
 var IncFilename: string;
 begin
   inc(SrcPos);
   if (Src[SrcPos]<>'%') then begin
     IncFilename:=Trim(copy(Src,SrcPos,CommentInnerEndPos-SrcPos));
+    if (IncFilename<>'') and (IncFilename[1]='''')
+    and (IncFilename[length(IncFilename)]='''') then
+      IncFilename:=copy(IncFilename,2,length(IncFilename)-2);
     if PascalCompiler<>pcDelphi then begin
       // default is fpc behaviour (default extension is .pp)
       if ExtractFileExt(IncFilename)='' then
         IncFilename:=IncFilename+'.pp';
     end else begin
       // delphi understands quoted include files and default extension is .pas
-      if (copy(IncFilename,1,1)='''')
-      and (copy(IncFilename,length(IncFilename),1)='''') then
-        IncFilename:=copy(IncFilename,2,length(IncFilename)-2);
       if ExtractFileExt(IncFilename)='' then
         IncFilename:=IncFilename+'.pas';
     end;
diff --git a/lcl/controls.pp b/lcl/controls.pp
index 7f4777ac47..4a19b8960f 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -1808,7 +1808,7 @@ type
   end;
 
 
-  { TControlPropertyStorage }
+  { TControlPropertyStorage - abstract base class }
 
   TControlPropertyStorage = class(TCustomPropertyStorage)
   protected
diff --git a/lcl/forms.pp b/lcl/forms.pp
index 82c81c95cb..25de21e102 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -1162,7 +1162,7 @@ type
   end;
 
 
-  { TFormPropertyStorage }
+  { TFormPropertyStorage - abstract base class }
 
   TFormPropertyStorage = class(TControlPropertyStorage)
   private