diff --git a/components/jcf2/IdePlugin/lazarus/jcfidemain.pas b/components/jcf2/IdePlugin/lazarus/jcfidemain.pas
index 0514df2ebe..5b25cd8954 100644
--- a/components/jcf2/IdePlugin/lazarus/jcfidemain.pas
+++ b/components/jcf2/IdePlugin/lazarus/jcfidemain.pas
@@ -31,7 +31,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/IdePlugin/lazarus/jcfideregister.pas b/components/jcf2/IdePlugin/lazarus/jcfideregister.pas
index 0f63e216e2..c288e0fcc8 100644
--- a/components/jcf2/IdePlugin/lazarus/jcfideregister.pas
+++ b/components/jcf2/IdePlugin/lazarus/jcfideregister.pas
@@ -28,7 +28,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/JcfVersionConsts.pas b/components/jcf2/JcfVersionConsts.pas
index 40e0fc3478..0a194e7b22 100644
--- a/components/jcf2/JcfVersionConsts.pas
+++ b/components/jcf2/JcfVersionConsts.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/AsmKeywords.pas b/components/jcf2/Parse/AsmKeywords.pas
index fbb26f8254..76caf7db46 100644
--- a/components/jcf2/Parse/AsmKeywords.pas
+++ b/components/jcf2/Parse/AsmKeywords.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/BuildParseTree.pas b/components/jcf2/Parse/BuildParseTree.pas
index 10c70add92..ea0832c481 100644
--- a/components/jcf2/Parse/BuildParseTree.pas
+++ b/components/jcf2/Parse/BuildParseTree.pas
@@ -35,7 +35,7 @@ See http://www.gnu.org/licenses/gpl.html
  It is much extended via test cases as that is woefully incomplete
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/BuildTokenList.pas b/components/jcf2/Parse/BuildTokenList.pas
index 60e66697f9..b9479e0113 100644
--- a/components/jcf2/Parse/BuildTokenList.pas
+++ b/components/jcf2/Parse/BuildTokenList.pas
@@ -33,7 +33,7 @@ unit BuildTokenList;
  2017.05.17 ~pktv Added lexing of octal constants (ex. -> const a=&777;)
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
@@ -44,8 +44,6 @@ uses
 
 type
 
-  EBuildTokenListWarning= type Exception;
-
   TBuildTokenListFlag=(btlOnlyDirectives);
   TBuildTokenListFlags = set of TBuildTokenListFlag;
 
diff --git a/components/jcf2/Parse/ParseError.pas b/components/jcf2/Parse/ParseError.pas
index 4361910815..ce2e0c19f1 100644
--- a/components/jcf2/Parse/ParseError.pas
+++ b/components/jcf2/Parse/ParseError.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
@@ -51,6 +51,8 @@ type
 
   end;
 
+  EBuildTokenListWarning= type Exception;
+
   procedure CheckNilPointer(aPtr:Pointer);
   procedure CheckNilInstance(aInstance: TObject; aLastValidToken: TObject);
 
diff --git a/components/jcf2/Parse/ParseTreeNode.pas b/components/jcf2/Parse/ParseTreeNode.pas
index 16992ddfd7..963e284718 100644
--- a/components/jcf2/Parse/ParseTreeNode.pas
+++ b/components/jcf2/Parse/ParseTreeNode.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/ParseTreeNodeType.pas b/components/jcf2/Parse/ParseTreeNodeType.pas
index a6b6d7af0b..dd6377c24f 100644
--- a/components/jcf2/Parse/ParseTreeNodeType.pas
+++ b/components/jcf2/Parse/ParseTreeNodeType.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/PreProcessor/PreProcessorExpressionParser.pas b/components/jcf2/Parse/PreProcessor/PreProcessorExpressionParser.pas
index fbecd6f519..f590757627 100644
--- a/components/jcf2/Parse/PreProcessor/PreProcessorExpressionParser.pas
+++ b/components/jcf2/Parse/PreProcessor/PreProcessorExpressionParser.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokenise.pas b/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokenise.pas
index eddcf6f5e3..baad75aefb 100644
--- a/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokenise.pas
+++ b/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokenise.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokens.pas b/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokens.pas
index 45a2c082d7..21badc1d7b 100644
--- a/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokens.pas
+++ b/components/jcf2/Parse/PreProcessor/PreProcessorExpressionTokens.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas b/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas
index 99ed7ba69e..5b729087fc 100644
--- a/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas
+++ b/components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas
@@ -24,7 +24,7 @@ the GNU General Public License Version 2 or later (the "GPL")
 See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/SourceToken.pas b/components/jcf2/Parse/SourceToken.pas
index dfa08569f7..ec6b20fc6d 100644
--- a/components/jcf2/Parse/SourceToken.pas
+++ b/components/jcf2/Parse/SourceToken.pas
@@ -28,7 +28,7 @@ unit SourceToken;
 { Created AFS 29 Nov 1999
   Token  - element of source code text }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/SourceTokenList.pas b/components/jcf2/Parse/SourceTokenList.pas
