diff --git a/gcc/ada/libgnat/a-wtdeio.adb b/gcc/ada/libgnat/a-wtdeio.adb
--- a/gcc/ada/libgnat/a-wtdeio.adb
+++ b/gcc/ada/libgnat/a-wtdeio.adb
@@ -36,9 +36,6 @@ with System.WCh_WtS; use System.WCh_WtS;
 
 package body Ada.Wide_Text_IO.Decimal_IO is
 
-   subtype TFT is Ada.Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    package Aux renames Ada.Wide_Text_IO.Decimal_Aux;
 
    Scale : constant Integer := Num'Scale;
@@ -54,9 +51,9 @@ package body Ada.Wide_Text_IO.Decimal_IO is
    is
    begin
       if Num'Size > Integer'Size then
-         Item := Num'Fixed_Value (Aux.Get_LLD (TFT (File), Width, Scale));
+         Item := Num'Fixed_Value (Aux.Get_LLD (File, Width, Scale));
       else
-         Item := Num'Fixed_Value (Aux.Get_Dec (TFT (File), Width, Scale));
+         Item := Num'Fixed_Value (Aux.Get_Dec (File, Width, Scale));
       end if;
    exception
       when Constraint_Error => raise Data_Error;
@@ -112,11 +109,11 @@ package body Ada.Wide_Text_IO.Decimal_IO is
    begin
       if Num'Size > Integer'Size then
          Aux.Put_LLD
-           (TFT (File), Long_Long_Integer'Integer_Value (Item),
+           (File, Long_Long_Integer'Integer_Value (Item),
             Fore, Aft, Exp, Scale);
       else
          Aux.Put_Dec
-           (TFT (File), Integer'Integer_Value (Item), Fore, Aft, Exp, Scale);
+           (File, Integer'Integer_Value (Item), Fore, Aft, Exp, Scale);
       end if;
    end Put;
 


diff --git a/gcc/ada/libgnat/a-wtenau.adb b/gcc/ada/libgnat/a-wtenau.adb
--- a/gcc/ada/libgnat/a-wtenau.adb
+++ b/gcc/ada/libgnat/a-wtenau.adb
@@ -36,9 +36,6 @@ with System.WCh_Con;               use System.WCh_Con;
 
 package body Ada.Wide_Text_IO.Enumeration_Aux is
 
-   subtype TFT is Ada.Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    -----------------------
    -- Local Subprograms --
    -----------------------
@@ -69,8 +66,8 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
 
    begin
       Buflen := 0;
-      Load_Skip (TFT (File));
-      ch := Nextc (TFT (File));
+      Load_Skip (File);
+      ch := Nextc (File);
 
       --  Character literal case. If the initial character is a quote, then
       --  we read as far as we can without backup (see ACVC test CE3905L)
@@ -79,7 +76,7 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
          Get (File, WC);
          Store_Char (WC, Buf, Buflen);
 
-         ch := Nextc (TFT (File));
+         ch := Nextc (File);
 
          if ch = LM or else ch = EOF then
             return;
@@ -88,7 +85,7 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
          Get (File, WC);
          Store_Char (WC, Buf, Buflen);
 
-         ch := Nextc (TFT (File));
+         ch := Nextc (File);
 
          if ch /= Character'Pos (''') then
             return;
@@ -117,7 +114,7 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
             Get (File, WC);
             Store_Char (WC, Buf, Buflen);
 
-            ch := Nextc (TFT (File));
+            ch := Nextc (File);
 
             exit when ch = EOF;
 
@@ -155,7 +152,7 @@ package body Ada.Wide_Text_IO.Enumeration_Aux is
         Integer'Max (Integer (Width), Item'Length);
 
    begin
-      Check_On_One_Line (TFT (File), Actual_Width);
+      Check_On_One_Line (File, Actual_Width);
 
       if Set = Lower_Case and then Item (Item'First) /= ''' then
          declare


diff --git a/gcc/ada/libgnat/a-wtfiio.adb b/gcc/ada/libgnat/a-wtfiio.adb
--- a/gcc/ada/libgnat/a-wtfiio.adb
+++ b/gcc/ada/libgnat/a-wtfiio.adb
@@ -35,9 +35,6 @@ with System.WCh_WtS; use System.WCh_WtS;
 
 package body Ada.Wide_Text_IO.Fixed_IO is
 
-   subtype TFT is Ada.Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    package Aux renames Ada.Wide_Text_IO.Float_Aux;
 
    ---------
@@ -50,7 +47,7 @@ package body Ada.Wide_Text_IO.Fixed_IO is
       Width : Field := 0)
    is
    begin
-      Aux.Get (TFT (File), Long_Long_Float (Item), Width);
+      Aux.Get (File, Long_Long_Float (Item), Width);
 
    exception
       when Constraint_Error => raise Data_Error;
@@ -94,7 +91,7 @@ package body Ada.Wide_Text_IO.Fixed_IO is
       Exp  : Field := Default_Exp)
    is
    begin
