fname-sf.adb, [...]: Remove redundant use_clauses.

2005-09-01  Ed Schonberg  <schonberg@adacore.com>
	    Thomas Quinot  <quinot@adacore.com>

	* fname-sf.adb, mlib-tgt.ads,
	back_end.adb, casing.adb, g-debpoo.adb, g-excact.adb, g-spipat.adb,
	g-spipat.ads, g-thread.adb, lib-list.adb, makeutl.adb, mlib.adb,
	osint.adb, par-ch10.adb, par-load.adb, prep.adb, prj.adb, prj-attr.ads,
	prj-env.ads, prj-err.adb, prj-err.ads, prj-ext.adb, prj-ext.ads,
	prj-makr.adb, prj-makr.ads, prj-pars.ads, prj-part.adb, prj-strt.adb,
	prj-tree.ads, prj-util.ads, sem_dist.adb, sinput-c.ads, sinput-l.ads,
	sinput-p.ads, styleg-c.ads, xr_tabls.adb, prj-attr-pm.ads,
	makegpr.adb: Remove redundant use_clauses.

From-SVN: r103854

38 files changed, 60 insertions, 134 deletions

diff --git a/gcc/ada/back_end.adb b/gcc/ada/back_end.adb
index 9c3f488..d6fd7cb 100644
--- a/gcc/ada/back_end.adb
+++ b/gcc/ada/back_end.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2004 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2005 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -30,7 +30,6 @@ with Elists;    use Elists;
 with Lib;       use Lib;
 with Osint;     use Osint;
 with Opt;       use Opt;
-with Osint;     use Osint;
 with Osint.C;   use Osint.C;
 with Namet;     use Namet;
 with Nlists;    use Nlists;
diff --git a/gcc/ada/casing.adb b/gcc/ada/casing.adb
index ff20219..30db545 100644
--- a/gcc/ada/casing.adb
+++ b/gcc/ada/casing.adb
@@ -34,7 +34,6 @@
 with Csets;    use Csets;
 with Namet;    use Namet;
 with Opt;      use Opt;
-with Types;    use Types;
 with Widechar; use Widechar;
 
 package body Casing is
diff --git a/gcc/ada/fname-sf.adb b/gcc/ada/fname-sf.adb
index eb24548..5572037 100644
--- a/gcc/ada/fname-sf.adb
+++ b/gcc/ada/fname-sf.adb
@@ -30,7 +30,6 @@ with Fname.UF; use Fname.UF;
 with SFN_Scan; use SFN_Scan;
 with Namet;    use Namet;
 with Osint;    use Osint;
-with Types;    use Types;
 
 with Unchecked_Conversion;
 
diff --git a/gcc/ada/g-debpoo.adb b/gcc/ada/g-debpoo.adb
index d5da42a0..eeb36a2 100644
--- a/gcc/ada/g-debpoo.adb
+++ b/gcc/ada/g-debpoo.adb
@@ -46,8 +46,6 @@ with GNAT.Traceback; use GNAT.Traceback;
 with Ada.Unchecked_Conversion;
 
 package body GNAT.Debug_Pools is
-   use System;
-   use System.Storage_Elements;
 
    Default_Alignment : constant Storage_Offset := Standard'Maximum_Alignment;
    --  Alignment used for the memory chunks returned by Allocate. Using this
@@ -1289,7 +1287,6 @@ package body GNAT.Debug_Pools is
       Display_Slots : Boolean := False;
       Display_Leaks : Boolean := False)
    is