index 0c4849325a..166c242e99 100644
--- a/components/jcf2/Parse/SourceTokenList.pas
+++ b/components/jcf2/Parse/SourceTokenList.pas
@@ -40,7 +40,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/TokenUtils.pas b/components/jcf2/Parse/TokenUtils.pas
index 1a6a8b689e..cf6e6cb1e4 100644
--- a/components/jcf2/Parse/TokenUtils.pas
+++ b/components/jcf2/Parse/TokenUtils.pas
@@ -32,7 +32,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/Tokens.pas b/components/jcf2/Parse/Tokens.pas
index 053299a01b..465135ab28 100644
--- a/components/jcf2/Parse/Tokens.pas
+++ b/components/jcf2/Parse/Tokens.pas
@@ -45,7 +45,7 @@ unit Tokens;
   ie 'while' -> ttWhile
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Parse/UI/fShowParseTree.pas b/components/jcf2/Parse/UI/fShowParseTree.pas
index a11e5b33d3..ed153ef785 100644
--- a/components/jcf2/Parse/UI/fShowParseTree.pas
+++ b/components/jcf2/Parse/UI/fShowParseTree.pas
@@ -33,7 +33,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Align/AlignAssign.pas b/components/jcf2/Process/Align/AlignAssign.pas
index c92ad4e2eb..7c56f3af70 100644
--- a/components/jcf2/Process/Align/AlignAssign.pas
+++ b/components/jcf2/Process/Align/AlignAssign.pas
@@ -29,7 +29,7 @@ unit AlignAssign;
  Align the RHS of consecutive assign statements
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Align/AlignBase.pas b/components/jcf2/Process/Align/AlignBase.pas
index 91cdd92069..c6bd487ad7 100644
--- a/components/jcf2/Process/Align/AlignBase.pas
+++ b/components/jcf2/Process/Align/AlignBase.pas
@@ -30,7 +30,7 @@ unit AlignBase;
   This is the base class for all aligners
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Align/AlignComment.pas b/components/jcf2/Process/Align/AlignComment.pas
index f8dbfaba1e..b02868512f 100644
--- a/components/jcf2/Process/Align/AlignComment.pas
+++ b/components/jcf2/Process/Align/AlignComment.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Align/AlignConst.pas b/components/jcf2/Process/Align/AlignConst.pas
index db2dc1b9c3..9bd5c4dd08 100644
--- a/components/jcf2/Process/Align/AlignConst.pas
+++ b/components/jcf2/Process/Align/AlignConst.pas
@@ -29,7 +29,7 @@ unit AlignConst;
  Align the RHS of consecutive = signs in a const section
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Align/AlignField.pas b/components/jcf2/Process/Align/AlignField.pas
index afbb41ea13..eb1e08a114 100644
--- a/components/jcf2/Process/Align/AlignField.pas
+++ b/components/jcf2/Process/Align/AlignField.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Align/AlignTypedef.pas b/components/jcf2/Process/Align/AlignTypedef.pas
index af5dde4f60..1388812f5b 100644
--- a/components/jcf2/Process/Align/AlignTypedef.pas
+++ b/components/jcf2/Process/Align/AlignTypedef.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Align/AlignVars.pas b/components/jcf2/Process/Align/AlignVars.pas
index 47c305b104..6db9589bed 100644
--- a/components/jcf2/Process/Align/AlignVars.pas
+++ b/components/jcf2/Process/Align/AlignVars.pas
@@ -29,7 +29,7 @@ unit AlignVars;
  Align the RHS of var types
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/AllProcesses.pas b/components/jcf2/Process/AllProcesses.pas
index 2c08abbc2d..910b9211d9 100644
--- a/components/jcf2/Process/AllProcesses.pas
+++ b/components/jcf2/Process/AllProcesses.pas
@@ -27,7 +27,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/BaseVisitor.pas b/components/jcf2/Process/BaseVisitor.pas
index ca44948557..5c62ef9422 100644
--- a/components/jcf2/Process/BaseVisitor.pas
+++ b/components/jcf2/Process/BaseVisitor.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Capitalisation/Capitalisation.pas b/components/jcf2/Process/Capitalisation/Capitalisation.pas
index 88f74e0064..ca16ac502c 100644
--- a/components/jcf2/Process/Capitalisation/Capitalisation.pas
+++ b/components/jcf2/Process/Capitalisation/Capitalisation.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Capitalisation/IdentifierCaps.pas b/components/jcf2/Process/Capitalisation/IdentifierCaps.pas
index 9ef0015b40..30d1a6f456 100644
--- a/components/jcf2/Process/Capitalisation/IdentifierCaps.pas
+++ b/components/jcf2/Process/Capitalisation/IdentifierCaps.pas
@@ -28,7 +28,7 @@ See http://www.gnu.org/licenses/gpl.html
 { AFS 30 December 2002
     - fix capitalisation on specified words
 }
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Capitalisation/SpecificWordCaps.pas b/components/jcf2/Process/Capitalisation/SpecificWordCaps.pas
index 424fd53b57..f4562815ff 100644
--- a/components/jcf2/Process/Capitalisation/SpecificWordCaps.pas
+++ b/components/jcf2/Process/Capitalisation/SpecificWordCaps.pas
@@ -28,7 +28,7 @@ See http://www.gnu.org/licenses/gpl.html
 { AFS 30 December 2002
     - fix capitalisation on specified words
 }
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Capitalisation/UnitNameCaps.pas b/components/jcf2/Process/Capitalisation/UnitNameCaps.pas
index 1541adf448..c9f799b0b5 100644
--- a/components/jcf2/Process/Capitalisation/UnitNameCaps.pas
+++ b/components/jcf2/Process/Capitalisation/UnitNameCaps.pas
@@ -28,7 +28,7 @@ See http://www.gnu.org/licenses/gpl.html
 { AFS 16 June 2003
   - fix capitalisation on unit names
 }
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/FormatFlags.pas b/components/jcf2/Process/FormatFlags.pas
index 23b57432e5..e3a3a18d06 100644
--- a/components/jcf2/Process/FormatFlags.pas
+++ b/components/jcf2/Process/FormatFlags.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Indent/IndentAsmParam.pas b/components/jcf2/Process/Indent/IndentAsmParam.pas
index 35518134cc..e5ae95d6a7 100644
--- a/components/jcf2/Process/Indent/IndentAsmParam.pas
+++ b/components/jcf2/Process/Indent/IndentAsmParam.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Indent/Indenter.pas b/components/jcf2/Process/Indent/Indenter.pas
index 9dcf3f3903..197660b899 100644
--- a/components/jcf2/Process/Indent/Indenter.pas
+++ b/components/jcf2/Process/Indent/Indenter.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Info/BasicStats.pas b/components/jcf2/Process/Info/BasicStats.pas
index 04ea4f96f2..42e1766982 100644
--- a/components/jcf2/Process/Info/BasicStats.pas
+++ b/components/jcf2/Process/Info/BasicStats.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Nesting.pas b/components/jcf2/Process/Nesting.pas
index a94e257da7..3549d8357c 100644
--- a/components/jcf2/Process/Nesting.pas
+++ b/components/jcf2/Process/Nesting.pas
@@ -26,7 +26,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Obfuscate/FixCase.pas b/components/jcf2/Process/Obfuscate/FixCase.pas
index 0598ef2e58..49c8ef560d 100644
--- a/components/jcf2/Process/Obfuscate/FixCase.pas
+++ b/components/jcf2/Process/Obfuscate/FixCase.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Obfuscate/RebreakLines.pas b/components/jcf2/Process/Obfuscate/RebreakLines.pas
index f6983cda00..cabc0afd92 100644
--- a/components/jcf2/Process/Obfuscate/RebreakLines.pas
+++ b/components/jcf2/Process/Obfuscate/RebreakLines.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Obfuscate/ReduceWhiteSpace.pas b/components/jcf2/Process/Obfuscate/ReduceWhiteSpace.pas
index a6157d4f3d..216d9d94e6 100644
--- a/components/jcf2/Process/Obfuscate/ReduceWhiteSpace.pas
+++ b/components/jcf2/Process/Obfuscate/ReduceWhiteSpace.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Obfuscate/RemoveBlankLine.pas b/components/jcf2/Process/Obfuscate/RemoveBlankLine.pas
index afaf9f95fd..bd0047a068 100644
--- a/components/jcf2/Process/Obfuscate/RemoveBlankLine.pas
+++ b/components/jcf2/Process/Obfuscate/RemoveBlankLine.pas
@@ -28,7 +28,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Obfuscate/RemoveComment.pas b/components/jcf2/Process/Obfuscate/RemoveComment.pas
index 79e1b99e52..4261e4aed7 100644
--- a/components/jcf2/Process/Obfuscate/RemoveComment.pas
+++ b/components/jcf2/Process/Obfuscate/RemoveComment.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Obfuscate/RemoveConsecutiveWhiteSpace.pas b/components/jcf2/Process/Obfuscate/RemoveConsecutiveWhiteSpace.pas
index eded9fb849..4099412fe1 100644
--- a/components/jcf2/Process/Obfuscate/RemoveConsecutiveWhiteSpace.pas
+++ b/components/jcf2/Process/Obfuscate/RemoveConsecutiveWhiteSpace.pas
@@ -32,7 +32,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Obfuscate/RemoveReturn.pas b/components/jcf2/Process/Obfuscate/RemoveReturn.pas
index 704ce1a0c8..cecf837136 100644
--- a/components/jcf2/Process/Obfuscate/RemoveReturn.pas
+++ b/components/jcf2/Process/Obfuscate/RemoveReturn.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Obfuscate/RemoveUnneededWhiteSpace.pas b/components/jcf2/Process/Obfuscate/RemoveUnneededWhiteSpace.pas
index 8672fe5c65..5bbb579d32 100644
--- a/components/jcf2/Process/Obfuscate/RemoveUnneededWhiteSpace.pas
+++ b/components/jcf2/Process/Obfuscate/RemoveUnneededWhiteSpace.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Onceoffs/GlobalInclude.pas b/components/jcf2/Process/Onceoffs/GlobalInclude.pas
index 527fda45a6..d0289977a2 100644
--- a/components/jcf2/Process/Onceoffs/GlobalInclude.pas
+++ b/components/jcf2/Process/Onceoffs/GlobalInclude.pas
@@ -29,7 +29,7 @@ unit GlobalInclude;
  add in the global include
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Onceoffs/MozComment.pas b/components/jcf2/Process/Onceoffs/MozComment.pas
index b725dc0ba9..b13d0b71ed 100644
--- a/components/jcf2/Process/Onceoffs/MozComment.pas
+++ b/components/jcf2/Process/Onceoffs/MozComment.pas
@@ -33,7 +33,7 @@ unit MozComment;
  The easiest way to fix that, is this code below:
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/RemoveEmptyComment.pas b/components/jcf2/Process/RemoveEmptyComment.pas
index dab0ca1441..002d1be79e 100644
--- a/components/jcf2/Process/RemoveEmptyComment.pas
+++ b/components/jcf2/Process/RemoveEmptyComment.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/BlockStyles.pas b/components/jcf2/Process/Returns/BlockStyles.pas
index cae022fcb4..6bb29401d7 100644
--- a/components/jcf2/Process/Returns/BlockStyles.pas
+++ b/components/jcf2/Process/Returns/BlockStyles.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/LongLineBreaker.pas b/components/jcf2/Process/Returns/LongLineBreaker.pas
index 7cc71fdd83..f20366cf53 100644
--- a/components/jcf2/Process/Returns/LongLineBreaker.pas
+++ b/components/jcf2/Process/Returns/LongLineBreaker.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/NoReturnAfter.pas b/components/jcf2/Process/Returns/NoReturnAfter.pas
index 201d2f9fe6..42d574ad50 100644
--- a/components/jcf2/Process/Returns/NoReturnAfter.pas
+++ b/components/jcf2/Process/Returns/NoReturnAfter.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/NoReturnBefore.pas b/components/jcf2/Process/Returns/NoReturnBefore.pas
index bba86df613..689ebc2076 100644
--- a/components/jcf2/Process/Returns/NoReturnBefore.pas
+++ b/components/jcf2/Process/Returns/NoReturnBefore.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/PropertyOnOneLine.pas b/components/jcf2/Process/Returns/PropertyOnOneLine.pas
index 1bf33825b5..0096f6e960 100644
--- a/components/jcf2/Process/Returns/PropertyOnOneLine.pas
+++ b/components/jcf2/Process/Returns/PropertyOnOneLine.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/RemoveBlankLinesAfterProcHeader.pas b/components/jcf2/Process/Returns/RemoveBlankLinesAfterProcHeader.pas
index c5fb57f374..97642730bf 100644
--- a/components/jcf2/Process/Returns/RemoveBlankLinesAfterProcHeader.pas
+++ b/components/jcf2/Process/Returns/RemoveBlankLinesAfterProcHeader.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/RemoveBlankLinesInVars.pas b/components/jcf2/Process/Returns/RemoveBlankLinesInVars.pas
index de89fa590e..e5bc1ebcc2 100644
--- a/components/jcf2/Process/Returns/RemoveBlankLinesInVars.pas
+++ b/components/jcf2/Process/Returns/RemoveBlankLinesInVars.pas
@@ -31,7 +31,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/RemoveConsecutiveReturns.pas b/components/jcf2/Process/Returns/RemoveConsecutiveReturns.pas
index e03e25863f..741d466240 100644
--- a/components/jcf2/Process/Returns/RemoveConsecutiveReturns.pas
+++ b/components/jcf2/Process/Returns/RemoveConsecutiveReturns.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/RemoveReturnsAfter.pas b/components/jcf2/Process/Returns/RemoveReturnsAfter.pas
index 5714766634..4d182ea351 100644
--- a/components/jcf2/Process/Returns/RemoveReturnsAfter.pas
+++ b/components/jcf2/Process/Returns/RemoveReturnsAfter.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/RemoveReturnsAfterBegin.pas b/components/jcf2/Process/Returns/RemoveReturnsAfterBegin.pas
index ae608e35ab..6fa6099098 100644
--- a/components/jcf2/Process/Returns/RemoveReturnsAfterBegin.pas
+++ b/components/jcf2/Process/Returns/RemoveReturnsAfterBegin.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/RemoveReturnsBeforeEnd.pas b/components/jcf2/Process/Returns/RemoveReturnsBeforeEnd.pas
index f4c7502ccb..f87ab5221a 100644
--- a/components/jcf2/Process/Returns/RemoveReturnsBeforeEnd.pas
+++ b/components/jcf2/Process/Returns/RemoveReturnsBeforeEnd.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/ReturnAfter.pas b/components/jcf2/Process/Returns/ReturnAfter.pas
index 45b48ade74..5719f3efb0 100644
--- a/components/jcf2/Process/Returns/ReturnAfter.pas
+++ b/components/jcf2/Process/Returns/ReturnAfter.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/ReturnBefore.pas b/components/jcf2/Process/Returns/ReturnBefore.pas
index c6d579db44..27f890c639 100644
--- a/components/jcf2/Process/Returns/ReturnBefore.pas
+++ b/components/jcf2/Process/Returns/ReturnBefore.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/ReturnChars.pas b/components/jcf2/Process/Returns/ReturnChars.pas
index 52d35d48c5..cf4e2ea4d6 100644
--- a/components/jcf2/Process/Returns/ReturnChars.pas
+++ b/components/jcf2/Process/Returns/ReturnChars.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Returns/ReturnsAfterFinalEnd.pas b/components/jcf2/Process/Returns/ReturnsAfterFinalEnd.pas
index 1967566b67..d4874016e0 100644
--- a/components/jcf2/Process/Returns/ReturnsAfterFinalEnd.pas
+++ b/components/jcf2/Process/Returns/ReturnsAfterFinalEnd.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/MaxSpaces.pas b/components/jcf2/Process/Spacing/MaxSpaces.pas
index 9009365377..a0dd98b85a 100644
--- a/components/jcf2/Process/Spacing/MaxSpaces.pas
+++ b/components/jcf2/Process/Spacing/MaxSpaces.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/MoveSpaceToBeforeColon.pas b/components/jcf2/Process/Spacing/MoveSpaceToBeforeColon.pas
index c80cfa9a54..c3ee2e39d3 100644
--- a/components/jcf2/Process/Spacing/MoveSpaceToBeforeColon.pas
+++ b/components/jcf2/Process/Spacing/MoveSpaceToBeforeColon.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/NoSpaceAfter.pas b/components/jcf2/Process/Spacing/NoSpaceAfter.pas
index 27ba07851b..73c022417b 100644
--- a/components/jcf2/Process/Spacing/NoSpaceAfter.pas
+++ b/components/jcf2/Process/Spacing/NoSpaceAfter.pas
@@ -28,7 +28,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/NoSpaceBefore.pas b/components/jcf2/Process/Spacing/NoSpaceBefore.pas
index 9fd5d19f09..0964dc0209 100644
--- a/components/jcf2/Process/Spacing/NoSpaceBefore.pas
+++ b/components/jcf2/Process/Spacing/NoSpaceBefore.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/RemoveSpaceAtLineEnd.pas b/components/jcf2/Process/Spacing/RemoveSpaceAtLineEnd.pas
index 6b3fc76eb9..502bede63a 100644
--- a/components/jcf2/Process/Spacing/RemoveSpaceAtLineEnd.pas
+++ b/components/jcf2/Process/Spacing/RemoveSpaceAtLineEnd.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/SingleSpaceAfter.pas b/components/jcf2/Process/Spacing/SingleSpaceAfter.pas
index 39205f97da..809ad3d1be 100644
--- a/components/jcf2/Process/Spacing/SingleSpaceAfter.pas
+++ b/components/jcf2/Process/Spacing/SingleSpaceAfter.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/SingleSpaceBefore.pas b/components/jcf2/Process/Spacing/SingleSpaceBefore.pas
index b5ff348228..338c297f5c 100644
--- a/components/jcf2/Process/Spacing/SingleSpaceBefore.pas
+++ b/components/jcf2/Process/Spacing/SingleSpaceBefore.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/SpaceBeforeColon.pas b/components/jcf2/Process/Spacing/SpaceBeforeColon.pas
index 08187d5b3e..b9f332d5ab 100644
--- a/components/jcf2/Process/Spacing/SpaceBeforeColon.pas
+++ b/components/jcf2/Process/Spacing/SpaceBeforeColon.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/SpaceToTab.pas b/components/jcf2/Process/Spacing/SpaceToTab.pas
index 3f67b74a35..f1ada82604 100644
--- a/components/jcf2/Process/Spacing/SpaceToTab.pas
+++ b/components/jcf2/Process/Spacing/SpaceToTab.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Spacing/TabToSpace.pas b/components/jcf2/Process/Spacing/TabToSpace.pas
index 2decdeca17..5ebe98d3d1 100644
--- a/components/jcf2/Process/Spacing/TabToSpace.pas
+++ b/components/jcf2/Process/Spacing/TabToSpace.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/SwitchableVisitor.pas b/components/jcf2/Process/SwitchableVisitor.pas
index 7e5db53f38..622feac619 100644
--- a/components/jcf2/Process/SwitchableVisitor.pas
+++ b/components/jcf2/Process/SwitchableVisitor.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Transform/AddBeginEnd.pas b/components/jcf2/Process/Transform/AddBeginEnd.pas
index 0bb0ffb1e0..7032e7c442 100644
--- a/components/jcf2/Process/Transform/AddBeginEnd.pas
+++ b/components/jcf2/Process/Transform/AddBeginEnd.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Transform/AddBlockEndSemicolon.pas b/components/jcf2/Process/Transform/AddBlockEndSemicolon.pas
index c1e7330110..fe647615f3 100644
--- a/components/jcf2/Process/Transform/AddBlockEndSemicolon.pas
+++ b/components/jcf2/Process/Transform/AddBlockEndSemicolon.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Transform/FindReplace.pas b/components/jcf2/Process/Transform/FindReplace.pas
index 35f2dc74f1..467e4bea07 100644
--- a/components/jcf2/Process/Transform/FindReplace.pas
+++ b/components/jcf2/Process/Transform/FindReplace.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Transform/SortUses.pas b/components/jcf2/Process/Transform/SortUses.pas
index 6e98545e3f..6b1e011d03 100644
--- a/components/jcf2/Process/Transform/SortUses.pas
+++ b/components/jcf2/Process/Transform/SortUses.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Transform/SortUsesData.pas b/components/jcf2/Process/Transform/SortUsesData.pas
index ff196e598b..f5e560eb65 100644
--- a/components/jcf2/Process/Transform/SortUsesData.pas
+++ b/components/jcf2/Process/Transform/SortUsesData.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Transform/UsesClauseFindReplace.pas b/components/jcf2/Process/Transform/UsesClauseFindReplace.pas
index 6e27cd6171..69a7029784 100644
--- a/components/jcf2/Process/Transform/UsesClauseFindReplace.pas
+++ b/components/jcf2/Process/Transform/UsesClauseFindReplace.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Transform/UsesClauseInsert.pas b/components/jcf2/Process/Transform/UsesClauseInsert.pas
index a6086ef107..042d00fd04 100644
--- a/components/jcf2/Process/Transform/UsesClauseInsert.pas
+++ b/components/jcf2/Process/Transform/UsesClauseInsert.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Transform/UsesClauseRemove.pas b/components/jcf2/Process/Transform/UsesClauseRemove.pas
index 2e8ca820eb..9fc8a02bf7 100644
--- a/components/jcf2/Process/Transform/UsesClauseRemove.pas
+++ b/components/jcf2/Process/Transform/UsesClauseRemove.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/TreeWalker.pas b/components/jcf2/Process/TreeWalker.pas
index 438101ae1f..ec70b7189f 100644
--- a/components/jcf2/Process/TreeWalker.pas
+++ b/components/jcf2/Process/TreeWalker.pas
@@ -26,7 +26,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/VisitSetNesting.pas b/components/jcf2/Process/VisitSetNesting.pas
index 4a681b7ed8..dcdd56decb 100644
--- a/components/jcf2/Process/VisitSetNesting.pas
+++ b/components/jcf2/Process/VisitSetNesting.pas
@@ -27,7 +27,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/VisitSetXY.pas b/components/jcf2/Process/VisitSetXY.pas
index f737a38a98..81ed22c828 100644
--- a/components/jcf2/Process/VisitSetXY.pas
+++ b/components/jcf2/Process/VisitSetXY.pas
@@ -28,7 +28,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/VisitStripEmptySpace.pas b/components/jcf2/Process/VisitStripEmptySpace.pas
index 8e8a41b36f..2a158a7d22 100644
--- a/components/jcf2/Process/VisitStripEmptySpace.pas
+++ b/components/jcf2/Process/VisitStripEmptySpace.pas
@@ -32,7 +32,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Warnings/WarnAssignToFunctionName.pas b/components/jcf2/Process/Warnings/WarnAssignToFunctionName.pas
index ca47082c7f..accf23102b 100644
--- a/components/jcf2/Process/Warnings/WarnAssignToFunctionName.pas
+++ b/components/jcf2/Process/Warnings/WarnAssignToFunctionName.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Warnings/WarnCaseNoElse.pas b/components/jcf2/Process/Warnings/WarnCaseNoElse.pas
index 10828641d8..03062e0456 100644
--- a/components/jcf2/Process/Warnings/WarnCaseNoElse.pas
+++ b/components/jcf2/Process/Warnings/WarnCaseNoElse.pas
@@ -38,7 +38,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Warnings/WarnDestroy.pas b/components/jcf2/Process/Warnings/WarnDestroy.pas
index 633a69510a..48ada7a6ff 100644
--- a/components/jcf2/Process/Warnings/WarnDestroy.pas
+++ b/components/jcf2/Process/Warnings/WarnDestroy.pas
@@ -31,7 +31,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Warnings/WarnEmptyBlock.pas b/components/jcf2/Process/Warnings/WarnEmptyBlock.pas
index cd8c57d27e..450ad40c95 100644
--- a/components/jcf2/Process/Warnings/WarnEmptyBlock.pas
+++ b/components/jcf2/Process/Warnings/WarnEmptyBlock.pas
@@ -31,7 +31,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Warnings/WarnImbalancedComment.pas b/components/jcf2/Process/Warnings/WarnImbalancedComment.pas
index ea526798f9..617183b44f 100644
--- a/components/jcf2/Process/Warnings/WarnImbalancedComment.pas
+++ b/components/jcf2/Process/Warnings/WarnImbalancedComment.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Warnings/WarnRealType.pas b/components/jcf2/Process/Warnings/WarnRealType.pas
index 6abd1689f6..d9a21427c6 100644
--- a/components/jcf2/Process/Warnings/WarnRealType.pas
+++ b/components/jcf2/Process/Warnings/WarnRealType.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Warnings/WarnUnusedParam.pas b/components/jcf2/Process/Warnings/WarnUnusedParam.pas
index 64d7add661..88be6c3ab2 100644
--- a/components/jcf2/Process/Warnings/WarnUnusedParam.pas
+++ b/components/jcf2/Process/Warnings/WarnUnusedParam.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Process/Warnings/Warning.pas b/components/jcf2/Process/Warnings/Warning.pas
index 43cdbdea8f..326e0d4cfd 100644
--- a/components/jcf2/Process/Warnings/Warning.pas
+++ b/components/jcf2/Process/Warnings/Warning.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/CodeReader.pas b/components/jcf2/ReadWrite/CodeReader.pas
index f2812c3d70..fd943a34a5 100644
--- a/components/jcf2/ReadWrite/CodeReader.pas
+++ b/components/jcf2/ReadWrite/CodeReader.pas
@@ -48,7 +48,7 @@ unit CodeReader;
 
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/CodeWriter.pas b/components/jcf2/ReadWrite/CodeWriter.pas
index 913342c784..7bc27a72d0 100644
--- a/components/jcf2/ReadWrite/CodeWriter.pas
+++ b/components/jcf2/ReadWrite/CodeWriter.pas
@@ -39,7 +39,7 @@ unit CodeWriter;
   Now called  TCodeWriter not TWriter to avoid a name clash with Classes.Writer
   }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/ConvertTypes.pas b/components/jcf2/ReadWrite/ConvertTypes.pas