-      Aux.Put (TFT (File), Long_Long_Float (Item), Fore, Aft, Exp);
+      Aux.Put (File, Long_Long_Float (Item), Fore, Aft, Exp);
    end Put;
 
    procedure Put


diff --git a/gcc/ada/libgnat/a-wtflio.adb b/gcc/ada/libgnat/a-wtflio.adb
--- a/gcc/ada/libgnat/a-wtflio.adb
+++ b/gcc/ada/libgnat/a-wtflio.adb
@@ -36,9 +36,6 @@ with System.WCh_WtS; use System.WCh_WtS;
 
 package body Ada.Wide_Text_IO.Float_IO is
 
-   subtype TFT is Ada.Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    package Aux renames Ada.Wide_Text_IO.Float_Aux;
 
    ---------
@@ -51,7 +48,7 @@ package body Ada.Wide_Text_IO.Float_IO is
       Width : Field := 0)
    is
    begin
-      Aux.Get (TFT (File), Long_Long_Float (Item), Width);
+      Aux.Get (File, Long_Long_Float (Item), Width);
 
    exception
       when Constraint_Error => raise Data_Error;
@@ -95,7 +92,7 @@ package body Ada.Wide_Text_IO.Float_IO is
       Exp  : Field := Default_Exp)
    is
    begin
-      Aux.Put (TFT (File), Long_Long_Float (Item), Fore, Aft, Exp);
+      Aux.Put (File, Long_Long_Float (Item), Fore, Aft, Exp);
    end Put;
 
    procedure Put


diff --git a/gcc/ada/libgnat/a-wtinio.adb b/gcc/ada/libgnat/a-wtinio.adb
--- a/gcc/ada/libgnat/a-wtinio.adb
+++ b/gcc/ada/libgnat/a-wtinio.adb
@@ -65,9 +65,6 @@ package body Ada.Wide_Text_IO.Integer_IO is
    --  Boolean is used to test for these cases and since it is a constant, only
    --  code for the relevant case will be included in the instance.
 
-   subtype TFT is Ada.Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    ---------
    -- Get --
    ---------
@@ -84,9 +81,9 @@ package body Ada.Wide_Text_IO.Integer_IO is
 
    begin
       if Need_LLI then
-         Aux_LLI.Get (TFT (File), Long_Long_Integer (Item), Width);
+         Aux_LLI.Get (File, Long_Long_Integer (Item), Width);
       else
-         Aux_Int.Get (TFT (File), Integer (Item), Width);
+         Aux_Int.Get (File, Integer (Item), Width);
       end if;
 
    exception
@@ -140,9 +137,9 @@ package body Ada.Wide_Text_IO.Integer_IO is
    is
    begin
       if Need_LLI then
-         Aux_LLI.Put (TFT (File), Long_Long_Integer (Item), Width, Base);
+         Aux_LLI.Put (File, Long_Long_Integer (Item), Width, Base);
       else
