* removed unused units

git-svn-id: trunk@36165 -

compiler/aopt.pas

@@ -80,7 +80,7 @@ Unit aopt;
       verbose,
       cpubase,
       cgbase,
-      aoptda,aoptcpu,aoptcpud;
+      aoptcpu;
 
     Constructor TAsmOptimizer.create(_AsmL: TAsmList);
       Begin

compiler/aoptbase.pas

@@ -112,7 +112,7 @@ unit aoptbase;
   implementation
 
     uses
-      verbose,globtype,globals,aoptcpub;
+      verbose,globals,aoptcpub;
 
   constructor taoptbase.create;
     begin

compiler/aoptda.pas

@@ -29,7 +29,7 @@ Unit aoptda;
 
     uses
       cpubase,cgbase,
-      aasmbase,aasmtai,aasmdata,aasmcpu,
+      aasmtai,aasmdata,aasmcpu,
       aoptcpub, aoptbase;
 
     Type
@@ -56,7 +56,7 @@ Unit aoptda;
   Implementation
 
     uses
-      globals, aoptobj;
+      globals;
 
     Procedure TAOptDFA.DoDFA;
     { Analyzes the Data Flow of an assembler list. Analyses the reg contents     }

compiler/aoptobj.pas

@@ -367,7 +367,6 @@ Unit AoptObj;
       cutils,
       globals,
       verbose,
-      procinfo,
       aoptutils;
 
 

compiler/assemble.pas

@@ -252,9 +252,7 @@ Implementation
 {$endif memdebug}
       script,fmodule,verbose,
       cpuinfo,
-      aasmcpu,
-      owar,owomflib
-      ;
+      aasmcpu;
 
     var
       CAssembler : array[tasm] of TAssemblerClass;

compiler/blockutl.pas

@@ -48,11 +48,11 @@ interface
 implementation
 
   uses
-    verbose,globtype,globals,cutils,constexp,
+    verbose,globtype,cutils,constexp,
     pass_1,pparautl,fmodule,
     aasmdata,
     nbas,ncon,nmem,nutils,
-    symbase,symconst,symtable,symsym,symcreat,objcutil,objcdef,defutil,
+    symbase,symconst,symtable,symsym,symcreat,objcutil,defutil,
     paramgr;
 
 

compiler/cgobj.pas

@@ -552,7 +552,7 @@ implementation
 
     uses
        globals,systems,