index 23b4b0319c..afddb69fc5 100644
--- a/components/jcf2/ReadWrite/ConvertTypes.pas
+++ b/components/jcf2/ReadWrite/ConvertTypes.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit ConvertTypes;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/Converter.pas b/components/jcf2/ReadWrite/Converter.pas
index d24b0cbcd8..1a6dece2ef 100644
--- a/components/jcf2/ReadWrite/Converter.pas
+++ b/components/jcf2/ReadWrite/Converter.pas
@@ -32,7 +32,7 @@ unit Converter;
   Wrappers will also support the interface IConvert
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/FileConverter.pas b/components/jcf2/ReadWrite/FileConverter.pas
index 5f46c3a668..4e72dc4031 100644
--- a/components/jcf2/ReadWrite/FileConverter.pas
+++ b/components/jcf2/ReadWrite/FileConverter.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I ..\Include\JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/FileReader.pas b/components/jcf2/ReadWrite/FileReader.pas
index 9784a18636..89f1b81034 100644
--- a/components/jcf2/ReadWrite/FileReader.pas
+++ b/components/jcf2/ReadWrite/FileReader.pas
@@ -44,7 +44,7 @@ See http://www.gnu.org/licenses/gpl.html
   with the same interface
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/FileWriter.pas b/components/jcf2/ReadWrite/FileWriter.pas
index 91c11fab67..9129e28fef 100644
--- a/components/jcf2/ReadWrite/FileWriter.pas
+++ b/components/jcf2/ReadWrite/FileWriter.pas
@@ -32,7 +32,7 @@ unit FileWriter;
   and writing the file at once
   }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/StringsConverter.pas b/components/jcf2/ReadWrite/StringsConverter.pas