-         Aux_Int.Put (TFT (File), Integer (Item), Width, Base);
+         Aux_Int.Put (File, Integer (Item), Width, Base);
       end if;
    end Put;
 


diff --git a/gcc/ada/libgnat/a-wtinio__128.adb b/gcc/ada/libgnat/a-wtinio__128.adb
--- a/gcc/ada/libgnat/a-wtinio__128.adb
+++ b/gcc/ada/libgnat/a-wtinio__128.adb
@@ -79,9 +79,6 @@ package body Ada.Wide_Text_IO.Integer_IO is
    --  are used to test for these cases and since they are constant, only code
    --  for the relevant case will be included in the instance.
 
-   subtype TFT is Ada.Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    ---------
    -- Get --
    ---------
@@ -98,11 +95,11 @@ package body Ada.Wide_Text_IO.Integer_IO is
 
    begin
       if Need_LLLI then
-         Aux_LLLI.Get (TFT (File), Long_Long_Long_Integer (Item), Width);
+         Aux_LLLI.Get (File, Long_Long_Long_Integer (Item), Width);
       elsif Need_LLI then
-         Aux_LLI.Get (TFT (File), Long_Long_Integer (Item), Width);
+         Aux_LLI.Get (File, Long_Long_Integer (Item), Width);
       else
-         Aux_Int.Get (TFT (File), Integer (Item), Width);
+         Aux_Int.Get (File, Integer (Item), Width);
       end if;
 
    exception
@@ -158,11 +155,11 @@ package body Ada.Wide_Text_IO.Integer_IO is
    is
    begin
       if Need_LLLI then
-         Aux_LLLI.Put (TFT (File), Long_Long_Long_Integer (Item), Width, Base);
+         Aux_LLLI.Put (File, Long_Long_Long_Integer (Item), Width, Base);
       elsif Need_LLI then
-         Aux_LLI.Put (TFT (File), Long_Long_Integer (Item), Width, Base);
+         Aux_LLI.Put (File, Long_Long_Integer (Item), Width, Base);
       else
-         Aux_Int.Put (TFT (File), Integer (Item), Width, Base);
+         Aux_Int.Put (File, Integer (Item), Width, Base);
       end if;
    end Put;
 


diff --git a/gcc/ada/libgnat/a-wtmoio.adb b/gcc/ada/libgnat/a-wtmoio.adb
--- a/gcc/ada/libgnat/a-wtmoio.adb
+++ b/gcc/ada/libgnat/a-wtmoio.adb
@@ -65,9 +65,6 @@ package body Ada.Wide_Text_IO.Modular_IO is
    --  Boolean is used to test for these cases and since it is a constant, only
    --  code for the relevant case will be included in the instance.
 
-   subtype TFT is Ada.Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    ---------
    -- Get --
    ---------
@@ -83,9 +80,9 @@ package body Ada.Wide_Text_IO.Modular_IO is
 
    begin
       if Need_LLU then
-         Aux_LLU.Get (TFT (File), Long_Long_Unsigned (Item), Width);
+         Aux_LLU.Get (File, Long_Long_Unsigned (Item), Width);
       else
-         Aux_Uns.Get (TFT (File), Unsigned (Item), Width);
+         Aux_Uns.Get (File, Unsigned (Item), Width);
       end if;
 
    exception
@@ -138,9 +135,9 @@ package body Ada.Wide_Text_IO.Modular_IO is
    is
    begin
       if Need_LLU then
-         Aux_LLU.Put (TFT (File), Long_Long_Unsigned (Item), Width, Base);
+         Aux_LLU.Put (File, Long_Long_Unsigned (Item), Width, Base);
       else
-         Aux_Uns.Put (TFT (File), Unsigned (Item), Width, Base);
+         Aux_Uns.Put (File, Unsigned (Item), Width, Base);
       end if;
    end Put;
 


