diff --git a/components/synedit/test/testblockindent.pas b/components/synedit/test/testblockindent.pas
index 9ff35064c4..5989b1ccc9 100644
--- a/components/synedit/test/testblockindent.pas
+++ b/components/synedit/test/testblockindent.pas
@@ -5,9 +5,8 @@ unit TestBlockIndent;
 interface
 
 uses
-  Classes, SysUtils, testregistry, TestBase, math,
-  SynEdit, SynEditTypes, SynEditTextTrimmer, SynEditKeyCmds,
-  LCLType, LCLProc;
+  SysUtils, testregistry, TestBase, math,
+  SynEdit, SynEditKeyCmds;
 
 type
 
diff --git a/components/synedit/test/testfoldedview.pas b/components/synedit/test/testfoldedview.pas
index 072df2d384..f2f6287664 100644
--- a/components/synedit/test/testfoldedview.pas
+++ b/components/synedit/test/testfoldedview.pas
@@ -24,7 +24,7 @@ type
     FoldedView: TSynEditFoldedView;
     DoAutoFoldDescTests, DoAutoFoldDescTestsReadOnly: Boolean;
     DoAllowScrollPastEof: Boolean;
-    EnableDebug: Boolean;
+    //EnableDebug: Boolean;
 
     procedure TestFoldedText(AName: String; ALines: Array of Integer);
     procedure SetLines(AText: Array of String); reintroduce;
diff --git a/components/synedit/test/testhighlighterlfm.pas b/components/synedit/test/testhighlighterlfm.pas
index 529e1f02f2..5a6398547e 100644
--- a/components/synedit/test/testhighlighterlfm.pas
+++ b/components/synedit/test/testhighlighterlfm.pas
@@ -5,8 +5,7 @@ unit TestHighlighterLfm;
 interface
 
 uses
-  Classes, SysUtils, testregistry, TestBase, Forms, LCLProc, TestHighlightFoldBase,
-  SynEdit, SynEditTypes, SynHighlighterLFM, SynEditHighlighterFoldBase;
+  SysUtils, testregistry, TestBase, TestHighlightFoldBase, SynHighlighterLFM, SynEditHighlighterFoldBase;
 
 type
 
diff --git a/components/synedit/test/testhighlightfoldbase.pas b/components/synedit/test/testhighlightfoldbase.pas
index cf79c13de8..0c8337ec4f 100644
--- a/components/synedit/test/testhighlightfoldbase.pas
+++ b/components/synedit/test/testhighlightfoldbase.pas
@@ -5,8 +5,8 @@ unit TestHighlightFoldBase;
 interface
 
 uses
-  Classes, SysUtils, testregistry, TestBase, Forms, LCLProc,
-  SynEdit, SynEditTypes, SynEditHighlighterFoldBase;
+  SysUtils, TestBase,
+  SynEdit, SynEditHighlighterFoldBase;
 
 type
 
diff --git a/components/synedit/test/testhighlightmulti.pas b/components/synedit/test/testhighlightmulti.pas
index 9cdb0921de..6c61208546 100644
--- a/components/synedit/test/testhighlightmulti.pas
+++ b/components/synedit/test/testhighlightmulti.pas
@@ -5,7 +5,7 @@ unit TestHighlightMulti;
 interface
 
 uses
-  Classes, SysUtils, math, LCLProc, fpcunit, testregistry, TestBase, Forms, SynEditHighlighter,
+  Classes, SysUtils, math, LCLProc, testregistry, TestBase, Forms, SynEditHighlighter,
   SynHighlighterMulti, SynHighlighterLFM, SynHighlighterXML, SynHighlighterPas, SynEditKeyCmds,
   LazSynEditText, SynEditTextBuffer, LazLogger;
 
@@ -117,9 +117,6 @@ begin
 end;
 
 procedure TTestHighlightMulti.DumpSections(ASectList: TSynHLightMultiSectionList);
-var
-  s: TSynHLightMultiVirtualSection;
-  i: Integer;
 begin
   ASectList.Debug;
 end;
diff --git a/components/synedit/test/testhighlightxml.pas b/components/synedit/test/testhighlightxml.pas
index 091e9b6576..b2495d8331 100644
--- a/components/synedit/test/testhighlightxml.pas
+++ b/components/synedit/test/testhighlightxml.pas
@@ -5,7 +5,7 @@ unit TestHighlightXml;
 interface
 
 uses
-  Classes, SysUtils, fpcunit, testregistry, TestBase, TestHighlightFoldBase, SynHighlighterXML,
+  testregistry, TestBase, TestHighlightFoldBase, SynHighlighterXML,
   SynEditHighlighterFoldBase;
 
 type
@@ -35,8 +35,6 @@ procedure THighlightXml.TestXml;
     Result[2] := '</qwe>';
     Result[3] := '';
   end;
-var
-  hl: TSynXMLSyn;
 begin
   ReCreateEdit;
   SetLines(TestText);
diff --git a/components/synedit/test/testnavigation.pas b/components/synedit/test/testnavigation.pas
index 9f33604489..92b27b44fa 100644
--- a/components/synedit/test/testnavigation.pas
+++ b/components/synedit/test/testnavigation.pas
@@ -9,8 +9,8 @@ unit TestNavigation;
 interface
 
 uses
-  Classes, SysUtils, testregistry, LCLProc, LCLType, Forms, TestBase,
-  SynEdit, SynEditTextTrimmer, SynEditKeyCmds, LazSynEditText;
+  SysUtils, testregistry, LCLProc, Forms, TestBase,
+  SynEdit, SynEditKeyCmds;
 
 type
 
diff --git a/components/synedit/test/testsearch.pas b/components/synedit/test/testsearch.pas
index ef2dccd20f..074e62e7b6 100644
--- a/components/synedit/test/testsearch.pas
+++ b/components/synedit/test/testsearch.pas
@@ -5,8 +5,8 @@ unit TestSearch;
 interface
 
 uses
-  Classes, SysUtils, testregistry, LCLProc, LCLType, Forms, TestBase,
-  SynEdit, SynEditTextTrimmer, SynEditKeyCmds, SynEditSearch, SynHighlighterPas;
+  Classes, SysUtils, testregistry, TestBase,
+  SynEdit, SynEditSearch, SynHighlighterPas;
 
 type
 
diff --git a/components/synedit/test/testsyntextarea.pas b/components/synedit/test/testsyntextarea.pas
index 2c065af841..dfcf45de0c 100644
--- a/components/synedit/test/testsyntextarea.pas
+++ b/components/synedit/test/testsyntextarea.pas
@@ -6,9 +6,9 @@ unit TestSynTextArea;
 interface
 
 uses
-  Classes, SysUtils, fpcunit, testregistry, TestBase, LazSynTextArea, SynEditTypes,
-  SynEditMarkupBracket, SynEdit, SynHighlighterPosition, SynEditMarkup, SynEditMiscClasses,
-  Graphics, Forms;
+  Classes, SysUtils, testregistry, TestBase, LazSynTextArea, SynEditTypes,
+  SynEditMarkupBracket, SynEdit, SynHighlighterPosition, SynEditMiscClasses,
+  Graphics;
 
 type