index 2245944a0c..b5deb3c01c 100644
--- a/components/jcf2/ReadWrite/StringsConverter.pas
+++ b/components/jcf2/ReadWrite/StringsConverter.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/StringsReader.pas b/components/jcf2/ReadWrite/StringsReader.pas
index c8cba1b996..4e5804d88b 100644
--- a/components/jcf2/ReadWrite/StringsReader.pas
+++ b/components/jcf2/ReadWrite/StringsReader.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/StringsWriter.pas b/components/jcf2/ReadWrite/StringsWriter.pas
index 8b9ddb2976..32dcf1b55c 100644
--- a/components/jcf2/ReadWrite/StringsWriter.pas
+++ b/components/jcf2/ReadWrite/StringsWriter.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/UI/EditorConverter.pas b/components/jcf2/ReadWrite/UI/EditorConverter.pas
index 33b9477e01..b6ffe34f98 100644
--- a/components/jcf2/ReadWrite/UI/EditorConverter.pas
+++ b/components/jcf2/ReadWrite/UI/EditorConverter.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
   Converter class for the IDE pluggin
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/UI/EditorReader.pas b/components/jcf2/ReadWrite/UI/EditorReader.pas
index 57e894a4ef..1b8b5a4a31 100644
--- a/components/jcf2/ReadWrite/UI/EditorReader.pas
+++ b/components/jcf2/ReadWrite/UI/EditorReader.pas
@@ -27,7 +27,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/ReadWrite/UI/EditorWriter.pas b/components/jcf2/ReadWrite/UI/EditorWriter.pas
index a29463c060..38dbaddee7 100644
--- a/components/jcf2/ReadWrite/UI/EditorWriter.pas
+++ b/components/jcf2/ReadWrite/UI/EditorWriter.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/JcfRegistrySettings.pas b/components/jcf2/Settings/JcfRegistrySettings.pas
index ba605177cc..0189f08d72 100644
--- a/components/jcf2/Settings/JcfRegistrySettings.pas
+++ b/components/jcf2/Settings/JcfRegistrySettings.pas
@@ -35,7 +35,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/JcfSetBase.pas b/components/jcf2/Settings/JcfSetBase.pas
index 61b4872382..e8178cce65 100644
--- a/components/jcf2/Settings/JcfSetBase.pas
+++ b/components/jcf2/Settings/JcfSetBase.pas
@@ -30,7 +30,7 @@ unit JcfSetBase;
 
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/JcfSettings.pas b/components/jcf2/Settings/JcfSettings.pas
index 65876f0b8b..264873300c 100644
--- a/components/jcf2/Settings/JcfSettings.pas
+++ b/components/jcf2/Settings/JcfSettings.pas
@@ -29,7 +29,7 @@ unit JcfSettings;
   The file name is stored in registry
   This allows centralised settings on a shared dir }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetAlign.pas b/components/jcf2/Settings/SetAlign.pas