diff --git a/gcc/ada/libgnat/a-wtmoio__128.adb b/gcc/ada/libgnat/a-wtmoio__128.adb
--- a/gcc/ada/libgnat/a-wtmoio__128.adb
+++ b/gcc/ada/libgnat/a-wtmoio__128.adb
@@ -79,9 +79,6 @@ package body Ada.Wide_Text_IO.Modular_IO is
    --  are used to test for these cases and since they are constant, only code
    --  for the relevant case will be included in the instance.
 
-   subtype TFT is Ada.Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    ---------
    -- Get --
    ---------
@@ -99,9 +96,9 @@ package body Ada.Wide_Text_IO.Modular_IO is
       if Need_LLLU then
          Aux_LLLU.Get (File, Long_Long_Long_Unsigned (Item), Width);
       elsif Need_LLU then
-         Aux_LLU.Get (TFT (File), Long_Long_Unsigned (Item), Width);
+         Aux_LLU.Get (File, Long_Long_Unsigned (Item), Width);
       else
-         Aux_Uns.Get (TFT (File), Unsigned (Item), Width);
+         Aux_Uns.Get (File, Unsigned (Item), Width);
       end if;
 
    exception
@@ -158,9 +155,9 @@ package body Ada.Wide_Text_IO.Modular_IO is
       if Need_LLLU then
          Aux_LLLU.Put (File, Long_Long_Long_Unsigned (Item), Width, Base);
       elsif Need_LLU then
-         Aux_LLU.Put (TFT (File), Long_Long_Unsigned (Item), Width, Base);
+         Aux_LLU.Put (File, Long_Long_Unsigned (Item), Width, Base);
       else
-         Aux_Uns.Put (TFT (File), Unsigned (Item), Width, Base);
+         Aux_Uns.Put (File, Unsigned (Item), Width, Base);
       end if;
    end Put;
 


diff --git a/gcc/ada/libgnat/a-ztdeio.adb b/gcc/ada/libgnat/a-ztdeio.adb
--- a/gcc/ada/libgnat/a-ztdeio.adb
+++ b/gcc/ada/libgnat/a-ztdeio.adb
@@ -36,9 +36,6 @@ with System.WCh_WtS; use System.WCh_WtS;
 
 package body Ada.Wide_Wide_Text_IO.Decimal_IO is
 
-   subtype TFT is Ada.Wide_Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    package Aux renames Ada.Wide_Wide_Text_IO.Decimal_Aux;
 
    Scale : constant Integer := Num'Scale;
@@ -54,9 +51,9 @@ package body Ada.Wide_Wide_Text_IO.Decimal_IO is
    is
    begin
       if Num'Size > Integer'Size then
-         Item := Num'Fixed_Value (Aux.Get_LLD (TFT (File), Width, Scale));
+         Item := Num'Fixed_Value (Aux.Get_LLD (File, Width, Scale));
       else
-         Item := Num'Fixed_Value (Aux.Get_Dec (TFT (File), Width, Scale));
+         Item := Num'Fixed_Value (Aux.Get_Dec (File, Width, Scale));
       end if;
    exception
       when Constraint_Error => raise Data_Error;
@@ -112,15 +109,15 @@ package body Ada.Wide_Wide_Text_IO.Decimal_IO is
    begin
       if Num'Size > Integer'Size then
          Aux.Put_LLD
