diff --git a/gcc/ada/a-taside.adb b/gcc/ada/a-taside.adb
index e9431d1649932997d92128a228e5f9bb8a3d72b8..600425c39966d07a75902e76757e6daffea569f1 100644
--- a/gcc/ada/a-taside.adb
+++ b/gcc/ada/a-taside.adb
@@ -34,6 +34,7 @@
 with System.Address_Image;
 with System.Parameters;
 with System.Soft_Links;
+with System.Task_Primitives;
 with System.Task_Primitives.Operations;
 with Ada.Unchecked_Conversion;
 
@@ -113,7 +114,8 @@ package body Ada.Task_Identification is
 
    function Image (T : Task_Id) return String is
       function To_Address is new
-        Ada.Unchecked_Conversion (Task_Id, System.Address);
+        Ada.Unchecked_Conversion
+          (Task_Id, System.Task_Primitives.Task_Address);
 
    begin
       if T = Null_Task_Id then
diff --git a/gcc/ada/s-tasdeb.adb b/gcc/ada/s-tasdeb.adb
index 05719426d24315f1e81e5fcbf7a8cbe50bb8b014..8146b97726abf95bb9df0f8f64d4dafa4d43917e 100644
--- a/gcc/ada/s-tasdeb.adb
+++ b/gcc/ada/s-tasdeb.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                  B o d y                                 --
 --                                                                          --
---          Copyright (C) 1997-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 1997-2008, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNARL 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- --
@@ -40,6 +40,7 @@
 --  in both normal and restricted (ravenscar) environments.
 
 with System.CRTL;
+with System.Task_Primitives;
 with System.Task_Primitives.Operations;
 with Ada.Unchecked_Conversion;
 
@@ -48,7 +49,7 @@ package body System.Tasking.Debug is
    package STPO renames System.Task_Primitives.Operations;
 
    function To_Integer is new
-     Ada.Unchecked_Conversion (Task_Id, System.Address);
+     Ada.Unchecked_Conversion (Task_Id, System.Task_Primitives.Task_Address);
 
    type Trace_Flag_Set is array (Character) of Boolean;