index 9f1ebecfdd..abbfc425ea 100644
--- a/components/jcf2/Settings/SetAlign.pas
+++ b/components/jcf2/Settings/SetAlign.pas
@@ -29,7 +29,7 @@ unit SetAlign;
   AFS 29 Dec 1999
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetAnyWordCaps.pas b/components/jcf2/Settings/SetAnyWordCaps.pas
index f77327187b..212cdc7f09 100644
--- a/components/jcf2/Settings/SetAnyWordCaps.pas
+++ b/components/jcf2/Settings/SetAnyWordCaps.pas
@@ -29,7 +29,7 @@ unit SetAnyWordCaps;
   AFS 29 Dec 1999
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetAsm.pas b/components/jcf2/Settings/SetAsm.pas
index 95b4cba2b8..d5d3fc6d63 100644
--- a/components/jcf2/Settings/SetAsm.pas
+++ b/components/jcf2/Settings/SetAsm.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetCaps.pas b/components/jcf2/Settings/SetCaps.pas
index a83ac034e2..203c9e30fb 100644
--- a/components/jcf2/Settings/SetCaps.pas
+++ b/components/jcf2/Settings/SetCaps.pas
@@ -29,7 +29,7 @@ unit SetCaps;
   AFS 29 Dec 1999
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetClarify.pas b/components/jcf2/Settings/SetClarify.pas
index d3c6aee5e4..889b41a0f1 100644
--- a/components/jcf2/Settings/SetClarify.pas
+++ b/components/jcf2/Settings/SetClarify.pas
@@ -28,7 +28,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit SetClarify;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetComments.pas b/components/jcf2/Settings/SetComments.pas
index 55496b04f8..36d17100b2 100644
--- a/components/jcf2/Settings/SetComments.pas
+++ b/components/jcf2/Settings/SetComments.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
   For now only options to remove empty comments
   but there may be more  }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 {$SCOPEDENUMS ON}
 
 interface