---           (TFT (File), Long_Long_Integer'Integer_Value (Item),
+--           (File, Long_Long_Integer'Integer_Value (Item),
 --  ???
-           (TFT (File), Long_Long_Integer (Item),
+           (File, Long_Long_Integer (Item),
             Fore, Aft, Exp, Scale);
       else
          Aux.Put_Dec
---           (TFT (File), Integer'Integer_Value (Item), Fore, Aft, Exp, Scale);
+--           (File, Integer'Integer_Value (Item), Fore, Aft, Exp, Scale);
 --  ???
-           (TFT (File), Integer (Item), Fore, Aft, Exp, Scale);
+           (File, Integer (Item), Fore, Aft, Exp, Scale);
 
       end if;
    end Put;


diff --git a/gcc/ada/libgnat/a-ztenau.adb b/gcc/ada/libgnat/a-ztenau.adb
--- a/gcc/ada/libgnat/a-ztenau.adb
+++ b/gcc/ada/libgnat/a-ztenau.adb
@@ -37,9 +37,6 @@ with System.WCh_Con;                    use System.WCh_Con;
 
 package body Ada.Wide_Wide_Text_IO.Enumeration_Aux is
 
-   subtype TFT is Ada.Wide_Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    -----------------------
    -- Local Subprograms --
    -----------------------
@@ -70,8 +67,8 @@ package body Ada.Wide_Wide_Text_IO.Enumeration_Aux is
 
    begin
       Buflen := 0;
-      Load_Skip (TFT (File));
-      ch := Nextc (TFT (File));
+      Load_Skip (File);
+      ch := Nextc (File);
 
       --  Character literal case. If the initial character is a quote, then
       --  we read as far as we can without backup (see ACVC test CE3905L)
@@ -80,7 +77,7 @@ package body Ada.Wide_Wide_Text_IO.Enumeration_Aux is
          Get (File, WC);
          Store_Char (WC, Buf, Buflen);
 
-         ch := Nextc (TFT (File));
+         ch := Nextc (File);
 
          if ch = LM or else ch = EOF then
             return;
@@ -89,7 +86,7 @@ package body Ada.Wide_Wide_Text_IO.Enumeration_Aux is
          Get (File, WC);
          Store_Char (WC, Buf, Buflen);
 
-         ch := Nextc (TFT (File));
+         ch := Nextc (File);
 
          if ch /= Character'Pos (''') then
             return;
@@ -118,7 +115,7 @@ package body Ada.Wide_Wide_Text_IO.Enumeration_Aux is
             Get (File, WC);
             Store_Char (WC, Buf, Buflen);
 
-            ch := Nextc (TFT (File));
+            ch := Nextc (File);
 
             exit when ch = EOF;
 
@@ -156,7 +153,7 @@ package body Ada.Wide_Wide_Text_IO.Enumeration_Aux is
         Integer'Max (Integer (Width), Item'Length);
 
    begin
-      Check_On_One_Line (TFT (File), Actual_Width);
+      Check_On_One_Line (File, Actual_Width);
 
       if Set = Lower_Case and then Item (Item'First) /= ''' then
          declare


diff --git a/gcc/ada/libgnat/a-ztfiio.adb b/gcc/ada/libgnat/a-ztfiio.adb
--- a/gcc/ada/libgnat/a-ztfiio.adb
+++ b/gcc/ada/libgnat/a-ztfiio.adb
@@ -35,9 +35,6 @@ with System.WCh_WtS; use System.WCh_WtS;
 
 package body Ada.Wide_Wide_Text_IO.Fixed_IO is
 
-   subtype TFT is Ada.Wide_Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    package Aux renames Ada.Wide_Wide_Text_IO.Float_Aux;
 
    ---------
@@ -50,7 +47,7 @@ package body Ada.Wide_Wide_Text_IO.Fixed_IO is
       Width : Field := 0)
    is
    begin
-      Aux.Get (TFT (File), Long_Long_Float (Item), Width);
+      Aux.Get (File, Long_Long_Float (Item), Width);
 
    exception
       when Constraint_Error => raise Data_Error;
@@ -94,7 +91,7 @@ package body Ada.Wide_Wide_Text_IO.Fixed_IO is
       Exp  : Field := Default_Exp)
    is
    begin
-      Aux.Put (TFT (File), Long_Long_Float (Item), Fore, Aft, Exp);
+      Aux.Put (File, Long_Long_Float (Item), Fore, Aft, Exp);
    end Put;
 
    procedure Put


diff --git a/gcc/ada/libgnat/a-ztflio.adb b/gcc/ada/libgnat/a-ztflio.adb
--- a/gcc/ada/libgnat/a-ztflio.adb
+++ b/gcc/ada/libgnat/a-ztflio.adb
@@ -35,9 +35,6 @@ with System.WCh_WtS; use System.WCh_WtS;
 
 package body Ada.Wide_Wide_Text_IO.Float_IO is
 
-   subtype TFT is Ada.Wide_Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    package Aux renames Ada.Wide_Wide_Text_IO.Float_Aux;
 
    ---------
@@ -50,7 +47,7 @@ package body Ada.Wide_Wide_Text_IO.Float_IO is
       Width : Field := 0)
    is
    begin
-      Aux.Get (TFT (File), Long_Long_Float (Item), Width);
+      Aux.Get (File, Long_Long_Float (Item), Width);
 
    exception
       when Constraint_Error => raise Data_Error;
@@ -94,7 +91,7 @@ package body Ada.Wide_Wide_Text_IO.Float_IO is
       Exp  : Field := Default_Exp)
    is
    begin