-      use System.Storage_Elements;
 
       package Backtrace_Htable_Cumulate is new GNAT.HTable.Static_HTable
         (Header_Num => Header,
diff --git a/gcc/ada/g-excact.adb b/gcc/ada/g-excact.adb
index 8521cbe..c27ab08 100644
--- a/gcc/ada/g-excact.adb
+++ b/gcc/ada/g-excact.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 2002-2003 Free Software Foundation, Inc.          --
+--          Copyright (C) 2002-2005 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -31,7 +31,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Ada.Exceptions;       use Ada.Exceptions;
 with Ada.Unchecked_Conversion;
 with System;
 with System.Soft_Links;       use System.Soft_Links;
diff --git a/gcc/ada/g-spipat.adb b/gcc/ada/g-spipat.adb
index f362104..4343473 100644
--- a/gcc/ada/g-spipat.adb
+++ b/gcc/ada/g-spipat.adb
@@ -37,7 +37,6 @@
 --  we use the one stack approach developed in the SPITBOL implementation.
 
 with Ada.Exceptions;            use Ada.Exceptions;
-with Ada.Strings.Maps;          use Ada.Strings.Maps;
 with Ada.Strings.Unbounded.Aux; use Ada.Strings.Unbounded.Aux;
 
 with GNAT.Debug_Utilities;      use GNAT.Debug_Utilities;
@@ -218,7 +217,7 @@ package body GNAT.Spitbol.Patterns is
    type PE (Pcode : Pattern_Code) is record
 
       Index : IndexT;
-      --  Serial index number of pattern element within pattern.
+      --  Serial index number of pattern element within pattern
 
       Pthen : PE_Ptr;
       --  Successor element, to be matched after this one
@@ -734,7 +733,7 @@ package body GNAT.Spitbol.Patterns is
       --  pointer to Y node, which is the PC_Arb_Y node that matches one
       --  extra character and restacks itself.
 
-      --  The PC_Arb_X node is numbered 2, and the PC_Arb_Y node is 1.
+      --  The PC_Arb_X node is numbered 2, and the PC_Arb_Y node is 1
 
       -------------------------
       -- Arbno (simple case) --
@@ -1239,7 +1238,7 @@ package body GNAT.Spitbol.Patterns is
 
    function Is_In (C : Character; Str : String) return Boolean;
    pragma Inline (Is_In);
-   --  Determines if the character C is in string Str.
+   --  Determines if the character C is in string Str
 
    procedure Logic_Error;
    --  Called to raise Program_Error with an appropriate message if an
@@ -1670,7 +1669,7 @@ package body GNAT.Spitbol.Patterns is
    --    | Y |---->
    --    +---+
 
-   --  The PC_Arb_X element is numbered 2, and the PC_Arb_Y element is 1.
+   --  The PC_Arb_X element is numbered 2, and the PC_Arb_Y element is 1
 
    function Arb return Pattern is
       Y : constant PE_Ptr := new PE'(PC_Arb_Y, 1, EOP);
@@ -2028,7 +2027,7 @@ package body GNAT.Spitbol.Patterns is
             --  References to elements in P, indexed by Index field
 
             Copy : Ref_Array (1 .. P.Index);
-            --  Holds copies of elements of P, indexed by Index field.
+            --  Holds copies of elements of P, indexed by Index field
 
             E : PE_Ptr;
 
@@ -2090,7 +2089,7 @@ package body GNAT.Spitbol.Patterns is
       E : PE_Ptr;
 
       procedure Write_Node_Id (E : PE_Ptr);
-      --  Writes out a string identifying the given pattern element.
+      --  Writes out a string identifying the given pattern element
 
       procedure Write_Node_Id (E : PE_Ptr) is
       begin
@@ -2428,7 +2427,7 @@ package body GNAT.Spitbol.Patterns is
             when PC_Alt => Alt : declare
 
                Elmts_In_L : constant IndexT := E.Pthen.Index - E.Alt.Index;
-               --  Number of elements in left pattern of alternation.
+               --  Number of elements in left pattern of alternation
 
                Lowest_In_L : constant IndexT := E.Index - Elmts_In_L;
                --  Number of lowest index in elements of left pattern
@@ -3679,7 +3678,7 @@ package body GNAT.Spitbol.Patterns is
       --  failure and popping a "real" cursor value from the stack.
 
       PE_Unanchored : aliased PE := (PC_Unanchored, 0, Pat_P);
-      --  Dummy pattern element used in the unanchored case.
+      --  Dummy pattern element used in the unanchored case
 
       Stack : Stack_Type;
       --  The pattern matching failure stack for this call to Match
@@ -4061,7 +4060,7 @@ package body GNAT.Spitbol.Patterns is
          when PC_Assign =>
             goto Fail;
 
-         --  Assign immediate. This node performs the actual assignment.
+         --  Assign immediate. This node performs the actual assignment
 
          when PC_Assign_Imm =>
             Set_String
@@ -4976,7 +4975,7 @@ package body GNAT.Spitbol.Patterns is
       --  failure and popping a "real" cursor value from the stack.
 
       PE_Unanchored : aliased PE := (PC_Unanchored, 0, Pat_P);
-      --  Dummy pattern element used in the unanchored case.
+      --  Dummy pattern element used in the unanchored case
 
       Region_Level : Natural := 0;
       --  Keeps track of recursive region level. This is used only for
@@ -5006,7 +5005,7 @@ package body GNAT.Spitbol.Patterns is
       --  successful match.
 
       procedure Dout (Str : String);
-      --  Output string to standard error with bars indicating region level.
+      --  Output string to standard error with bars indicating region level
 
       procedure Dout (Str : String; A : Character);
       --  Calls Dout with the string S ('A')
@@ -5477,7 +5476,7 @@ package body GNAT.Spitbol.Patterns is
             Dout (Img (Node) & "deferred assign/write cancelled");
             goto Fail;
 
-         --  Assign immediate. This node performs the actual assignment.
+         --  Assign immediate. This node performs the actual assignment
 
          when PC_Assign_Imm =>
             Dout
diff --git a/gcc/ada/g-spipat.ads b/gcc/ada/g-spipat.ads
index e2a399a..4f66b0d 100644
--- a/gcc/ada/g-spipat.ads
+++ b/gcc/ada/g-spipat.ads
@@ -65,12 +65,11 @@
 --       language is modeled on context free grammars, with context sensitive
 --       extensions that provide full (type 0) computational capabilities.
 
-with Ada.Finalization; use Ada.Finalization;
 with Ada.Strings.Maps; use Ada.Strings.Maps;
 with Ada.Text_IO;      use Ada.Text_IO;
 
 package GNAT.Spitbol.Patterns is
-pragma Elaborate_Body (Patterns);
+   pragma Elaborate_Body;
 
    -------------------------------
    -- Pattern Matching Tutorial --
@@ -631,7 +630,7 @@ pragma Elaborate_Body (Patterns);
    --          Abort        Cancel
    --          Rem          Rest
 
-   --    where we have clashes with Ada reserved names.
+   --    where we have clashes with Ada reserved names
 
    --    Ada requires the use of 'Access to refer to functions used in the
    --    pattern match, and often the use of 'Unrestricted_Access may be
@@ -704,7 +703,7 @@ pragma Elaborate_Body (Patterns);
    function "&"  (L : PChar;   R : Pattern) return Pattern;
    function "&"  (L : Pattern; R : PChar)   return Pattern;
 
-   --  Pattern concatenation. Matches L followed by R.
+   --  Pattern concatenation. Matches L followed by R
 
    function "or" (L : Pattern; R : Pattern) return Pattern;
    function "or" (L : PString; R : Pattern) return Pattern;
@@ -820,7 +819,7 @@ pragma Elaborate_Body (Patterns);
    --  Constructs a pattern that immediately aborts the entire match
 
    function Fail                                            return Pattern;
-   --  Constructs a pattern that always fails.
+   --  Constructs a pattern that always fails
 
    function Fence                                           return Pattern;
    --  Constructs a pattern that matches null on the first attempt, and then
@@ -1095,12 +1094,11 @@ pragma Elaborate_Body (Patterns);
    --  except that instead of setting the value of a variable, the matched
    --  substring is written to the appropriate file. This can be useful in
    --  following the progress of a match without generating the full amount
-
    --  of information obtained by setting Debug_Mode to True.
 
    Terminal : constant File_Access := Standard_Error;
    Output   : constant File_Access := Standard_Output;
-   --  Two handy synonyms for use with the above pattern write operations.
+   --  Two handy synonyms for use with the above pattern write operations
 
    --  Finally we have some routines that are useful for determining what
    --  patterns are in use, particularly if they are constructed dynamically.
@@ -1149,7 +1147,7 @@ private
       --  Maximum number of stack entries required for matching this
       --  pattern. See description of pattern history stack in body.
 
-      P   : PE_Ptr := null;
+      P : PE_Ptr := null;
       --  Pointer to initial pattern element for pattern
    end record;
 
@@ -1159,19 +1157,19 @@ private
    --  Adjust routine used to copy pattern objects
 
    procedure Finalize (Object : in out Pattern);
-   --  Finalization routine used to release storage allocated for a pattern.
+   --  Finalization routine used to release storage allocated for a pattern
 
    type VString_Ptr is access all VString;
 
    type Match_Result is record
-      Var   : VString_Ptr;
-      --  Pointer to subject string. Set to null if match failed.
+      Var : VString_Ptr;
+      --  Pointer to subject string. Set to null if match failed
 
       Start : Natural := 1;
       --  Starting index position (1's origin) of matched section of
       --  subject string. Only valid if Var is non-null.
 
-      Stop  : Natural := 0;
+      Stop : Natural := 0;
       --  Ending index position (1's origin) of matched section of
       --  subject string. Only valid if Var is non-null.
 
diff --git a/gcc/ada/g-thread.adb b/gcc/ada/g-thread.adb
index 4443524..b49ed23 100644
--- a/gcc/ada/g-thread.adb
+++ b/gcc/ada/g-thread.adb
@@ -163,7 +163,6 @@ package body GNAT.Threads is
    ----------------
 
    procedure Get_Thread (Id : Address; Thread : Address) is
-      use System.OS_Interface;
       Thr : constant Thread_Id_Ptr := To_Thread (Thread);
    begin
       Thr.all := Task_Primitives.Operations.Get_Thread_Id (To_Id (Id));
diff --git a/gcc/ada/lib-list.adb b/gcc/ada/lib-list.adb
index a4ddfd6..79029e3 100644
--- a/gcc/ada/lib-list.adb
+++ b/gcc/ada/lib-list.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2002 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2005 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -31,8 +31,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Output; use Output;
-
 separate (Lib)
 procedure List (File_Names_Only : Boolean := False) is
 
diff --git a/gcc/ada/makegpr.adb b/gcc/ada/makegpr.adb
index 20df5d4..951e778 100644
--- a/gcc/ada/makegpr.adb
+++ b/gcc/ada/makegpr.adb
@@ -1688,7 +1688,6 @@ package body Makegpr is
 
          declare
             Archive : Ada.Text_IO.File_Type;
-            use Ada.Text_IO;
          begin
             Create (Archive, Out_File, Archive_Name);
             Close (Archive);
@@ -2754,7 +2753,6 @@ package body Makegpr is
       Source_Id : Other_Source_Id := First_Source;
       Source    : Other_Source;
       Dep_File  : Ada.Text_IO.File_Type;
-      use Ada.Text_IO;
 
    begin
       --  Create the file in Append mode, to avoid automatic insertion of
@@ -2787,8 +2785,6 @@ package body Makegpr is
       Source    : Other_Source;
       Dep_File  : Ada.Text_IO.File_Type;
 
-      use Ada.Text_IO;
-
    begin
       --  Create the file in Append mode, to avoid automatic insertion of
       --  an end of line if file is empty.
diff --git a/gcc/ada/makeutl.adb b/gcc/ada/makeutl.adb
index eb3138d..d65dfea 100644
--- a/gcc/ada/makeutl.adb
+++ b/gcc/ada/makeutl.adb
@@ -26,12 +26,10 @@
 
 with Namet;    use Namet;
 with Osint;    use Osint;
-with Prj;      use Prj;
 with Prj.Ext;
 with Prj.Util;
 with Snames;   use Snames;
 with Table;
-with Types;    use Types;
 
 with System.HTable;
 
diff --git a/gcc/ada/mlib-tgt.ads b/gcc/ada/mlib-tgt.ads
index 4e8cd24..4ae46ce 100644
--- a/gcc/ada/mlib-tgt.ads
+++ b/gcc/ada/mlib-tgt.ads
@@ -32,7 +32,6 @@
 --  In the default version, libraries are not supported, so function
 --  Support_For_Libraries return None.
 
-with GNAT.OS_Lib; use GNAT.OS_Lib;
 with Prj;         use Prj;
 
 package MLib.Tgt is
diff --git a/gcc/ada/mlib.adb b/gcc/ada/mlib.adb
index 1bdfa03..338a304 100644
--- a/gcc/ada/mlib.adb
+++ b/gcc/ada/mlib.adb
@@ -35,7 +35,6 @@ with Namet;  use Namet;
 with MLib.Utl; use MLib.Utl;
 
 with GNAT.Directory_Operations; use GNAT.Directory_Operations;
-with GNAT.OS_Lib;               use GNAT.OS_Lib;
 
 package body MLib is
 
@@ -51,8 +50,6 @@ package body MLib is
    is
       pragma Warnings (Off, Afiles);
 
-      use GNAT.OS_Lib;
-
    begin
       if not Opt.Quiet_Output then
          Write_Line ("building a library...");
diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb
index 28526d1..8a9e81a 100644
--- a/gcc/ada/osint.adb
+++ b/gcc/ada/osint.adb
@@ -37,7 +37,6 @@ with System.Case_Util; use System.Case_Util;
 
 with Unchecked_Conversion;
 
-with GNAT.OS_Lib; use GNAT.OS_Lib;
 with GNAT.HTable;
 
 package body Osint is
diff --git a/gcc/ada/par-ch10.adb b/gcc/ada/par-ch10.adb
index 9484589..13d0fbd 100644
--- a/gcc/ada/par-ch10.adb
+++ b/gcc/ada/par-ch10.adb
@@ -28,7 +28,6 @@ pragma Style_Checks (All_Checks);
 --  Turn off subprogram body ordering check. Subprograms are in order
 --  by RM section rather than alphabetical
 
-with Fname;    use Fname;
 with Fname.UF; use Fname.UF;
 with Uname;    use Uname;
 
diff --git a/gcc/ada/par-load.adb b/gcc/ada/par-load.adb
index 469a971..0f5674b 100644
--- a/gcc/ada/par-load.adb
+++ b/gcc/ada/par-load.adb
@@ -30,13 +30,9 @@
 --  and parents of subunits. All these units are loaded and pointers installed
 --  in the tree as described in the spec of package Lib.
 
-with Fname;    use Fname;
 with Fname.UF; use Fname.UF;
 with Lib.Load; use Lib.Load;
 with Uname;    use Uname;
-with Namet;    use Namet;
-with Casing;   use Casing;
-with Opt;      use Opt;
 with Osint;    use Osint;
 with Sinput.L; use Sinput.L;
 with Stylesw;  use Stylesw;
@@ -300,11 +296,10 @@ begin
          return;
       end if;
 
-   --  If current unit is a child unit spec, load its parent
-   --  If the child unit is loaded through a limited with, the parent
-   --  must be as well.
+   --  If current unit is a child unit spec, load its parent. If the child unit
+   --  is loaded through a limited with, the parent must be as well.
 
-   elsif Nkind (Unit (Curunit)) = N_Package_Declaration
+   elsif     Nkind (Unit (Curunit)) = N_Package_Declaration
      or else Nkind (Unit (Curunit)) =  N_Subprogram_Declaration
      or else Nkind (Unit (Curunit)) in N_Generic_Declaration
      or else Nkind (Unit (Curunit)) in N_Generic_Instantiation
@@ -322,10 +317,10 @@ begin
       if Spec_Name /= No_Name then
          Unum :=
            Load_Unit
-             (Load_Name  => Spec_Name,
-              Required   => True,
-              Subunit    => False,
-              Error_Node => Curunit,
+             (Load_Name         => Spec_Name,
+              Required          => True,
+              Subunit           => False,
+              Error_Node        => Curunit,
               From_Limited_With => From_Limited_With);
 
          if Unum /= No_Unit then
diff --git a/gcc/ada/prep.adb b/gcc/ada/prep.adb
index 5d566b5..bbfb5b7 100644
--- a/gcc/ada/prep.adb
+++ b/gcc/ada/prep.adb
@@ -35,7 +35,6 @@ with Snames;   use Snames;
 with Sinput;
 with Stringt;  use Stringt;
 with Table;
-with Types;    use Types;
 
 with GNAT.Heap_Sort_G;
 
diff --git a/gcc/ada/prj-attr-pm.ads b/gcc/ada/prj-attr-pm.ads
index 5b5cfcc..695e17f 100644
--- a/gcc/ada/prj-attr-pm.ads
+++ b/gcc/ada/prj-attr-pm.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---             Copyright (C) 2004 Free Software Foundation, Inc.            --
+--             Copyright (C) 2005 Free Software Foundation, Inc.            --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -24,8 +24,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Types; use Types;
-
 package Prj.Attr.PM is
    --  The following procedures are not secure and should only be used by the
    --  Project Manager, that is the packages of the Prj or MLib hierarchies.
diff --git a/gcc/ada/prj-attr.ads b/gcc/ada/prj-attr.ads
index f4e201d..142be80 100644
--- a/gcc/ada/prj-attr.ads
+++ b/gcc/ada/prj-attr.ads
@@ -29,7 +29,6 @@
 --  It is also possible to define new packages with their attributes.
 
 with Table;
-with Types; use Types;
 
 package Prj.Attr is
 
diff --git a/gcc/ada/prj-env.ads b/gcc/ada/prj-env.ads
index d3d3eca..76e85ae 100644
--- a/gcc/ada/prj-env.ads
+++ b/gcc/ada/prj-env.ads
@@ -27,8 +27,6 @@
 --  This package implements services for Project-aware tools, mostly related
 --  to the environment (configuration pragma files, path files, mapping files).
 
-with GNAT.OS_Lib; use GNAT.OS_Lib;
-
 package Prj.Env is
 
    procedure Initialize;
diff --git a/gcc/ada/prj-err.adb b/gcc/ada/prj-err.adb
index acba692..3f4fd0c 100644
--- a/gcc/ada/prj-err.adb
+++ b/gcc/ada/prj-err.adb
@@ -26,7 +26,6 @@
 
 with Namet;   use Namet;
 with Output;  use Output;
-with Scans;   use Scans;
 with Stringt; use Stringt;
 
 package body Prj.Err is
diff --git a/gcc/ada/prj-err.ads b/gcc/ada/prj-err.ads
index 6dbe343..57d33f9 100644
--- a/gcc/ada/prj-err.ads
+++ b/gcc/ada/prj-err.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2002-2004 Free Software Foundation, Inc.          --
+--          Copyright (C) 2002-2005 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -33,7 +33,6 @@
 
 with Scng;
 with Errutil;
-with Types; use Types;
 
 package Prj.Err is
 
diff --git a/gcc/ada/prj-ext.adb b/gcc/ada/prj-ext.adb
index d0f4e54..53d47cd 100644
--- a/gcc/ada/prj-ext.adb
+++ b/gcc/ada/prj-ext.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---             Copyright (C) 2000-2004 Free Software Foundation, Inc.       --
+--             Copyright (C) 2000-2005 Free Software Foundation, Inc.       --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -27,10 +27,7 @@
 with Namet;   use Namet;
 with Osint;   use Osint;
 with Sdefault;
-with Types;   use Types;
-
 with GNAT.HTable;
-with GNAT.OS_Lib; use GNAT.OS_Lib;
 
 package body Prj.Ext is
 
diff --git a/gcc/ada/prj-ext.ads b/gcc/ada/prj-ext.ads
index 9ea8bdc..e6e7188 100644
--- a/gcc/ada/prj-ext.ads
+++ b/gcc/ada/prj-ext.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---             Copyright (C) 2000-2004 Free Software Foundation, Inc.       --
+--             Copyright (C) 2000-2005 Free Software Foundation, Inc.       --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -27,8 +27,6 @@
 --  Subprograms to set, get and cache external references, to be used as
 --  External functions in project files.
 
-with Types; use Types;
-
 package Prj.Ext is
 
    function Project_Path return String;
diff --git a/gcc/ada/prj-makr.adb b/gcc/ada/prj-makr.adb
index 92b7b72..569c85d 100644
--- a/gcc/ada/prj-makr.adb
+++ b/gcc/ada/prj-makr.adb
@@ -40,7 +40,6 @@ with Table;    use Table;
 
 with Ada.Characters.Handling;   use Ada.Characters.Handling;
 with GNAT.Directory_Operations; use GNAT.Directory_Operations;
-with GNAT.OS_Lib;               use GNAT.OS_Lib;
 with GNAT.Regexp;               use GNAT.Regexp;
 
 with System.Case_Util;          use System.Case_Util;
diff --git a/gcc/ada/prj-makr.ads b/gcc/ada/prj-makr.ads
index aea6f24..3947e89 100644
--- a/gcc/ada/prj-makr.ads
+++ b/gcc/ada/prj-makr.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---             Copyright (C) 2001-2003 Free Software Foundation, Inc.       --
+--             Copyright (C) 2001-2005 Free Software Foundation, Inc.       --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -29,8 +29,6 @@
 --  For arbitrary naming schemes, create or update a project file,
 --  or create a configuration pragmas file.
 
-with GNAT.OS_Lib; use GNAT.OS_Lib;
-
 package Prj.Makr is
 
    procedure Make
diff --git a/gcc/ada/prj-pars.ads b/gcc/ada/prj-pars.ads
index da44f21..15a17be 100644
--- a/gcc/ada/prj-pars.ads
+++ b/gcc/ada/prj-pars.ads
@@ -26,8 +26,6 @@
 
 --  Implements the parsing of project files
 
-with GNAT.OS_Lib; use GNAT.OS_Lib;
-
 package Prj.Pars is
 
    procedure Set_Verbosity (To : Verbosity);
diff --git a/gcc/ada/prj-part.adb b/gcc/ada/prj-part.adb
index 2ca6ea1..1e711f8 100644
--- a/gcc/ada/prj-part.adb
+++ b/gcc/ada/prj-part.adb
@@ -33,23 +33,18 @@ with Prj.Com;  use Prj.Com;
 with Prj.Dect;
 with Prj.Err;  use Prj.Err;
 with Prj.Ext;  use Prj.Ext;
-with Scans;    use Scans;
 with Sinput;   use Sinput;
 with Sinput.P; use Sinput.P;
 with Snames;
 with Table;
-with Types;    use Types;
 
 with Ada.Characters.Handling;    use Ada.Characters.Handling;
 with Ada.Exceptions;             use Ada.Exceptions;
 
 with GNAT.Directory_Operations;  use GNAT.Directory_Operations;
-with GNAT.OS_Lib;                use GNAT.OS_Lib;
 
 with System.HTable;              use System.HTable;
 
-pragma Elaborate_All (GNAT.OS_Lib);
-
 package body Prj.Part is
 
    Buffer      : String_Access;
diff --git a/gcc/ada/prj-strt.adb b/gcc/ada/prj-strt.adb
index 703ae4c..d3615d1 100644
--- a/gcc/ada/prj-strt.adb
+++ b/gcc/ada/prj-strt.adb
@@ -28,11 +28,8 @@ with Err_Vars;  use Err_Vars;
 with Namet;     use Namet;
 with Prj.Attr;  use Prj.Attr;
 with Prj.Err;   use Prj.Err;
-with Prj.Tree;  use Prj.Tree;
-with Scans;     use Scans;
 with Snames;
 with Table;
-with Types;     use Types;
 with Uintp;     use Uintp;
 
 package body Prj.Strt is
diff --git a/gcc/ada/prj-tree.ads b/gcc/ada/prj-tree.ads
index dc54609..3a7decf 100644
--- a/gcc/ada/prj-tree.ads
+++ b/gcc/ada/prj-tree.ads
@@ -30,7 +30,6 @@ with GNAT.Dynamic_HTables;
 with GNAT.Dynamic_Tables;
 
 with Prj.Attr; use Prj.Attr;
-with Types;    use Types;
 
 package Prj.Tree is
 
diff --git a/gcc/ada/prj-util.ads b/gcc/ada/prj-util.ads
index 40d5730..667fb99 100644
--- a/gcc/ada/prj-util.ads
+++ b/gcc/ada/prj-util.ads
@@ -26,10 +26,6 @@
 
 --  Utilities for use in processing project files
 
-with Types; use Types;
-
-with GNAT.OS_Lib; use GNAT.OS_Lib;
-
 package Prj.Util is
 
    function Executable_Of
diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb
index e4b978f..5a8c299 100644
--- a/gcc/ada/prj.adb
+++ b/gcc/ada/prj.adb
@@ -32,12 +32,10 @@ with Osint;    use Osint;
 with Prj.Attr;
 with Prj.Env;
 with Prj.Err;  use Prj.Err;
-with Scans;    use Scans;
 with Snames;   use Snames;
 with Uintp;    use Uintp;
 
 with GNAT.Case_Util; use GNAT.Case_Util;
-with GNAT.OS_Lib;    use GNAT.OS_Lib;
 
 package body Prj is
 
diff --git a/gcc/ada/sem_dist.adb b/gcc/ada/sem_dist.adb
index 9f13d3f..57998db 100644
--- a/gcc/ada/sem_dist.adb
+++ b/gcc/ada/sem_dist.adb
@@ -39,7 +39,6 @@ with Sem;      use Sem;
 with Sem_Res;  use Sem_Res;
 with Sem_Util; use Sem_Util;
 with Sinfo;    use Sinfo;
-with Snames;   use Snames;
 with Stand;    use Stand;
 with Stringt;  use Stringt;
 with Tbuild;   use Tbuild;
@@ -51,10 +50,10 @@ package body Sem_Dist is
    -----------------------
 
    procedure RAS_E_Dereference (Pref : Node_Id);
-   --  Handles explicit dereference of Remote Access to Subprograms.
+   --  Handles explicit dereference of Remote Access to Subprograms
 
    function Full_Qualified_Name (E : Entity_Id) return String_Id;
-   --  returns the full qualified name of the entity in lower case.
+   --  returns the full qualified name of the entity in lower case
 
    -------------------------
    -- Add_Stub_Constructs --
@@ -168,14 +167,14 @@ package body Sem_Dist is
          Ent := Defining_Identifier (Ent);
       end if;
 
-      --  Compute recursively the qualification. Only "Standard" has no scope.
+      --  Compute recursively the qualification (only "Standard" has no scope)
 
       if Present (Scope (Scope (Ent))) then
          Parent_Name := Full_Qualified_Name (Scope (Ent));
       end if;
 
-      --  Every entity should have a name except some expanded blocks
-      --  don't bother about those.
+      --  Every entity should have a name except some expanded blocks. Do not
+      --  bother about those.
 
       if Chars (Ent) = No_Name then
          return Parent_Name;
@@ -285,7 +284,7 @@ package body Sem_Dist is
          Ety := Scope (Ety);
       end loop;
 
-      --  Retrieve the proper function to call.
+      --  Retrieve the proper function to call
 
       if Is_Remote_Call_Interface (Ety) then
          Get_Pt_Id := New_Occurrence_Of
@@ -454,27 +453,26 @@ package body Sem_Dist is
       end loop;
 
       if Is_Degenerate then
-         Error_Msg_NE (
-           "remote access-to-subprogram type& can only be null?",
-           Defining_Identifier (Parameter), User_Type);
+         Error_Msg_NE
+           ("remote access-to-subprogram type& can only be null?",
+            Defining_Identifier (Parameter), User_Type);
+
          --  The only legal value for a RAS with a formal parameter of an
-         --  anonymous access type is null, because it cannot be
-         --  subtype-Conformant with any legal remote subprogram declaration.
-         --  In this case, we cannot generate a corresponding primitive
-         --  operation.
+         --  anonymous access type is null, because it cannot be subtype-
+         --  conformant with any legal remote subprogram declaration. In this
+         --  case, we cannot generate a corresponding primitive operation.
       end if;
 
       if Get_PCS_Name = Name_No_DSA then
          return;
       end if;
 
-      --  The tagged private type, primitive operation and RACW
-      --  type associated with a RAS need to all be declared in
-      --  a subpackage of the one that contains the RAS declaration,
-      --  because the primitive of the object type, and the associated
-      --  primitive of the stub type, need to be dispatching operations
-      --  of these types, and the profile of the RAS might contain
-      --  tagged types declared in the same scope.
+      --  The tagged private type, primitive operation and RACW type associated
+      --  with a RAS need to all be declared in a subpackage of the one that
+      --  contains the RAS declaration, because the primitive of the object
+      --  type, and the associated primitive of the stub type, need to be
+      --  dispatching operations of these types, and the profile of the RAS
+      --  might contain tagged types declared in the same scope.
 
       Append_To (Vis_Decls,
         Make_Private_Type_Declaration (Loc,
@@ -606,7 +604,7 @@ package body Sem_Dist is
          end if;
 
       else
-         --  Context is not a call.
+         --  Context is not a call
 
          return;
       end if;
diff --git a/gcc/ada/sinput-c.ads b/gcc/ada/sinput-c.ads
index b7e1e51..608095c 100644
--- a/gcc/ada/sinput-c.ads
+++ b/gcc/ada/sinput-c.ads
@@ -29,8 +29,6 @@
 --  It is used by Sinput.P to load project files, and by GPrep to load
 --  preprocessor definition files and input files.
 
-with Types; use Types;
-
 package Sinput.C is
 
    function Load_File (Path : String) return Source_File_Index;
diff --git a/gcc/ada/sinput-l.ads b/gcc/ada/sinput-l.ads
index b24900c..7a4dda8 100644
--- a/gcc/ada/sinput-l.ads
+++ b/gcc/ada/sinput-l.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2004, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2005, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -30,8 +30,6 @@
 --  off into a child package to avoid a dependence of Sinput on Osint which
 --  would cause trouble in the tree read/write routines.
 
-with Types; use Types;
-
 package Sinput.L is
 
    ------------------------------------------
diff --git a/gcc/ada/sinput-p.ads b/gcc/ada/sinput-p.ads
index db86174..fdcb3cf 100644
--- a/gcc/ada/sinput-p.ads
+++ b/gcc/ada/sinput-p.ads
@@ -29,7 +29,6 @@
 --  routines to save and restore a project scan context.
 
 with Scans; use Scans;
-with Types; use Types;
 
 package Sinput.P is
 
diff --git a/gcc/ada/styleg-c.ads b/gcc/ada/styleg-c.ads
index 67f8961..1ba9826 100644
--- a/gcc/ada/styleg-c.ads
+++ b/gcc/ada/styleg-c.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2002 Free Software Foundation, Inc.          --
+--          Copyright (C) 1992-2005 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -28,8 +28,6 @@
 --  used by the compiler for style checking. These routines are in a separate
 --  package because they depend on the GNAT tree (Atree, Sinfo, ...).
 
-with Types;  use Types;
-
 generic
    with procedure Error_Msg_N (Msg : String; N : Node_Or_Entity_Id);
    --  Output a message at the Sloc of the given node
diff --git a/gcc/ada/xr_tabls.adb b/gcc/ada/xr_tabls.adb
index 707d2f0..5e8cbe3 100644
--- a/gcc/ada/xr_tabls.adb
+++ b/gcc/ada/xr_tabls.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1998-2004 Free Software Foundation, Inc.          --
+--          Copyright (C) 1998-2005 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -556,8 +556,6 @@ package body Xr_Tabls is
    -------------------------
 
    procedure Create_Project_File (Name : String) is
-      use Ada.Strings.Unbounded;
-
       Obj_Dir     : Unbounded_String := Null_Unbounded_String;
       Src_Dir     : Unbounded_String := Null_Unbounded_String;
       Build_Dir   : GNAT.OS_Lib.String_Access := new String'("");