diff --git a/components/jcf2/Settings/SetFile.pas b/components/jcf2/Settings/SetFile.pas
index 6f2f4a3076..879eac5a38 100644
--- a/components/jcf2/Settings/SetFile.pas
+++ b/components/jcf2/Settings/SetFile.pas
@@ -29,7 +29,7 @@ unit SetFile;
   AFS 29 Dec 1999
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetIndent.pas b/components/jcf2/Settings/SetIndent.pas
index 5eaa5bdff6..c9b9d8ec42 100644
--- a/components/jcf2/Settings/SetIndent.pas
+++ b/components/jcf2/Settings/SetIndent.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit SetIndent;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetObfuscate.pas b/components/jcf2/Settings/SetObfuscate.pas
index e1601bd687..dea2bf99ec 100644
--- a/components/jcf2/Settings/SetObfuscate.pas
+++ b/components/jcf2/Settings/SetObfuscate.pas
@@ -29,7 +29,7 @@ unit SetObfuscate;
   AFS 29 Dec 1999
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetPreProcessor.pas b/components/jcf2/Settings/SetPreProcessor.pas
index 5a291284bf..973ed3ce27 100644
--- a/components/jcf2/Settings/SetPreProcessor.pas
+++ b/components/jcf2/Settings/SetPreProcessor.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetReplace.pas b/components/jcf2/Settings/SetReplace.pas
index aaa40747b0..c9b0a6f0eb 100644
--- a/components/jcf2/Settings/SetReplace.pas
+++ b/components/jcf2/Settings/SetReplace.pas
@@ -29,7 +29,7 @@ unit SetReplace;
   AFS 17 Jan 2K
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetReturns.pas b/components/jcf2/Settings/SetReturns.pas
index 67942c32f8..f21157bf84 100644
--- a/components/jcf2/Settings/SetReturns.pas
+++ b/components/jcf2/Settings/SetReturns.pas
@@ -27,7 +27,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 { mostly spacing and line breaking +options }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetSpaces.pas b/components/jcf2/Settings/SetSpaces.pas
index e567a57753..0c930265bc 100644
--- a/components/jcf2/Settings/SetSpaces.pas
+++ b/components/jcf2/Settings/SetSpaces.pas
@@ -27,7 +27,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit SetSpaces;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetTransform.pas b/components/jcf2/Settings/SetTransform.pas
index 3d1a3c6d89..2b3597e2b1 100644
--- a/components/jcf2/Settings/SetTransform.pas
+++ b/components/jcf2/Settings/SetTransform.pas
@@ -29,7 +29,7 @@ unit SetTransform;
   AFS 5 June 2004 
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetUses.pas b/components/jcf2/Settings/SetUses.pas
index b228294a39..06841987a5 100644
--- a/components/jcf2/Settings/SetUses.pas
+++ b/components/jcf2/Settings/SetUses.pas
@@ -33,7 +33,7 @@ unit SetUses;
  - relace unit(s) with a substitute unit wherever they occur
  }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SetWordList.pas b/components/jcf2/Settings/SetWordList.pas