-      Aux.Put (TFT (File), Long_Long_Float (Item), Fore, Aft, Exp);
+      Aux.Put (File, Long_Long_Float (Item), Fore, Aft, Exp);
    end Put;
 
    procedure Put


diff --git a/gcc/ada/libgnat/a-ztinio.adb b/gcc/ada/libgnat/a-ztinio.adb
--- a/gcc/ada/libgnat/a-ztinio.adb
+++ b/gcc/ada/libgnat/a-ztinio.adb
@@ -65,9 +65,6 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is
    --  Boolean is used to test for these cases and since it is a constant, only
    --  code for the relevant case will be included in the instance.
 
-   subtype TFT is Ada.Wide_Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    ---------
    -- Get --
    ---------
@@ -84,9 +81,9 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is
 
    begin
       if Need_LLI then
-         Aux_LLI.Get (TFT (File), Long_Long_Integer (Item), Width);
+         Aux_LLI.Get (File, Long_Long_Integer (Item), Width);
       else
-         Aux_Int.Get (TFT (File), Integer (Item), Width);
+         Aux_Int.Get (File, Integer (Item), Width);
       end if;
 
    exception
@@ -140,9 +137,9 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is
    is
    begin
       if Need_LLI then
-         Aux_LLI.Put (TFT (File), Long_Long_Integer (Item), Width, Base);
+         Aux_LLI.Put (File, Long_Long_Integer (Item), Width, Base);
       else
-         Aux_Int.Put (TFT (File), Integer (Item), Width, Base);
+         Aux_Int.Put (File, Integer (Item), Width, Base);
       end if;
    end Put;
 


diff --git a/gcc/ada/libgnat/a-ztinio__128.adb b/gcc/ada/libgnat/a-ztinio__128.adb
--- a/gcc/ada/libgnat/a-ztinio__128.adb
+++ b/gcc/ada/libgnat/a-ztinio__128.adb
@@ -79,9 +79,6 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is
    --  are used to test for these cases and since they are constant, only code
    --  for the relevant case will be included in the instance.
 
-   subtype TFT is Ada.Wide_Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    ---------
    -- Get --
    ---------
@@ -98,11 +95,11 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is
 
    begin
       if Need_LLLI then
-         Aux_LLLI.Get (TFT (File), Long_Long_Long_Integer (Item), Width);
+         Aux_LLLI.Get (File, Long_Long_Long_Integer (Item), Width);
       elsif Need_LLI then
-         Aux_LLI.Get (TFT (File), Long_Long_Integer (Item), Width);
+         Aux_LLI.Get (File, Long_Long_Integer (Item), Width);
       else
-         Aux_Int.Get (TFT (File), Integer (Item), Width);
+         Aux_Int.Get (File, Integer (Item), Width);
       end if;
 
    exception
@@ -158,11 +155,11 @@ package body Ada.Wide_Wide_Text_IO.Integer_IO is
    is
    begin
       if Need_LLLI then
