diff --git a/components/jcf2/IdePlugin/lazarus/jcfidelazarus.lpk b/components/jcf2/IdePlugin/lazarus/jcfidelazarus.lpk
index 8b2a5e8f85..7a2823fc60 100644
--- a/components/jcf2/IdePlugin/lazarus/jcfidelazarus.lpk
+++ b/components/jcf2/IdePlugin/lazarus/jcfidelazarus.lpk
@@ -722,6 +722,18 @@
         <Filename Value="..\..\ReadWrite\diffmerge.pas"/>
         <UnitName Value="diffmerge"/>
       </Item>
+      <Item>
+        <Filename Value="..\..\Utils\JcfStringUtils.pas"/>
+        <UnitName Value="JcfStringUtils"/>
+      </Item>
+      <Item>
+        <Filename Value="..\..\Utils\JcfSystemUtils.pas"/>
+        <UnitName Value="JcfSystemUtils"/>
+      </Item>
+      <Item>
+        <Filename Value="..\..\Utils\JcfUnicodeFiles.pas"/>
+        <UnitName Value="JcfUnicodeFiles"/>
+      </Item>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/jcf2/IdePlugin/lazarus/jcfidelazarus.pas b/components/jcf2/IdePlugin/lazarus/jcfidelazarus.pas
index a0b69c2092..cc7bc87f0b 100644
--- a/components/jcf2/IdePlugin/lazarus/jcfidelazarus.pas
+++ b/components/jcf2/IdePlugin/lazarus/jcfidelazarus.pas
@@ -41,7 +41,8 @@ uses
   frClarifyCaseBlocks, frComments, frWarnings, frReservedCapsSettings, 
   frAnyCapsSettings, frIdentifierCapsSettings, frNotIdentifierCapsSettings, 
   frUnitCaps, frReplace, frUses, frTransform, frAsm, frPreProcessor, 
-  JcfUIConsts, Diff, diffmerge, LazarusPackageIntf;
+  JcfUIConsts, Diff, diffmerge, JcfStringUtils, JcfSystemUtils, 
+  JcfUnicodeFiles, LazarusPackageIntf;
 
 implementation
 
diff --git a/components/jcf2/Utils/Delay.pas b/components/jcf2/Utils/Delay.pas
index cb5214151d..c2f05111ea 100644
--- a/components/jcf2/Utils/Delay.pas
+++ b/components/jcf2/Utils/Delay.pas
@@ -56,7 +56,9 @@ See http://www.gnu.org/licenses/gpl.html
 
 interface
 
-uses ExtCtrls;
+uses
+  SysUtils,
+  ExtCtrls;
 
 type
   TProcedure = procedure(var pbTryAgain: boolean);
@@ -94,8 +96,6 @@ type
 
 implementation
 
-uses SysUtils;
-
 const
   // default of 100ms = 1/0 second
   DEFAULT_DELAY = 100;
diff --git a/components/jcf2/Utils/JcfSystemUtils.pas b/components/jcf2/Utils/JcfSystemUtils.pas
index b38a737314..b42bb3e92b 100644
--- a/components/jcf2/Utils/JcfSystemUtils.pas
+++ b/components/jcf2/Utils/JcfSystemUtils.pas
@@ -59,7 +59,7 @@ implementation
 
 uses
   {$ifdef MSWINDOWS}
-    Windows, ShellApi, {$PUSH} {$WARNINGS OFF} FileCtrl {$POP}
+    Windows, ShellApi
   {$endif}
   {$ifdef Unix}
     Unix
diff --git a/components/jcf2/Utils/JcfUnicodeFiles.pas b/components/jcf2/Utils/JcfUnicodeFiles.pas
index 35d5910e49..9f728df2c8 100644
--- a/components/jcf2/Utils/JcfUnicodeFiles.pas
+++ b/components/jcf2/Utils/JcfUnicodeFiles.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface
 
 uses
-  Classes, SysUtils, Dialogs;
+  Classes, SysUtils;
 
 type
   TFileContentType = (eUnknown, e8Bit, eUtf8,