--- a/distrib/xmlada_dom.gpr	2013-07-13 11:07:24.831877631 +0200
+++ b/distrib/xmlada_dom.gpr	2013-07-13 11:08:02.467876511 +0200
@@ -1,12 +1,13 @@
 with "xmlada_shared";
+with "directories";
 with "xmlada_sax";
 project XmlAda_Dom is
     for Library_Name use "xmlada_dom";
 
     for Library_Kind use Xmlada_Shared.Xmlada_Kind;
-    for Source_Dirs use ("../../include/xmlada");
+    for Source_Dirs use (Directories.Includedir & "/xmlada");
     for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
-    for Library_Dir use Xmlada_Shared.Libdir;
+    for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
     for Library_Version use
        "lib" & Project'Library_Name
        & Xmlada_Shared.So_Ext & "." & Xmlada_Shared.Version;
--- a/distrib/xmlada_sax.gpr	2013-07-13 11:08:23.201875894 +0200
+++ b/distrib/xmlada_sax.gpr	2013-07-13 11:08:58.541874843 +0200
@@ -1,13 +1,14 @@
 with "xmlada_shared";
+with "directories";
 with "xmlada_input";
 with "xmlada_unicode";
 project XmlAda_Sax is
     for Library_Name use "xmlada_sax";
 
     for Library_Kind use Xmlada_Shared.Xmlada_Kind;
-    for Source_Dirs use ("../../include/xmlada");
+    for Source_Dirs use (Directories.Includedir & "/xmlada");
     for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
-    for Library_Dir use Xmlada_Shared.Libdir;
+    for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
     for Library_Version use
        "lib" & Project'Library_Name
        & Xmlada_Shared.So_Ext & "." & Xmlada_Shared.Version;
--- a/distrib/xmlada_input.gpr	2013-07-13 11:11:33.783870225 +0200
+++ b/distrib/xmlada_input.gpr	2013-07-13 11:12:25.203868695 +0200
@@ -1,12 +1,14 @@
 with "xmlada_shared";
 with "xmlada_unicode";
+with "directories";
+
 project XmlAda_Input is
     for Library_Name use "xmlada_input_sources";
 
     for Library_Kind use Xmlada_Shared.Xmlada_Kind;
-    for Source_Dirs use ("../../include/xmlada");
+    for Source_Dirs use (Directories.Includedir & "/xmlada");
     for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
-    for Library_Dir use Xmlada_Shared.Libdir;
+    for Library_Dir use Directories.Libdir & "/xmlada/" & Project'Library_Kind;
     for Library_Version use
        "lib" & Project'Library_Name & Xmlada_Shared.So_Ext
        & "." & Xmlada_Shared.Version;
--- a/distrib/xmlada_shared.gpr.in	2013-07-13 11:12:44.145868132 +0200
+++ b/distrib/xmlada_shared.gpr.in	2013-07-13 11:13:10.165867358 +0200
@@ -1,3 +1,5 @@
+with "directories";
+
 project Xmlada_Shared is
    for Source_Dirs use ();
    Version := "@PACKAGE_VERSION@";
@@ -6,7 +8,7 @@
    Xmlada_Kind : Xmlada_Kind_Type := external ("LIBRARY_TYPE", "@DEFAULT_LIBRARY_TYPE@");
 
    --  Location for the dynamic library and ALI files
-   Libdir := "../../@LIB@/xmlada/" & Xmlada_Kind;
+   Libdir := Directories.Libdir & "/xmlada/" & Xmlada_Kind;
 
    So_Ext := "@SO_EXT@";
 end Xmlada_Shared;
--- a/distrib/xmlada_schema.gpr	2013-07-13 11:13:18.011867124 +0200
+++ b/distrib/xmlada_schema.gpr	2013-07-13 11:13:34.310866640 +0200
@@ -1,10 +1,11 @@
 with "xmlada_shared";
+with "directories";
 with "xmlada_dom";
 project XmlAda_Schema is
     for Library_Name use "xmlada_schema";
 
     for Library_Kind use Xmlada_Shared.Xmlada_Kind;
-    for Source_Dirs use ("../../include/xmlada");
+    for Source_Dirs use (Directories.Includedir & "/xmlada");
     for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
     for Library_Dir use Xmlada_Shared.Libdir;
     for Library_Version use
--- a/distrib/xmlada_unicode.gpr	2013-07-13 11:13:44.059866350 +0200
+++ b/distrib/xmlada_unicode.gpr	2013-07-13 11:14:04.463865743 +0200
@@ -1,10 +1,12 @@
 with "xmlada_shared";
+with "directories";
+
 project XmlAda_Unicode is
     for Library_Name use "xmlada_unicode";
 
     for Library_Kind use Xmlada_Shared.Xmlada_Kind;
     for Source_Dirs use ("../../include/xmlada");
-    for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
+    for Source_Dirs use (Directories.Includedir & "/xmlada");
     for Library_Dir use Xmlada_Shared.Libdir;
     for Library_Version use
        "lib" & Project'Library_Name
--- a/distrib/xmlada_unicode.gpr	2013-07-13 11:46:19.044808194 +0200
+++ b/distrib/xmlada_unicode.gpr	2013-07-13 11:46:47.855807337 +0200
@@ -5,8 +5,8 @@
     for Library_Name use "xmlada_unicode";
 
     for Library_Kind use Xmlada_Shared.Xmlada_Kind;
-    for Source_Dirs use ("../../include/xmlada");
     for Source_Dirs use (Directories.Includedir & "/xmlada");
+    for Source_List_File use "xmlada/" & Project'Library_Name & ".lgpr";
     for Library_Dir use Xmlada_Shared.Libdir;
     for Library_Version use
        "lib" & Project'Library_Name