-       verbose,paramgr,symtable,symsym,
+       verbose,paramgr,symsym,
        tgobj,cutils,procinfo;
 
 {*****************************************************************************

compiler/compiler.pas

@@ -24,6 +24,9 @@ unit compiler;
 
 {$i fpcdefs.inc}
 
+{ some units are implicitly needed by the compiler }
+{$WARN 5023 off : Unit "$1" not used in $2}
+
 interface
 
 uses
@@ -44,7 +47,7 @@ uses
 {$ENDIF}
   verbose,comphook,systems,
   cutils,cfileutl,cclasses,globals,options,fmodule,parser,symtable,
-  assemble,link,dbgbase,import,export,tokens,pass_1,wpobase,wpo
+  assemble,link,dbgbase,import,export,tokens,wpo
   { cpu parameter handling }
   ,cpupara
   { procinfo stuff }

compiler/cresstr.pas

@@ -39,7 +39,7 @@ uses
    cutils,globtype,globals,systems,
    symbase,symconst,symtype,symdef,symsym,symtable,
    verbose,fmodule,ppu,
-   aasmbase,aasmtai,aasmdata,aasmcnst,
+   aasmtai,aasmdata,aasmcnst,
    aasmcpu;
 
     Type

compiler/dbgbase.pas

@@ -29,7 +29,7 @@ interface
       cclasses,
       systems,
       parabase,
-      symconst,symbase,symdef,symtype,symsym,symtable,
+      symconst,symbase,symdef,symtype,symsym,
       fmodule,
       aasmtai,aasmdata;
 

compiler/export.pas

@@ -29,7 +29,7 @@ uses
   cutils,cclasses,
   systems,
   symtype,symdef,symsym,
-  aasmbase,aasmdata;
+  aasmdata;
 
 type
    { export options }

compiler/expunix.pas

@@ -27,10 +27,10 @@ unit expunix;
 interface
 
 uses
-  cutils,cclasses,
+  cclasses,
   systems,
   export,
-  symtype,symdef,symsym,
+  symdef,symsym,
   aasmbase;
 
 type
@@ -55,15 +55,14 @@ implementation
 
 uses
   symconst,
-  globtype,globals,
-  aasmdata,aasmtai,aasmcpu,
+  globals,
+  aasmdata,aasmtai,
   fmodule,
   {$ifdef cpuhighleveltarget}
   symcreat,
   {$endif}
-  cgbase,cgutils,cpubase,cgobj,
-  cgcpu,hlcgobj,hlcgcpu,
-  ncgutil,
+  cgbase,
+  hlcgobj,hlcgcpu,
   verbose;
 
 

compiler/fmodule.pas

@@ -44,9 +44,9 @@ interface
     uses
        cutils,cclasses,cfileutl,
        globtype,finput,ogbase,fpkg,
-       symbase,symconst,symsym,
+       symbase,symsym,
        wpobase,
-       aasmbase,aasmtai,aasmdata;
+       aasmbase,aasmdata;
 
 
     const

compiler/fpcp.pas

@@ -67,7 +67,8 @@ implementation
     cfileutl,cutils,
     systems,globals,version,
     verbose,
-    entfile,fppu,ppu,pkgutil;
+    ppu,
+    entfile,pkgutil;
 
 { tpcppackage }
 

compiler/globals.pas

@@ -579,9 +579,10 @@ implementation
       macutils,
 {$endif}
 {$ifdef mswindows}
-      windirs,
+      windirs;
+{$else}
+      ;
 {$endif}
-      comphook;
 
 {****************************************************************************
                                  TLinkStrMap

compiler/hlcg2ll.pas

@@ -34,10 +34,10 @@ unit hlcg2ll;
   interface
 
     uses
-       cclasses,globtype,constexp,
+       globtype,constexp,
        cpubase,cgbase,cgutils,parabase,
        aasmbase,aasmtai,aasmdata,aasmcpu,
-       symconst,symtype,symdef,rgobj,
+       symconst,symtype,symdef,
        node,hlcgobj
        ;
 
@@ -329,9 +329,9 @@ unit hlcg2ll;
 implementation
 
     uses
-       globals,options,systems,
-       verbose,defutil,paramgr,symsym,
-       cgobj,tgobj,cutils,procinfo,
+       globals,systems,
+       verbose,defutil,
+       cgobj,tgobj,cutils,
        ncgutil;
 
   { thlcg2ll }

compiler/hlcgobj.pas

@@ -675,15 +675,15 @@ implementation
 
     uses
        globals,systems,
-       fmodule,export,
+       fmodule,
        verbose,defutil,paramgr,
        symtable,
        nbas,ncon,nld,ncgrtti,pass_2,
-       cpuinfo,cgobj,cutils,procinfo,
+       cgobj,cutils,procinfo,
 {$ifdef x86}
        cgx86,
 {$endif x86}
-       ncgutil,ngenutil;
+       ncgutil;
 
 
     procedure destroy_hlcodegen;

compiler/htypechk.pas

@@ -26,7 +26,7 @@ unit htypechk;
 interface
 
     uses
-      cclasses,cmsgs,tokens,cpuinfo,
+      cclasses,cmsgs,tokens,
       node,globtype,
       symconst,symtype,symdef,symsym,symbase,
       pgentype;

compiler/i386/aoptcpu.pas

@@ -30,7 +30,7 @@ unit aoptcpu;
 
     uses
       cgbase,
-      cpubase, aoptobj, aoptcpub, aopt, aoptx86,
+      cpubase, aopt, aoptx86,
       Aasmbase,aasmtai,aasmdata;
 
     Type
@@ -52,8 +52,6 @@ unit aoptcpu;
 
     uses
       verbose,globtype,globals,
-      cutils,
-      aoptbase,
       cpuinfo,
       aasmcpu,
       aoptutils,

compiler/import.pas

@@ -25,10 +25,7 @@ unit import;
 interface
 
 uses
-  cutils,cclasses,
-  systems,
-  aasmbase,
-  symdef,symsym;
+  systems;
 
 type
    timportlib=class

compiler/link.pas

@@ -161,7 +161,7 @@ Implementation
       baseunix,
 {$endif hasUnix}
       script,globals,verbose,comphook,ppu,fpccrc,
-      aasmbase,aasmtai,aasmdata,aasmcpu,
+      aasmbase,aasmcpu,
       ogmap;
 
     var

compiler/nadd.pas

@@ -127,7 +127,7 @@ implementation
       {$ifdef state_tracking}
       nstate,
       {$endif}
-      cpuinfo,procinfo;
+      cpuinfo;
 
 
 {*****************************************************************************

compiler/nbas.pas

@@ -27,8 +27,8 @@ interface
 
     uses
        globtype,
-       cpuinfo,cpubase,cgbase,cgutils,
-       aasmbase,aasmtai,aasmdata,aasmcpu,
+       cgbase,cgutils,
+       aasmtai,aasmdata,aasmcpu,
        node,
        symtype;
 
@@ -302,11 +302,10 @@ interface
 implementation
 
     uses
-      cutils,
       verbose,globals,systems,
       symconst,symdef,defutil,defcmp,
       pass_1,
-      nutils,nld,ncal,nflw,
+      nutils,nld,
       procinfo
       ;
 

compiler/ncgadd.pas

@@ -72,11 +72,11 @@ interface
 
     uses
       globtype,systems,
-      cutils,verbose,globals,
-      symconst,symdef,paramgr,
-      aasmbase,aasmtai,aasmdata,defutil,
-      procinfo,pass_2,tgobj,
-      nutils,ncon,nset,ncgutil,cgobj,cgutils,
+      verbose,globals,
+      symconst,symdef,
+      aasmbase,aasmdata,defutil,
+      pass_2,tgobj,
+      nutils,nset,ncgutil,cgobj,cgutils,
       hlcgobj
       ;
 

compiler/ncgbas.pas

@@ -71,11 +71,11 @@ interface
   implementation
 
     uses
-      globals,systems,
+      globals,
       cutils,verbose,
       aasmbase,aasmcpu,
-      symsym,symconst,symdef,defutil,
-      nflw,pass_2,ncgutil,
+      symsym,symconst,defutil,
+      pass_2,ncgutil,
       cgbase,cgobj,hlcgobj,
       procinfo,
       cpuinfo,

compiler/ncgcal.pas

@@ -128,12 +128,10 @@ implementation
 
     uses
       systems,
-      cutils,verbose,globals,
-      cpuinfo,
-      symconst,symbase,symtable,symtype,symsym,defutil,paramgr,
+      verbose,globals,
+      symconst,symtable,symtype,symsym,defutil,paramgr,
       pass_2,
-      aasmbase,aasmtai,
-      nbas,nmem,nld,ncnv,nutils,
+      nld,ncnv,
       ncgutil,blockutl,
       cgobj,tgobj,hlcgobj,
       procinfo,

compiler/ncgcnv.pas

@@ -71,14 +71,13 @@ interface
 
     uses
       cutils,verbose,globtype,globals,
-      aasmbase,aasmtai,aasmdata,aasmcpu,symconst,symdef,symtable,paramgr,
-      nutils,ncon,ncal,
+      aasmbase,aasmdata,symconst,symdef,symtable,
+      nutils,ncon,
       cpubase,systems,
-      procinfo,pass_2,
+      pass_2,
       cgbase,
       cgutils,cgobj,hlcgobj,
       fmodule,
-      ncgutil,
       tgobj
       ;
 

compiler/ncgcon.pas

@@ -29,7 +29,7 @@ interface
     uses
        aasmbase,
        symtype,
-       node,ncon;
+       ncon;
 
     type
        tcgrealconstnode = class(trealconstnode)
@@ -73,10 +73,10 @@ implementation
       globtype,widestr,systems,
       verbose,globals,cutils,
       aasmcnst,
-      symconst,symdef,aasmtai,aasmdata,aasmcpu,defutil,
+      symconst,symdef,aasmtai,aasmdata,defutil,
       cpuinfo,cpubase,
-      cgbase,cgobj,cgutils,
-      ncgutil,hlcgobj,cclasses,tgobj
+      cgbase,cgutils,
+      hlcgobj,cclasses
       ;
 
 

compiler/ncgflw.pas

@@ -28,7 +28,7 @@ interface
 
     uses
       globtype,
-      aasmbase,aasmdata,node,nflw,
+      aasmbase,aasmdata,nflw,
       pass_2,cgutils,ncgutil;
 
     type
@@ -125,11 +125,11 @@ implementation
 
     uses
       cutils,
-      verbose,globals,systems,constexp,
+      verbose,globals,systems,
       symconst,symdef,symsym,symtable,symtype,aasmtai,aasmcpu,defutil,
       procinfo,cgbase,parabase,
       fmodule,
-      cpubase,ncon,
+      cpubase,
       tgobj,paramgr,
       cgobj,hlcgobj,nutils
       ;

compiler/ncginl.pas

@@ -69,13 +69,13 @@ interface
 implementation
 
     uses
-      globtype,systems,constexp,
-      cutils,verbose,globals,
-      symconst,symtype,symdef,defutil,symsym,
-      aasmbase,aasmtai,aasmdata,aasmcpu,parabase,
-      cgbase,pass_1,pass_2,
-      cpuinfo,cpubase,paramgr,procinfo,
-      nbas,ncon,ncal,ncnv,nld,ncgrtti,
+      globtype,constexp,
+      verbose,globals,
+      symconst,symtype,symdef,defutil,
+      aasmbase,aasmdata,
+      cgbase,pass_2,
+      cpubase,procinfo,
+      ncon,ncal,
       tgobj,ncgutil,
       cgutils,cgobj,hlcgobj
 {$ifndef cpu64bitalu}

compiler/ncgld.pas

@@ -75,8 +75,8 @@ implementation
       aasmbase,
       cgbase,pass_2,
       procinfo,
-      cpubase,parabase,cpuinfo,
-      tgobj,ncgutil,
+      cpubase,parabase,
+      tgobj,
       cgobj,hlcgobj,
       ncgbas,ncgflw,
       wpobase;

compiler/ncgmat.pas

@@ -130,15 +130,11 @@ implementation
     uses
       globtype,systems,
       cutils,verbose,globals,
-      symtable,symconst,symdef,aasmbase,aasmtai,aasmdata,aasmcpu,defutil,
+      symtable,symconst,symdef,aasmbase,aasmdata,aasmcpu,defutil,
       parabase,
       pass_2,
       ncon,
-      tgobj,ncgutil,cgobj,cgutils,paramgr,hlcgobj,procinfo
-{$ifndef cpu64bitalu}
-      ,cg64f32
-{$endif not cpu64bitalu}
-      ;
+      tgobj,cgobj,cgutils,paramgr,hlcgobj;
 
 {*****************************************************************************
                           TCGUNARYMINUSNODE

compiler/ncgmem.pas

@@ -27,7 +27,7 @@ unit ncgmem;
 interface
 
     uses
-      globtype,cgbase,cgutils,cpuinfo,cpubase,
+      globtype,cgbase,cgutils,cpubase,
       symtype,
       node,nmem;
 
@@ -87,14 +87,12 @@ implementation
     uses
       systems,
       cutils,cclasses,verbose,globals,constexp,fmodule,
-      symconst,symbase,symdef,symsym,symcpu,symtable,defutil,paramgr,
-      aasmbase,aasmtai,aasmdata,
+      symconst,symbase,symdef,symsym,symtable,defutil,paramgr,
+      aasmbase,aasmdata,
       procinfo,pass_2,parabase,
-      pass_1,nld,ncon,nadd,ncnv,nutils,
+      ncon,nadd,nutils,
       cgobj,hlcgobj,
-      tgobj,ncgutil,objcgutl,
-      defcmp
-      ;
+      objcgutl;
 
 
 {*****************************************************************************

compiler/ncgobjc.pas

@@ -42,7 +42,7 @@ implementation
 
 uses
     globtype,cclasses,
-    aasmbase,aasmdata,aasmtai,
+    aasmbase,aasmdata,
     cgbase,cgutils,defutil,objcgutl,
     symconst,symsym,symdef,
     node,nld,ncon,

compiler/ncgopt.pas

@@ -38,12 +38,12 @@ implementation
 
 uses
   globtype,globals,
-  pass_1,defutil,htypechk,
-  symdef,paramgr,
-  aasmbase,aasmtai,aasmdata,
+  pass_1,defutil,
+  symdef,
+  aasmbase,aasmdata,
   ncnv, ncon, pass_2,
   cgbase, cpubase,
-  tgobj, cgobj, hlcgobj, cgutils,ncgutil;
+  tgobj, cgobj, hlcgobj, cgutils;
 
 
 {*****************************************************************************

compiler/ncgrtti.pas

@@ -89,8 +89,7 @@ implementation
        symtable,
        aasmtai,aasmdata,
        defutil,
-       paramgr,
-       wpobase
+       paramgr
        ;
 
 

compiler/ncgset.pas

@@ -89,12 +89,10 @@ interface
 implementation
 
     uses
-      systems,
       verbose,
       symconst,symdef,defutil,
-      paramgr,
-      procinfo,pass_2,tgobj,
-      nbas,ncon,nflw,
+      pass_2,tgobj,
+      ncon,
       ncgutil,hlcgobj;
 
 

compiler/ncgutil.pas

@@ -26,11 +26,11 @@ unit ncgutil;
 interface
 
     uses
-      node,cpuinfo,
+      node,
       globtype,
       cpubase,cgbase,parabase,cgutils,
       aasmbase,aasmtai,aasmdata,aasmcpu,
-      symconst,symbase,symdef,symsym,symtype,symtable
+      symconst,symbase,symdef,symsym,symtype
 {$ifndef cpu64bitalu}
       ,cg64f32
 {$endif not cpu64bitalu}
@@ -104,14 +104,12 @@ interface
 implementation
 
   uses
-    version,
     cutils,cclasses,
-    globals,systems,verbose,export,
-    ppu,defutil,
-    procinfo,paramgr,fmodule,
+    globals,systems,verbose,
+    defutil,
+    procinfo,paramgr,
     dbgbase,
-    pass_1,pass_2,
-    nbas,ncon,nld,nmem,nutils,ngenutil,
+    nbas,ncon,nld,nmem,nutils,
     tgobj,cgobj,hlcgobj,hlcgcpu
 {$ifdef llvm}
     { override create_hlcodegen from hlcgcpu }

compiler/ncgvmt.pas

@@ -110,16 +110,15 @@ implementation
       cutils,cclasses,
       globtype,globals,verbose,constexp,
       systems,fmodule,
-      symsym,symtable,symcreat,defutil,
+      symsym,symtable,symcreat,
 {$ifdef cpuhighleveltarget}
       pparautl,
 {$endif cpuhighleveltarget}
       aasmtai,
       wpobase,
-      nobj,
       cgbase,parabase,paramgr,
 {$ifndef cpuhighleveltarget}
-      cgobj,cgcpu,hlcgobj,hlcgcpu,
+      hlcgobj,hlcgcpu,
 {$endif not cpuhighleveltarget}
       ncgrtti;
 

compiler/ncon.pas

@@ -27,9 +27,8 @@ interface
 
     uses
       globtype,widestr,constexp,
-      cclasses,
       node,
-      aasmbase,aasmtai,aasmdata,cpuinfo,globals,
+      aasmbase,cpuinfo,globals,
       symconst,symtype,symdef,symsym;
 
     type
@@ -192,7 +191,7 @@ implementation
       cutils,
       verbose,systems,sysutils,
       defcmp,defutil,procinfo,
-      cpubase,cgbase,
+      cgbase,
       nld;
 
     function genintconstnode(const v : TConstExprInt) : tordconstnode;

compiler/nflw.pas

@@ -244,7 +244,7 @@ implementation
       globtype,systems,constexp,
       cutils,verbose,globals,
       symconst,symtable,paramgr,defcmp,defutil,htypechk,pass_1,
-      ncal,nadd,ncon,nmem,nld,ncnv,nbas,cgobj,nutils,ninl,nset,ngenutil,
+      ncal,nadd,ncon,nmem,nld,ncnv,nbas,nutils,ninl,nset,ngenutil,
       pdecsub,
     {$ifdef state_tracking}
       nstate,

compiler/ngenutil.pas

@@ -133,10 +133,10 @@ implementation
 
     uses
       verbose,version,globals,cutils,constexp,
-      scanner,systems,procinfo,fmodule,pparautl,
+      systems,procinfo,fmodule,pparautl,
       aasmbase,aasmtai,aasmcnst,
-      symbase,symtable,defutil,symcreat,
-      nadd,ncal,ncnv,ncon,nflw,ninl,nld,nmem,nobj,nutils,ncgutil,
+      symbase,symtable,defutil,
+      nadd,ncal,ncnv,ncon,nflw,ninl,nld,nmem,nutils,
       ppu,
       pass_1;
 

compiler/ngtcon.pas

@@ -147,14 +147,14 @@ uses
    systems,tokens,verbose,
    cutils,globals,widestr,scanner,
    symtable,
-   aasmcpu,defutil,defcmp,
+   defutil,defcmp,
    { pass 1 }
    htypechk,procinfo,
-   nmat,nadd,ncal,nmem,nset,ncnv,ninl,ncon,nld,nflw,
+   nmem,ncnv,ninl,ncon,nld,
    { parser specific stuff }
-   pbase,pexpr,pdecvar,
+   pbase,pexpr,
    { codegen }
-   cpuinfo,cgbase,dbgbase,
+   cpuinfo,cgbase,
    wpobase
    ;
 

compiler/ninl.pas

@@ -26,7 +26,7 @@ unit ninl;
 interface
 
     uses
-       node,htypechk,cpuinfo,symtype;
+       node,htypechk,symtype;
 
     {$i compinnr.inc}
 
@@ -124,11 +124,11 @@ implementation
       verbose,globals,systems,constexp,
       globtype,cutils,fmodule,
       symconst,symdef,symsym,symcpu,symtable,paramgr,defcmp,defutil,symbase,
+      cpuinfo,
       pass_1,
       ncal,ncon,ncnv,nadd,nld,nbas,nflw,nmem,nmat,nutils,
       nobjc,objcdef,
-      cgbase,procinfo
-      ;
+      cgbase,procinfo;
 
    function geninlinenode(number : byte;is_const:boolean;l : tnode) : tinlinenode;
 

compiler/nld.pas

@@ -179,9 +179,9 @@ implementation
       verbose,globtype,globals,systems,constexp,
       symtable,
       defutil,defcmp,
-      htypechk,pass_1,procinfo,paramgr,
       cpuinfo,
-      ncon,ninl,ncnv,nmem,ncal,nadd,nutils,
+      htypechk,pass_1,procinfo,paramgr,
+      ncon,ninl,ncnv,nmem,ncal,nutils,
       cgbase
       ;
 

compiler/nmat.pas

@@ -97,7 +97,7 @@ implementation
       systems,
       verbose,globals,cutils,
       globtype,constexp,
-      symconst,symtype,symdef,symtable,
+      symconst,symtype,symdef,
       defutil,
       htypechk,pass_1,
       cgbase,

compiler/nmem.pas

@@ -154,8 +154,8 @@ implementation
     uses
       globtype,systems,constexp,
       cutils,verbose,globals,
-      symconst,symbase,defutil,defcmp,
-      nadd,nbas,nflw,ninl,nutils,objcutil,
+      symconst,defutil,defcmp,
+      nadd,nbas,nflw,nutils,objcutil,
       wpobase,
 {$ifdef i8086}
       cpuinfo,

compiler/nobj.pas

@@ -57,14 +57,10 @@ interface
 implementation
 
     uses
-       SysUtils,
-       globals,verbose,systems,fmodule,
+       globals,verbose,systems,
        node,
-       symbase,symtable,symconst,symtype,defcmp,defutil,
-       symcpu,
-       dbgbase,
-       wpobase
-       ;
+       symbase,symtable,symconst,symtype,symcpu,
+       defcmp;
 
 
 {*****************************************************************************

compiler/nobjc.pas

@@ -57,14 +57,10 @@ var
 implementation
 
 uses
-  sysutils,
-  globtype,globals,cclasses,systems,
+  globtype,globals,
   verbose,pass_1,
-  defutil,
-  symtype,symtable,symdef,symconst,symsym,
-  paramgr,
-  nutils,
-  nbas,nld,ncnv,ncon,ncal,nmem,
+  symdef,symconst,
+  ncon,ncal,
   objcutil,
   cgbase;
 

compiler/nset.pas

@@ -28,7 +28,7 @@ interface
     uses
        cclasses,constexp,
        node,globtype,globals,
-       aasmbase,aasmtai,aasmdata,ncon,nflw,symtype;
+       aasmbase,ncon,nflw,symtype;
 
     type
        TLabelType = (ltOrdinal, ltConstString);
@@ -130,12 +130,10 @@ interface
 implementation
 
     uses
-      systems,
       verbose,
       symconst,symdef,symsym,symtable,defutil,defcmp,
       htypechk,pass_1,
-      nadd,nbas,ncnv,nld,cgobj,cgbase,
-      widestr;
+      nadd,nbas,ncnv,nld,cgbase;
 
 
 {*****************************************************************************

compiler/nutils.pas

@@ -156,7 +156,7 @@ implementation
     uses
       cutils,verbose,globals,
       symconst,symdef,
-      defutil,defcmp,htypechk,
+      defutil,
       nbas,ncon,ncnv,nld,nflw,nset,ncal,nadd,nmem,ninl,
       cpubase,cgbase,procinfo,
       pass_1;

compiler/objcdef.pas

@@ -28,7 +28,6 @@ unit objcdef;
 interface
 
     uses
-      node,
       symtype;
 
     { The internals of Objective-C's @encode() functionality: encode a
@@ -55,7 +54,7 @@ implementation
   uses
     globtype,
     cutils,cclasses,
-    verbose,systems,
+    verbose,
     symtable,symconst,symsym,symdef,
     defutil,paramgr;
 

compiler/objcutil.pas

@@ -53,13 +53,13 @@ implementation
 
     uses
       globtype,
-      cutils,cclasses,
+      cutils,
       pass_1,
       verbose,systems,
-      symtable,symconst,symsym,
+      symconst,symsym,
       objcdef,
       defutil,paramgr,
-      nbas,nmem,ncal,nld,ncon,ncnv,
+      nmem,ncal,nld,ncon,ncnv,
       export;
 
 

compiler/ogbase.pas

@@ -679,7 +679,7 @@ implementation
 
     uses
       SysUtils,
-      globals,verbose,fmodule,ogmap;
+      globals,verbose,ogmap;
 
     const
       SectionDataMaxGrow = 4096;

compiler/ogcoff.pas

@@ -31,7 +31,7 @@ interface
        { target }
        systems,
        { assembler }
-       cpuinfo,cpubase,aasmbase,assemble,link,
+       aasmbase,assemble,
        { output }
        ogbase,
        owbase;
@@ -300,7 +300,8 @@ implementation
 {$endif win32}
        SysUtils,
        cutils,verbose,globals,
-       fmodule,aasmtai,aasmdata,
+       cpubase,cpuinfo,
+       fmodule,
        ogmap,
        owar,
        version

compiler/ogelf.pas

@@ -31,7 +31,7 @@ interface
        { target }
        systems,
        { assembler }
-       cpuinfo,cpubase,aasmbase,aasmtai,aasmdata,assemble,
+       aasmbase,assemble,
        { ELF definitions }
        elfbase,
        { output }

compiler/ogmap.pas

@@ -27,9 +27,9 @@ interface
 
     uses
        { common }
-       cclasses,globtype,systems,
+       globtype,
        { object writer }
-       aasmbase,ogbase
+       ogbase
        ;
 
     type
@@ -57,9 +57,7 @@ interface
 implementation
 
     uses
-      cutils,cfileutl,
-      globals,verbose;
-
+      cutils,cfileutl;
 
     const
       HexTbl : array[0..15] of char='0123456789abcdef';

compiler/omfbase.pas

@@ -1115,10 +1115,9 @@ interface
 implementation
 
   uses
-    cutils,
-    globals,globtype,
-    verbose,
-    cpuinfo;
+    cutils,globtype,globals,
+    cpuinfo,
+    verbose;
 
   { TOmfOrderedNameCollection }
 

compiler/optconstprop.pas

@@ -55,7 +55,6 @@ unit optconstprop;
   implementation
 
     uses
-      fmodule,
       pass_1,procinfo,
       symsym, symconst,
       nutils, nbas, ncnv, nld, nflw, ncal, ninl;

compiler/optdead.pas

@@ -29,7 +29,6 @@ unit optdead;
     uses
       globtype,
       cclasses,
-      symtype,
       wpobase;
 
     type

compiler/optdeadstore.pas

@@ -36,10 +36,9 @@ unit optdeadstore;
 
     uses
       verbose,globtype,globals,
-      fmodule,
       procinfo,pass_1,
       nutils,
-      nbas,nld,nmem,nflw,nset,
+      nbas,nld,
       optbase,
       symsym,symconst;
 

compiler/optdfa.pas

@@ -53,14 +53,13 @@ unit optdfa;
   implementation
 
     uses
-      globtype,globals,
+      globtype,
       verbose,
-      cpuinfo,
       symconst,symdef,symsym,
       defutil,
       procinfo,
       nutils,htypechk,
-      nbas,nflw,ncon,ninl,ncal,nset,nld,nadd,
+      nbas,nflw,ncal,nset,nld,nadd,
       optbase;
 
 

compiler/optvirt.pas

@@ -170,9 +170,7 @@ unit optvirt;
       fmodule,
       symconst,
       symbase,
-      symtable,
       defcmp,
-      nobj,
       verbose;
 
     const

compiler/owomflib.pas

@@ -102,7 +102,6 @@ implementation
     uses
       SysUtils,
       cstreams,
-      globals,
       verbose,
       omfbase;
 

compiler/parabase.pas

@@ -26,8 +26,8 @@ unit parabase;
 
     uses
        cclasses,globtype,
-       aasmbase,cpubase,cgbase,cgutils,
-       symtype, ppu;
+       cgbase,cgutils,
+       symtype;
 
     type
        TCGParaReference = record

compiler/paramgr.pas

@@ -28,10 +28,10 @@ unit paramgr;
   interface
 
     uses
-       cclasses,globtype,
+       globtype,
        cpubase,cgbase,cgutils,
        parabase,
-       aasmtai,aasmdata,
+       aasmdata,
        symconst,symtype,symsym,symdef;
 
     type
@@ -175,8 +175,9 @@ implementation
 
     uses
        systems,
-       cgobj,hlcgobj,tgobj,
-       defutil,verbose;
+       cgobj,tgobj,
+       defutil,verbose,
+       hlcgobj;
 
     { true if the location in paraloc can be reused as localloc }
     function tparamanager.param_use_paraloc(const cgpara:tcgpara):boolean;

compiler/parser.pas

@@ -40,17 +40,16 @@ implementation
 {$ELSE}
       fksysutl,
 {$ENDIF}
-      cutils,cclasses,
-      globtype,version,tokens,systems,globals,verbose,switches,globstat,
-      symbase,symtable,symdef,symsym,
+      cclasses,
+      globtype,tokens,systems,globals,verbose,switches,globstat,
+      symbase,symtable,symdef,
       finput,fmodule,fppu,
-      aasmbase,aasmtai,aasmdata,
-      cgbase,
+      aasmdata,
       script,gendef,
       comphook,
       scanner,scandir,
-      pbase,ptype,psystem,pmodules,psub,ncgrtti,htypechk,
-      cresstr,cpuinfo,procinfo;
+      pbase,psystem,pmodules,psub,ncgrtti,
+      cpuinfo,procinfo;
 
 
     procedure initparser;

compiler/pass_1.pas

@@ -42,12 +42,13 @@ interface
 implementation
 
     uses
-      globtype,comphook,systems,cclasses,
-      cutils,globals,
+      globtype,comphook,
+      globals,
       procinfo,
-      cgbase,symdef
+      symdef
 {$ifdef extdebug}
       ,verbose,htypechk
+      ,cgbase
 {$endif extdebug}
 {$ifdef state_tracking}
       ,nstate

compiler/pass_2.pas

@@ -61,12 +61,14 @@ implementation
 {$ifdef EXTDEBUG}
      cutils,
 {$endif}
-     globtype,systems,verbose,
+     globtype,verbose,
      globals,
-     paramgr,
-     aasmtai,aasmdata,
-     cgbase,
-     nflw,cgobj;
+     aasmdata
+{$ifdef EXTDEBUG}
+     ,cgbase
+     ,aasmtai
+{$endif}
+     ;
 
 {*****************************************************************************
                               SecondPass

compiler/pbase.pas

@@ -102,7 +102,7 @@ interface
 implementation
 
     uses
-       globals,htypechk,scanner,systems,verbose,fmodule;
+       globals,scanner,verbose,fmodule;
 
 {****************************************************************************
                                Token Parsing

compiler/pdecl.pas

@@ -56,9 +56,9 @@ implementation
        globals,tokens,verbose,widestr,constexp,
        systems,aasmdata,fmodule,
        { symtable }
-       symconst,symbase,symtype,symcpu,symtable,symcreat,defutil,
+       symconst,symbase,symtype,symcpu,symcreat,defutil,
        { pass 1 }
-       htypechk,ninl,ncon,nobj,ngenutil,
+       ninl,ncon,nobj,ngenutil,
        { parser }
        scanner,
        pbase,pexpr,ptype,ptconst,pdecsub,pdecvar,pdecobj,pgenutil,

compiler/pdecobj.pas

@@ -47,14 +47,14 @@ implementation
       sysutils,cutils,
       globals,verbose,systems,tokens,
       symbase,symsym,symtable,symcreat,defcmp,
-      node,nld,nmem,ncon,ncnv,ncal,
+      node,ncon,
       fmodule,scanner,
-      pbase,pexpr,pdecsub,pdecvar,ptype,pdecl,pgenutil,ppu,
+      pbase,pexpr,pdecsub,pdecvar,ptype,pdecl,pgenutil,ppu
 {$ifdef jvm}
-      pjvm,
-{$endif}
-      parabase
+      ,pjvm;
+{$else}
       ;
+{$endif}
 
     const
       { Please leave this here, this module should NOT use

compiler/pdecsub.pas

@@ -111,7 +111,7 @@ implementation
        { parameter handling }
        paramgr,cpupara,
        { pass 1 }
-       fmodule,node,htypechk,ncon,ppu,nld,
+       fmodule,node,htypechk,ncon,nld,
        objcutil,
        { parser }
        scanner,

compiler/pdecvar.pas

@@ -61,15 +61,12 @@ implementation
        fmodule,htypechk,
        { pass 1 }
        node,pass_1,aasmbase,aasmdata,
-       ncon,nmat,nadd,ncal,nset,ncnv,ninl,nld,nflw,nmem,nutils,
+       ncon,nset,ncnv,nld,nutils,
        { codegen }
-       ncgutil,ngenutil,
+       ngenutil,
        { parser }
        scanner,
-       pbase,pexpr,ptype,ptconst,pdecsub,
-       { link }
-       import
-       ;
+       pbase,pexpr,ptype,ptconst,pdecsub;
 
 
     function read_property_dec(is_classproperty:boolean;astruct:tabstractrecorddef):tpropertysym;

compiler/pexpr.pas

@@ -75,7 +75,7 @@ implementation
        { module }
        fmodule,ppu,
        { pass 1 }
-       pass_1,htypechk,
+       pass_1,
        nmat,nadd,nmem,nset,ncnv,ninl,ncon,nld,nflw,nbas,nutils,
        { parser }
        scanner,

compiler/pgenutil.pas

@@ -69,9 +69,7 @@ uses
   symconst,symsym,symtable,defcmp,procinfo,
   { modules }
   fmodule,
-  { pass 1 }
-  htypechk,
-  node,nobj,nmem,
+  node,nobj,
   { parser }
   scanner,
   pbase,pexpr,pdecsub,ptype,psub;

compiler/pinline.pas

@@ -28,8 +28,7 @@ interface
     uses
       symtype,
       node,
-      globals,
-      cpuinfo;
+      globals;
 
     function new_dispose_statement(is_new:boolean) : tnode;
     function new_function : tnode;
@@ -46,8 +45,6 @@ interface
 implementation
 
     uses
-       { common }
-       cutils,
        { global }
        globtype,tokens,verbose,constexp,
        systems,
@@ -55,13 +52,10 @@ implementation
        symbase,symconst,symdef,symsym,symtable,defutil,
        { pass 1 }
        pass_1,htypechk,
-       nmat,nadd,ncal,nmem,nset,ncnv,ninl,ncon,nld,nflw,nbas,nutils,ngenutil,
+       ncal,nmem,ncnv,ninl,ncon,nld,nbas,ngenutil,
        { parser }
        scanner,
-       pbase,pexpr,
-       { codegen }
-       cgbase
-       ;
+       pbase,pexpr;
 
 
     function new_dispose_statement(is_new:boolean) : tnode;

compiler/pkgutil.pas

@@ -48,7 +48,6 @@ implementation
     aasmbase,aasmdata,aasmcnst,
     symtype,symconst,symsym,symdef,symbase,symtable,
     psub,pdecsub,
-    ncgutil,
     ppu,entfile,fpcp,
     export;
 

compiler/pmodules.pas

@@ -33,17 +33,16 @@ implementation
 
     uses
        SysUtils,
-       globtype,version,systems,tokens,
+       globtype,systems,tokens,
        cutils,cfileutl,cclasses,comphook,
        globals,verbose,fmodule,finput,fppu,globstat,fpcp,fpkg,
        symconst,symbase,symtype,symdef,symsym,symtable,symcreat,
        wpoinfo,
-       aasmtai,aasmdata,aasmcpu,aasmbase,
-       cgbase,cgobj,ngenutil,
+       aasmtai,aasmdata,aasmbase,aasmcpu,
+       cgbase,ngenutil,
        nbas,nutils,ncgutil,
-       link,assemble,import,export,gendef,entfile,ppu,comprsrc,dbgbase,
+       link,assemble,import,export,gendef,ppu,comprsrc,dbgbase,
        cresstr,procinfo,
-       pexports,
        objcgutl,
        pkgutil,
        wpobase,

compiler/ppu.pas

@@ -26,7 +26,7 @@ unit ppu;
 interface
 
   uses
-    systems,globtype,constexp,cstreams,entfile;
+    constexp,entfile;
 
 { Also write the ppu if only crc if done, this can be used with ppudump to
   see the differences between the intf and implementation }
@@ -150,8 +150,7 @@ implementation
 {$ifdef Test_Double_checksum}
     comphook,
 {$endif def Test_Double_checksum}
-    fpccrc,
-    cutils;
+    fpccrc;
 
 function swapendian_ppureal(d:ppureal):ppureal;
 

compiler/procinfo.pas

@@ -29,14 +29,12 @@ unit procinfo;
       { common }
       cclasses,
       { global }
-      globtype,globals,verbose,
+      globtype,
       { symtable }
-      symconst,symtype,symdef,symsym,
+      symconst,symdef,symsym,
       { aasm }
-      cpubase,cpuinfo,cgbase,cgutils,
-      aasmbase,aasmtai,aasmdata,
-      optutils
-      ;
+      cpubase,cgbase,cgutils,
+      aasmbase,aasmdata;
 
     const
       inherited_inlining_flags : tprocinfoflags =

compiler/pstatmnt.pas

@@ -44,23 +44,20 @@ implementation
        globtype,globals,verbose,constexp,
        systems,
        { aasm }
-       cpubase,aasmbase,aasmtai,aasmdata,
+       cpubase,aasmtai,aasmdata,
        { symtable }
        symconst,symbase,symtype,symdef,symsym,symtable,defutil,defcmp,
-       paramgr,symutil,
+       paramgr,
        { pass 1 }
        pass_1,htypechk,
-       nutils,ngenutil,nbas,nmat,nadd,ncal,nmem,nset,ncnv,ninl,ncon,nld,nflw,
+       nutils,ngenutil,nbas,ncal,nmem,nset,ncnv,ncon,nld,nflw,
        { parser }
        scanner,
        pbase,ptype,pexpr,
        { codegen }
        procinfo,cgbase,
        { assembler reader }
-       rabase,
-       { wide- and unicodestrings}
-       widestr
-       ;
+       rabase;
 
 
     function statement : tnode;forward;

compiler/psub.pas

@@ -86,7 +86,7 @@ interface
     procedure read_proc(isclassmethod:boolean; usefwpd: tprocdef;isgeneric:boolean);
 
     { parses only the body of a non nested routine; needs a correctly setup pd }
-    procedure read_proc_body(pd:tprocdef);inline;
+    procedure read_proc_body(pd:tprocdef);
 
     procedure import_external_proc(pd:tprocdef);
 
@@ -103,7 +103,7 @@ implementation
        { symtable }
        symconst,symbase,symsym,symtype,symtable,defutil,defcmp,symcreat,
        paramgr,
-       ppu,fmodule,
+       fmodule,
        { pass 1 }
        nutils,ngenutil,nld,ncal,ncon,nflw,nadd,ncnv,nmem,
        pass_1,
@@ -116,9 +116,9 @@ implementation
 {$endif}
        { parser }
        scanner,gendef,
-       pbase,pstatmnt,pdecl,pdecsub,pexports,pgenutil,pparautl,pgentype,
+       pbase,pstatmnt,pdecl,pdecsub,pexports,pgenutil,pparautl,
        { codegen }
-       tgobj,cgbase,cgobj,cgutils,hlcgobj,hlcgcpu,dbgbase,
+       tgobj,cgbase,cgobj,hlcgobj,hlcgcpu,dbgbase,
 {$ifdef llvm}
       { override create_hlcodegen from hlcgcpu }
       hlcgllvm,
@@ -2003,7 +2003,6 @@ implementation
       end;
 
 
-
     procedure read_proc_body(old_current_procinfo:tprocinfo;pd:tprocdef);
       {
         Parses the procedure directives, then parses the procedure body, then

compiler/psystem.pas

@@ -43,10 +43,9 @@ implementation
       globals,globtype,verbose,constexp,cpuinfo,
       systems,
       symconst,symtype,symsym,symdef,symcpu,symtable,
-      aasmtai,aasmdata,aasmcpu,
-      ncgutil,ncgrtti,fmodule,
-      node,nbas,nflw,nset,ncon,ncnv,nld,nmem,ncal,nmat,nadd,ninl,nopt
-      ;
+      aasmtai,aasmcpu,
+      fmodule,
+      node,nbas,nflw,nset,ncon,ncnv,nld,nmem,ncal,nmat,nadd,ninl;
 
 
     procedure create_intern_symbols;

compiler/ptconst.pas

@@ -35,9 +35,9 @@ implementation
     uses
        globtype,systems,globals,verbose,cutils,tokens,
        aasmbase,aasmtai,
-       procinfo,fmodule,
+       fmodule,
        scanner,pbase,pdecvar,
-       node,nbas,ngtcon,ngenutil,
+       node,ngtcon,
        symconst,symbase,symdef
        ;
 

compiler/ptype.pas

@@ -69,11 +69,9 @@ implementation
        { global }
        globals,tokens,verbose,constexp,
        systems,
-       { target }
-       paramgr,procinfo,
        { symtable }
        symconst,symsym,symtable,symcreat,
-       defutil,defcmp,objcdef,
+       defutil,defcmp,
 {$ifdef jvm}
        jvmdef,
 {$endif}
@@ -81,7 +79,7 @@ implementation
        fmodule,
        { pass 1 }
        node,
-       nmat,nadd,ncal,nset,ncnv,ninl,ncon,nld,nflw,
+       nset,ncnv,ncon,nld,
        { parser }
        scanner,
        pbase,pexpr,pdecsub,pdecvar,pdecobj,pdecl,pgenutil

compiler/rasm.pas

@@ -29,8 +29,7 @@ unit rasm;
       cclasses,
       rabase,
       aasmbase,
-      aasmtai,aasmdata,
-      systems,
+      aasmdata,
       cpubase,
       cgbase;
 

compiler/rgobj.pas

@@ -36,10 +36,8 @@ unit rgobj;
 
     uses
       cutils, cpubase,
-      aasmbase,aasmtai,aasmdata,aasmsym,aasmcpu,
-      cclasses,globtype,cgbase,cgutils,
-      cpuinfo
-      ;
+      aasmtai,aasmdata,aasmsym,aasmcpu,
+      cclasses,globtype,cgbase,cgutils;
 
     type
       {
@@ -292,7 +290,7 @@ unit rgobj;
   implementation
 
     uses
-       systems,fmodule,globals,
+       globals,
        verbose,tgobj,procinfo;
 
 

compiler/symcreat.pas

@@ -140,7 +140,7 @@ implementation
 {$ifdef jvm}
     pjvm,jvmdef,
 {$endif jvm}
-    nbas,nld,nmem,ngenutil,ncon,
+    nbas,nld,nmem,ncon,
     defcmp,
     paramgr;
 

compiler/symdef.pas

@@ -31,13 +31,11 @@ interface
        globtype,globals,tokens,constexp,
        { symtable }
        symconst,symbase,symtype,
-       { ppu }
-       ppu,
        { node }
        node,
        { aasm }
-       aasmbase,aasmtai,
-       cpubase,cpuinfo,
+       aasmtai,
+       cpuinfo,
        cgbase,
        parabase
        ;

compiler/symsym.pas

@@ -31,12 +31,10 @@ interface
        globtype,globals,widestr,constexp,
        { symtable }
        symconst,symbase,symtype,symdef,defcmp,
-       { ppu }
-       ppu,finput,
        cclasses,
        { aasm }
        aasmbase,
-       cpuinfo,cpubase,cgbase,cgutils,parabase
+       cpuinfo,cgbase,cgutils,parabase
        ;
 
     type
@@ -495,7 +493,7 @@ implementation
        { tree }
        node,
        { aasm }
-       aasmtai,aasmdata,
+       aasmdata,
        { codegen }
        paramgr,
        procinfo,

compiler/symtype.pas

@@ -33,7 +33,7 @@ interface
       { symtable }
       symconst,symbase,
       { aasm }
-      aasmbase,ppu,cpuinfo
+      aasmbase,ppu
       ;
 
     type

compiler/symutil.pas

@@ -26,7 +26,7 @@ unit symutil;
 interface
 
     uses
-       symbase,symtype,symsym;
+       symbase,symsym;
 
     function is_funcret_sym(p:TSymEntry):boolean;
 
@@ -36,8 +36,7 @@ interface
 implementation
 
     uses
-       cclasses,
-       globtype,cpuinfo,procinfo,constexp,
+       globtype,cpuinfo,constexp,
        symconst,widestr;
 
 

compiler/syscinfo.pas

@@ -26,7 +26,7 @@ unit syscinfo;
 interface
 
 uses
-  globtype, systems, tokens, symconst;
+  systems, tokens, symconst;
 
 type
   tsyscallinfo = record

compiler/systems/i_bsd.pas

@@ -30,7 +30,7 @@ unit i_bsd;
   interface
 
     uses
-       systems, rescmn;
+       systems;
 
     const
        res_macho_info : tresinfo =

compiler/systems/i_linux.pas

@@ -26,7 +26,7 @@ unit i_linux;
   interface
 
     uses
-       systems, rescmn;
+       systems;
 
     const
        system_i386_linux_info : tsysteminfo =

compiler/systems/t_aros.pas

@@ -27,7 +27,7 @@ unit t_aros;
 interface
 
     uses
-      rescmn, comprsrc, import, export,  link, ogbase;
+      rescmn, comprsrc, import, link, ogbase;
 
 
 type

compiler/systems/t_linux.pas

@@ -28,7 +28,7 @@ interface
 
   uses
     aasmdata,
-    symsym,symdef,ppu,
+    symsym,
     import,export,expunix,link;
 
   type
@@ -77,10 +77,10 @@ implementation
     SysUtils,
     cutils,cfileutl,cclasses,
     verbose,systems,globtype,globals,
-    symconst,script,
+    script,
     fmodule,
     aasmbase,aasmtai,aasmcpu,cpubase,
-    cgbase,cgobj,cgutils,ogbase,ncgutil,
+    cgbase,ogbase,
     comprsrc,
     ogelf,owar,
     rescmn, i_linux

compiler/systems/t_sunos.pas

@@ -37,9 +37,8 @@ implementation
     sysutils,
     cutils,cfileutl,cclasses,
     verbose,systems,globtype,globals,
-    symconst,script,
-    fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef,
-    cgobj,
+    script,
+    fmodule,
     import,export,expunix,link,comprsrc,rescmn,i_sunos,ogbase;
 
   type

compiler/systems/t_win.pas

@@ -31,7 +31,7 @@ interface
        symconst,symdef,symsym,
        script,gendef,
        cpubase,
-       import,export,link,comprsrc,cgobj,i_win;
+       import,export,link,comprsrc,i_win;
 
 
     const
@@ -96,7 +96,7 @@ implementation
   uses
     SysUtils,
     cfileutl,
-    cpuinfo,cgutils,dbgbase,
+    cgutils,dbgbase,
     owar,ogbase
 {$ifdef SUPPORT_OMF}
     ,ogomf