Fix location of the include files from a fixed to relative path. Closes bug 805477