-         Aux_LLLI.Put (TFT (File), Long_Long_Long_Integer (Item), Width, Base);
+         Aux_LLLI.Put (File, Long_Long_Long_Integer (Item), Width, Base);
       elsif Need_LLI then
-         Aux_LLI.Put (TFT (File), Long_Long_Integer (Item), Width, Base);
+         Aux_LLI.Put (File, Long_Long_Integer (Item), Width, Base);
       else
-         Aux_Int.Put (TFT (File), Integer (Item), Width, Base);
+         Aux_Int.Put (File, Integer (Item), Width, Base);
       end if;
    end Put;
 


diff --git a/gcc/ada/libgnat/a-ztmoio.adb b/gcc/ada/libgnat/a-ztmoio.adb
--- a/gcc/ada/libgnat/a-ztmoio.adb
+++ b/gcc/ada/libgnat/a-ztmoio.adb
@@ -65,9 +65,6 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is
    --  Boolean is used to test for these cases and since it is a constant, only
    --  code for the relevant case will be included in the instance.
 
-   subtype TFT is Ada.Wide_Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    ---------
    -- Get --
    ---------
@@ -83,9 +80,9 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is
 
    begin
       if Need_LLU then
-         Aux_LLU.Get (TFT (File), Long_Long_Unsigned (Item), Width);
+         Aux_LLU.Get (File, Long_Long_Unsigned (Item), Width);
       else
-         Aux_Uns.Get (TFT (File), Unsigned (Item), Width);
+         Aux_Uns.Get (File, Unsigned (Item), Width);
       end if;
 
    exception
@@ -138,9 +135,9 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is
    is
    begin
       if Need_LLU then
-         Aux_LLU.Put (TFT (File), Long_Long_Unsigned (Item), Width, Base);
+         Aux_LLU.Put (File, Long_Long_Unsigned (Item), Width, Base);
       else
-         Aux_Uns.Put (TFT (File), Unsigned (Item), Width, Base);
+         Aux_Uns.Put (File, Unsigned (Item), Width, Base);
       end if;
    end Put;
 


diff --git a/gcc/ada/libgnat/a-ztmoio__128.adb b/gcc/ada/libgnat/a-ztmoio__128.adb
--- a/gcc/ada/libgnat/a-ztmoio__128.adb
+++ b/gcc/ada/libgnat/a-ztmoio__128.adb
@@ -79,9 +79,6 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is
    --  are used to test for these cases and since they are constant, only code
    --  for the relevant case will be included in the instance.
 
-   subtype TFT is Ada.Wide_Wide_Text_IO.File_Type;
-   --  File type required for calls to routines in Aux
-
    ---------
    -- Get --
    ---------
@@ -99,9 +96,9 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is
       if Need_LLLU then
          Aux_LLLU.Get (File, Long_Long_Long_Unsigned (Item), Width);
       elsif Need_LLU then
-         Aux_LLU.Get (TFT (File), Long_Long_Unsigned (Item), Width);
+         Aux_LLU.Get (File, Long_Long_Unsigned (Item), Width);
       else
-         Aux_Uns.Get (TFT (File), Unsigned (Item), Width);
+         Aux_Uns.Get (File, Unsigned (Item), Width);
       end if;
 
    exception
@@ -158,9 +155,9 @@ package body Ada.Wide_Wide_Text_IO.Modular_IO is
       if Need_LLLU then
          Aux_LLLU.Put (File, Long_Long_Long_Unsigned (Item), Width, Base);
       elsif Need_LLU then
-         Aux_LLU.Put (TFT (File), Long_Long_Unsigned (Item), Width, Base);
+         Aux_LLU.Put (File, Long_Long_Unsigned (Item), Width, Base);
       else
-         Aux_Uns.Put (TFT (File), Unsigned (Item), Width, Base);
+         Aux_Uns.Put (File, Unsigned (Item), Width, Base);
       end if;
    end Put;