index 273affc52d..c0acbdbcd1 100644
--- a/components/jcf2/Settings/SetWordList.pas
+++ b/components/jcf2/Settings/SetWordList.pas
@@ -30,7 +30,7 @@ unit SetWordList;
   Stores a generic word list
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/SettingsTypes.pas b/components/jcf2/Settings/SettingsTypes.pas
index dcfdbbbc47..9d159658dc 100644
--- a/components/jcf2/Settings/SettingsTypes.pas
+++ b/components/jcf2/Settings/SettingsTypes.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/Streams/RegistrySettings.pas b/components/jcf2/Settings/Streams/RegistrySettings.pas
index a431375397..26f2374cd6 100644
--- a/components/jcf2/Settings/Streams/RegistrySettings.pas
+++ b/components/jcf2/Settings/Streams/RegistrySettings.pas
@@ -26,7 +26,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Settings/Streams/SettingsStream.pas b/components/jcf2/Settings/Streams/SettingsStream.pas
index 1a1849d16e..cd47a42d77 100644
--- a/components/jcf2/Settings/Streams/SettingsStream.pas
+++ b/components/jcf2/Settings/Streams/SettingsStream.pas
@@ -32,7 +32,7 @@ unit SettingsStream;
   that I have been recently working with Java io classes
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/TestApplication/UnicodePas.pas b/components/jcf2/TestApplication/UnicodePas.pas
new file mode 100644
index 0000000000..6b601d7fb0
Binary files /dev/null and b/components/jcf2/TestApplication/UnicodePas.pas differ
diff --git a/components/jcf2/Ui/Settings/fRegistrySettings.pas b/components/jcf2/Ui/Settings/fRegistrySettings.pas
index 24c6d67263..3a1c57e0a1 100644
--- a/components/jcf2/Ui/Settings/fRegistrySettings.pas
+++ b/components/jcf2/Ui/Settings/fRegistrySettings.pas
@@ -27,7 +27,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frAnyCapsSettings.pas b/components/jcf2/Ui/Settings/frAnyCapsSettings.pas
index da2271a918..2e717cda57 100644
--- a/components/jcf2/Ui/Settings/frAnyCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frAnyCapsSettings.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frAnyCapsSettings;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frAsm.pas b/components/jcf2/Ui/Settings/frAsm.pas
index a6815d0023..4033902742 100644
--- a/components/jcf2/Ui/Settings/frAsm.pas
+++ b/components/jcf2/Ui/Settings/frAsm.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frBlankLines.pas b/components/jcf2/Ui/Settings/frBlankLines.pas
index 9e28b90a72..f7bfa9afbc 100644
--- a/components/jcf2/Ui/Settings/frBlankLines.pas
+++ b/components/jcf2/Ui/Settings/frBlankLines.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 {*)}
 unit frBlankLines;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frClarify.pas b/components/jcf2/Ui/Settings/frClarify.pas
index 6dd16b7836..f60b1906f7 100644
--- a/components/jcf2/Ui/Settings/frClarify.pas
+++ b/components/jcf2/Ui/Settings/frClarify.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frClarify;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frClarifyAlign.pas b/components/jcf2/Ui/Settings/frClarifyAlign.pas
index f525e7a41b..54803b8270 100644
--- a/components/jcf2/Ui/Settings/frClarifyAlign.pas
+++ b/components/jcf2/Ui/Settings/frClarifyAlign.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frClarifyAlign;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frClarifyBlocks.pas b/components/jcf2/Ui/Settings/frClarifyBlocks.pas
index 508ff9589f..7349664ad2 100644
--- a/components/jcf2/Ui/Settings/frClarifyBlocks.pas
+++ b/components/jcf2/Ui/Settings/frClarifyBlocks.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frClarifyBlocks;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
index 7399d9ab1a..740b53aedc 100644
--- a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
+++ b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frClarifyCaseBlocks;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frClarifyIndent.pas b/components/jcf2/Ui/Settings/frClarifyIndent.pas
index c520ed0544..a16885d3ec 100644
--- a/components/jcf2/Ui/Settings/frClarifyIndent.pas
+++ b/components/jcf2/Ui/Settings/frClarifyIndent.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas b/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas
index b96a1833c4..0487aa5d55 100644
--- a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas
+++ b/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frClarifyLongLineBreaker;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frClarifyReturns.pas b/components/jcf2/Ui/Settings/frClarifyReturns.pas
index 085d2af433..273252ae1e 100644
--- a/components/jcf2/Ui/Settings/frClarifyReturns.pas
+++ b/components/jcf2/Ui/Settings/frClarifyReturns.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frClarifyReturns;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frClarifySpaces.pas b/components/jcf2/Ui/Settings/frClarifySpaces.pas
index bb5c662b8d..5af26e4784 100644
--- a/components/jcf2/Ui/Settings/frClarifySpaces.pas
+++ b/components/jcf2/Ui/Settings/frClarifySpaces.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frClarifySpaces;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frComments.pas b/components/jcf2/Ui/Settings/frComments.pas
index 1a5eb36a34..424a1420a7 100644
--- a/components/jcf2/Ui/Settings/frComments.pas
+++ b/components/jcf2/Ui/Settings/frComments.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas b/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas
index 38a86bfd19..f93f48ee6e 100644
--- a/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas
+++ b/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frFiles.pas b/components/jcf2/Ui/Settings/frFiles.pas
index d2342a19ad..f84b1cc026 100644
--- a/components/jcf2/Ui/Settings/frFiles.pas
+++ b/components/jcf2/Ui/Settings/frFiles.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frFiles;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas b/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas
index 786aab1515..cf0049d9e1 100644
--- a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frIdentifierCapsSettings;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas b/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas
index 26b3757ba3..eab3b6fd2a 100644
--- a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frNotIdentifierCapsSettings;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frObfuscateSettings.pas b/components/jcf2/Ui/Settings/frObfuscateSettings.pas
index 56acc86270..99bad4772b 100644
--- a/components/jcf2/Ui/Settings/frObfuscateSettings.pas
+++ b/components/jcf2/Ui/Settings/frObfuscateSettings.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frObfuscateSettings;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frPreProcessor.pas b/components/jcf2/Ui/Settings/frPreProcessor.pas
index f65bf3a47a..8b30ecbb8c 100644
--- a/components/jcf2/Ui/Settings/frPreProcessor.pas
+++ b/components/jcf2/Ui/Settings/frPreProcessor.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frReplace.pas b/components/jcf2/Ui/Settings/frReplace.pas
index b6e04e192a..d503b716de 100644
--- a/components/jcf2/Ui/Settings/frReplace.pas
+++ b/components/jcf2/Ui/Settings/frReplace.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frReplace;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frReservedCapsSettings.pas b/components/jcf2/Ui/Settings/frReservedCapsSettings.pas
index 463717e0a9..88fb238b16 100644
--- a/components/jcf2/Ui/Settings/frReservedCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frReservedCapsSettings.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit frReservedCapsSettings;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frTransform.pas b/components/jcf2/Ui/Settings/frTransform.pas
index d6bb2696e8..18105f5af1 100644
--- a/components/jcf2/Ui/Settings/frTransform.pas
+++ b/components/jcf2/Ui/Settings/frTransform.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frUnitCaps.pas b/components/jcf2/Ui/Settings/frUnitCaps.pas
index 0ea3caa162..6bd3cc28f3 100644
--- a/components/jcf2/Ui/Settings/frUnitCaps.pas
+++ b/components/jcf2/Ui/Settings/frUnitCaps.pas
@@ -24,7 +24,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frUses.pas b/components/jcf2/Ui/Settings/frUses.pas
index c61aec085f..d79396a0df 100644
--- a/components/jcf2/Ui/Settings/frUses.pas
+++ b/components/jcf2/Ui/Settings/frUses.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/Settings/frWarnings.pas b/components/jcf2/Ui/Settings/frWarnings.pas
index 3d7fdeb8ef..0fe94666a0 100644
--- a/components/jcf2/Ui/Settings/frWarnings.pas
+++ b/components/jcf2/Ui/Settings/frWarnings.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/UI/fAbout.pas b/components/jcf2/Ui/UI/fAbout.pas
index ceb90f5d13..467dace003 100644
--- a/components/jcf2/Ui/UI/fAbout.pas
+++ b/components/jcf2/Ui/UI/fAbout.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 
 unit fAbout;
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Ui/UI/fJcfErrorDisplay.pas b/components/jcf2/Ui/UI/fJcfErrorDisplay.pas
index 9c2c9e13eb..b2d07ba910 100644
--- a/components/jcf2/Ui/UI/fJcfErrorDisplay.pas
+++ b/components/jcf2/Ui/UI/fJcfErrorDisplay.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Utils/IntList.pas b/components/jcf2/Utils/IntList.pas
index b4975ef8f8..21b8a89fa5 100644
--- a/components/jcf2/Utils/IntList.pas
+++ b/components/jcf2/Utils/IntList.pas
@@ -37,7 +37,7 @@ unit IntList;
 }
 
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Utils/JcfLog.pas b/components/jcf2/Utils/JcfLog.pas
index b2644bf3ed..ee745c2be2 100644
--- a/components/jcf2/Utils/JcfLog.pas
+++ b/components/jcf2/Utils/JcfLog.pas
@@ -29,7 +29,7 @@ unit JcfLog;
 
   Log file }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Utils/JcfMiscFunctions.pas b/components/jcf2/Utils/JcfMiscFunctions.pas
index 87589b91af..c43b604053 100644
--- a/components/jcf2/Utils/JcfMiscFunctions.pas
+++ b/components/jcf2/Utils/JcfMiscFunctions.pas
@@ -43,7 +43,7 @@ See http://www.gnu.org/licenses/gpl.html
   So I am importing just what I need from ComponentFunctions here
 }
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Utils/JcfStringUtils.pas b/components/jcf2/Utils/JcfStringUtils.pas
index 4b027638d3..11479521fa 100644
--- a/components/jcf2/Utils/JcfStringUtils.pas
+++ b/components/jcf2/Utils/JcfStringUtils.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 {
 This unit contains string utility code
diff --git a/components/jcf2/Utils/JcfUnicodeFiles.pas b/components/jcf2/Utils/JcfUnicodeFiles.pas
index 8c7386055c..69d16ed3af 100644
--- a/components/jcf2/Utils/JcfUnicodeFiles.pas
+++ b/components/jcf2/Utils/JcfUnicodeFiles.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Utils/UI/Delay.pas b/components/jcf2/Utils/UI/Delay.pas
index c2f05111ea..aaaa7e8b8e 100644
--- a/components/jcf2/Utils/UI/Delay.pas
+++ b/components/jcf2/Utils/UI/Delay.pas
@@ -52,7 +52,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface
 
diff --git a/components/jcf2/Utils/UI/JcfHelp.pas b/components/jcf2/Utils/UI/JcfHelp.pas
index 19d6adc2ae..8663f169f4 100644
--- a/components/jcf2/Utils/UI/JcfHelp.pas
+++ b/components/jcf2/Utils/UI/JcfHelp.pas
@@ -25,7 +25,7 @@ See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
 
-{$I JcfGlobal.inc}
+{$mode delphi}
 
 interface