Drop %_EXT% which was always empty

15 files changed, 337 insertions, 337 deletions

diff --git a/basebmp/prj/d.lst b/basebmp/prj/d.lst
index e94118c72b9d..2dd75fa5b1c5 100644
--- a/basebmp/prj/d.lst
+++ b/basebmp/prj/d.lst
@@ -1,9 +1,9 @@
-..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib%_EXT%\ibasebmp.lib
+..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib\ibasebmp.lib
 
-..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin%_EXT%\basebmp?????.dll
+..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin\basebmp?????.dll
 
-..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib%_EXT%\libbasebmp*.*
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib\libbasebmp*.*
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
 
-mkdir: %_DEST%\inc%_EXT%\basebmp
-..\inc\basebmp\*.hxx %_DEST%\inc%_EXT%\basebmp\*.hxx
+mkdir: %_DEST%\inc\basebmp
+..\inc\basebmp\*.hxx %_DEST%\inc\basebmp\*.hxx
diff --git a/basegfx/prj/d.lst b/basegfx/prj/d.lst
index 3d4d985f3ae6..dd4a2d8aedd6 100644
--- a/basegfx/prj/d.lst
+++ b/basegfx/prj/d.lst
@@ -1,113 +1,113 @@
-..\%__SRC%\lib\ibasegfx.lib %_DEST%\lib%_EXT%\ibasegfx.lib
-..\%__SRC%\lib\basegfx_s.lib %_DEST%\lib%_EXT%\basegfx_s.lib
+..\%__SRC%\lib\ibasegfx.lib %_DEST%\lib\ibasegfx.lib
+..\%__SRC%\lib\basegfx_s.lib %_DEST%\lib\basegfx_s.lib
 
-..\%__SRC%\bin\basegfx?????.dll %_DEST%\bin%_EXT%\basegfx?????.dll
-..\%__SRC%\bin\bgfx*.dll %_DEST%\bin%_EXT%\bgfx*.dll
+..\%__SRC%\bin\basegfx?????.dll %_DEST%\bin\basegfx?????.dll
+..\%__SRC%\bin\bgfx*.dll %_DEST%\bin\bgfx*.dll
 
-..\%__SRC%\lib\libbasegfx*.* %_DEST%\lib%_EXT%\libbasegfx*.*
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\libbasegfx*.* %_DEST%\lib\libbasegfx*.*
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
 
-mkdir: %_DEST%\inc%_EXT%\basegfx
+mkdir: %_DEST%\inc\basegfx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\matrix
-..\inc\basegfx\matrix\b2dhommatrix.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b2dhommatrix.hxx
-..\inc\basegfx\matrix\b2dhommatrixtools.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b2dhommatrixtools.hxx
-..\inc\basegfx\matrix\b3dhommatrix.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b3dhommatrix.hxx
+mkdir: %_DEST%\inc\basegfx\matrix
+..\inc\basegfx\matrix\b2dhommatrix.hxx %_DEST%\inc\basegfx\matrix\b2dhommatrix.hxx
+..\inc\basegfx\matrix\b2dhommatrixtools.hxx %_DEST%\inc\basegfx\matrix\b2dhommatrixtools.hxx
+..\inc\basegfx\matrix\b3dhommatrix.hxx %_DEST%\inc\basegfx\matrix\b3dhommatrix.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\point
-..\inc\basegfx\point\b2dpoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2dpoint.hxx
-..\inc\basegfx\point\b3dpoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3dpoint.hxx
-..\inc\basegfx\point\b2ipoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2ipoint.hxx
-..\inc\basegfx\point\b3ipoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3ipoint.hxx
-..\inc\basegfx\point\b2dhompoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2dhompoint.hxx
-..\inc\basegfx\point\b3dhompoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3dhompoint.hxx
+mkdir: %_DEST%\inc\basegfx\point
+..\inc\basegfx\point\b2dpoint.hxx %_DEST%\inc\basegfx\point\b2dpoint.hxx
+..\inc\basegfx\point\b3dpoint.hxx %_DEST%\inc\basegfx\point\b3dpoint.hxx
+..\inc\basegfx\point\b2ipoint.hxx %_DEST%\inc\basegfx\point\b2ipoint.hxx
+..\inc\basegfx\point\b3ipoint.hxx %_DEST%\inc\basegfx\point\b3ipoint.hxx
+..\inc\basegfx\point\b2dhompoint.hxx %_DEST%\inc\basegfx\point\b2dhompoint.hxx
+..\inc\basegfx\point\b3dhompoint.hxx %_DEST%\inc\basegfx\point\b3dhompoint.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\range
-..\inc\basegfx\range\rangeexpander.hxx %_DEST%\inc%_EXT%\basegfx\range\rangeexpander.hxx
-..\inc\basegfx\range\basicrange.hxx %_DEST%\inc%_EXT%\basegfx\range\basicrange.hxx
-..\inc\basegfx\range\basicbox.hxx %_DEST%\inc%_EXT%\basegfx\range\basicbox.hxx
-..\inc\basegfx\range\b1drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b1drange.hxx
-..\inc\basegfx\range\b2dpolyrange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2dpolyrange.hxx
-..\inc\basegfx\range\b2drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2drange.hxx
-..\inc\basegfx\range\b2drectangle.hxx %_DEST%\inc%_EXT%\basegfx\range\b2drectangle.hxx
-..\inc\basegfx\range\b2dconnectedranges.hxx %_DEST%\inc%_EXT%\basegfx\range\b2dconnectedranges.hxx
-..\inc\basegfx\range\b3drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b3drange.hxx
-..\inc\basegfx\range\b3dvolume.hxx %_DEST%\inc%_EXT%\basegfx\range\b3dvolume.hxx
-..\inc\basegfx\range\b1irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b1irange.hxx
-..\inc\basegfx\range\b2irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2irange.hxx
-..\inc\basegfx\range\b2irectangle.hxx %_DEST%\inc%_EXT%\basegfx\range\b2irectangle.hxx
-..\inc\basegfx\range\b3irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b3irange.hxx
-..\inc\basegfx\range\b3ivolume.hxx %_DEST%\inc%_EXT%\basegfx\range\b3ivolume.hxx
-..\inc\basegfx\range\b1ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b1ibox.hxx
-..\inc\basegfx\range\b2ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b2ibox.hxx
-..\inc\basegfx\range\b3ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b3ibox.hxx
+mkdir: %_DEST%\inc\basegfx\range
+..\inc\basegfx\range\rangeexpander.hxx %_DEST%\inc\basegfx\range\rangeexpander.hxx
+..\inc\basegfx\range\basicrange.hxx %_DEST%\inc\basegfx\range\basicrange.hxx
+..\inc\basegfx\range\basicbox.hxx %_DEST%\inc\basegfx\range\basicbox.hxx
+..\inc\basegfx\range\b1drange.hxx %_DEST%\inc\basegfx\range\b1drange.hxx
+..\inc\basegfx\range\b2dpolyrange.hxx %_DEST%\inc\basegfx\range\b2dpolyrange.hxx
+..\inc\basegfx\range\b2drange.hxx %_DEST%\inc\basegfx\range\b2drange.hxx
+..\inc\basegfx\range\b2drectangle.hxx %_DEST%\inc\basegfx\range\b2drectangle.hxx
+..\inc\basegfx\range\b2dconnectedranges.hxx %_DEST%\inc\basegfx\range\b2dconnectedranges.hxx
+..\inc\basegfx\range\b3drange.hxx %_DEST%\inc\basegfx\range\b3drange.hxx
+..\inc\basegfx\range\b3dvolume.hxx %_DEST%\inc\basegfx\range\b3dvolume.hxx
+..\inc\basegfx\range\b1irange.hxx %_DEST%\inc\basegfx\range\b1irange.hxx
+..\inc\basegfx\range\b2irange.hxx %_DEST%\inc\basegfx\range\b2irange.hxx
+..\inc\basegfx\range\b2irectangle.hxx %_DEST%\inc\basegfx\range\b2irectangle.hxx
+..\inc\basegfx\range\b3irange.hxx %_DEST%\inc\basegfx\range\b3irange.hxx
+..\inc\basegfx\range\b3ivolume.hxx %_DEST%\inc\basegfx\range\b3ivolume.hxx
+..\inc\basegfx\range\b1ibox.hxx %_DEST%\inc\basegfx\range\b1ibox.hxx
+..\inc\basegfx\range\b2ibox.hxx %_DEST%\inc\basegfx\range\b2ibox.hxx
+..\inc\basegfx\range\b3ibox.hxx %_DEST%\inc\basegfx\range\b3ibox.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\vector
-..\inc\basegfx\vector\b2dvector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2dvector.hxx
-..\inc\basegfx\vector\b2enums.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2enums.hxx
-..\inc\basegfx\vector\b2dsize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2dsize.hxx
-..\inc\basegfx\vector\b3dvector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3dvector.hxx
-..\inc\basegfx\vector\b3dsize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3dsize.hxx
-..\inc\basegfx\vector\b2ivector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2ivector.hxx
-..\inc\basegfx\vector\b2isize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2isize.hxx
-..\inc\basegfx\vector\b3ivector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3ivector.hxx
-..\inc\basegfx\vector\b3isize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3isize.hxx
+mkdir: %_DEST%\inc\basegfx\vector
+..\inc\basegfx\vector\b2dvector.hxx %_DEST%\inc\basegfx\vector\b2dvector.hxx
+..\inc\basegfx\vector\b2enums.hxx %_DEST%\inc\basegfx\vector\b2enums.hxx
+..\inc\basegfx\vector\b2dsize.hxx %_DEST%\inc\basegfx\vector\b2dsize.hxx
+..\inc\basegfx\vector\b3dvector.hxx %_DEST%\inc\basegfx\vector\b3dvector.hxx
+..\inc\basegfx\vector\b3dsize.hxx %_DEST%\inc\basegfx\vector\b3dsize.hxx
+..\inc\basegfx\vector\b2ivector.hxx %_DEST%\inc\basegfx\vector\b2ivector.hxx
+..\inc\basegfx\vector\b2isize.hxx %_DEST%\inc\basegfx\vector\b2isize.hxx
+..\inc\basegfx\vector\b3ivector.hxx %_DEST%\inc\basegfx\vector\b3ivector.hxx
+..\inc\basegfx\vector\b3isize.hxx %_DEST%\inc\basegfx\vector\b3isize.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\curve
-..\inc\basegfx\curve\b2dcubicbezier.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dcubicbezier.hxx
-..\inc\basegfx\curve\b2dquadraticbezier.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dquadraticbezier.hxx
-..\inc\basegfx\curve\b2dbeziertools.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dbeziertools.hxx
+mkdir: %_DEST%\inc\basegfx\curve
+..\inc\basegfx\curve\b2dcubicbezier.hxx %_DEST%\inc\basegfx\curve\b2dcubicbezier.hxx
+..\inc\basegfx\curve\b2dquadraticbezier.hxx %_DEST%\inc\basegfx\curve\b2dquadraticbezier.hxx
+..\inc\basegfx\curve\b2dbeziertools.hxx %_DEST%\inc\basegfx\curve\b2dbeziertools.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\numeric
-..\inc\basegfx\numeric\ftools.hxx %_DEST%\inc%_EXT%\basegfx\numeric\ftools.hxx
+mkdir: %_DEST%\inc\basegfx\numeric
+..\inc\basegfx\numeric\ftools.hxx %_DEST%\inc\basegfx\numeric\ftools.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\polygon
-..\inc\basegfx\polygon\b2dpolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygon.hxx
-..\inc\basegfx\polygon\b2dpolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygon.hxx
-..\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygonfillrule.hxx
-..\inc\basegfx\polygon\b2dpolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygontools.hxx
-..\inc\basegfx\polygon\b2dpolypolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygontools.hxx
-..\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygonrasterconverter.hxx
-..\inc\basegfx\polygon\b2dlinegeometry.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dlinegeometry.hxx
-..\inc\basegfx\polygon\b2dpolygonclipper.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygonclipper.hxx
-..\inc\basegfx\polygon\b2dpolygontriangulator.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygontriangulator.hxx
-..\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygoncutandtouch.hxx
-..\inc\basegfx\polygon\b2dpolypolygoncutter.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygoncutter.hxx
-..\inc\basegfx\polygon\b2dtrapezoid.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dtrapezoid.hxx
-..\inc\basegfx\polygon\b3dpolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygon.hxx
-..\inc\basegfx\polygon\b3dpolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolypolygon.hxx
-..\inc\basegfx\polygon\b3dpolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygontools.hxx
-..\inc\basegfx\polygon\b3dpolypolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolypolygontools.hxx
-..\inc\basegfx\polygon\b3dpolygonclipper.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygonclipper.hxx
+mkdir: %_DEST%\inc\basegfx\polygon
+..\inc\basegfx\polygon\b2dpolygon.hxx %_DEST%\inc\basegfx\polygon\b2dpolygon.hxx
+..\inc\basegfx\polygon\b2dpolypolygon.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygon.hxx
+..\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx
+..\inc\basegfx\polygon\b2dpolygontools.hxx %_DEST%\inc\basegfx\polygon\b2dpolygontools.hxx
+..\inc\basegfx\polygon\b2dpolypolygontools.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygontools.hxx
+..\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx
+..\inc\basegfx\polygon\b2dlinegeometry.hxx %_DEST%\inc\basegfx\polygon\b2dlinegeometry.hxx
+..\inc\basegfx\polygon\b2dpolygonclipper.hxx %_DEST%\inc\basegfx\polygon\b2dpolygonclipper.hxx
+..\inc\basegfx\polygon\b2dpolygontriangulator.hxx %_DEST%\inc\basegfx\polygon\b2dpolygontriangulator.hxx
+..\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx %_DEST%\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx
+..\inc\basegfx\polygon\b2dpolypolygoncutter.hxx %_DEST%\inc\basegfx\polygon\b2dpolypolygoncutter.hxx
+..\inc\basegfx\polygon\b2dtrapezoid.hxx %_DEST%\inc\basegfx\polygon\b2dtrapezoid.hxx
+..\inc\basegfx\polygon\b3dpolygon.hxx %_DEST%\inc\basegfx\polygon\b3dpolygon.hxx
+..\inc\basegfx\polygon\b3dpolypolygon.hxx %_DEST%\inc\basegfx\polygon\b3dpolypolygon.hxx
+..\inc\basegfx\polygon\b3dpolygontools.hxx %_DEST%\inc\basegfx\polygon\b3dpolygontools.hxx
+..\inc\basegfx\polygon\b3dpolypolygontools.hxx %_DEST%\inc\basegfx\polygon\b3dpolypolygontools.hxx
+..\inc\basegfx\polygon\b3dpolygonclipper.hxx %_DEST%\inc\basegfx\polygon\b3dpolygonclipper.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\tuple
-..\inc\basegfx\tuple\b2dtuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2dtuple.hxx
-..\inc\basegfx\tuple\b3dtuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3dtuple.hxx
-..\inc\basegfx\tuple\b2ituple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2ituple.hxx
-..\inc\basegfx\tuple\b3ituple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3ituple.hxx
-..\inc\basegfx\tuple\b2i64tuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2i64tuple.hxx
-..\inc\basegfx\tuple\b3i64tuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3i64tuple.hxx
+mkdir: %_DEST%\inc\basegfx\tuple
+..\inc\basegfx\tuple\b2dtuple.hxx %_DEST%\inc\basegfx\tuple\b2dtuple.hxx
+..\inc\basegfx\tuple\b3dtuple.hxx %_DEST%\inc\basegfx\tuple\b3dtuple.hxx
+..\inc\basegfx\tuple\b2ituple.hxx %_DEST%\inc\basegfx\tuple\b2ituple.hxx
+..\inc\basegfx\tuple\b3ituple.hxx %_DEST%\inc\basegfx\tuple\b3ituple.hxx
+..\inc\basegfx\tuple\b2i64tuple.hxx %_DEST%\inc\basegfx\tuple\b2i64tuple.hxx
+..\inc\basegfx\tuple\b3i64tuple.hxx %_DEST%\inc\basegfx\tuple\b3i64tuple.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\tools
-..\inc\basegfx\tools\canvastools.hxx %_DEST%\inc%_EXT%\basegfx\tools\canvastools.hxx
-..\inc\basegfx\tools\keystoplerp.hxx %_DEST%\inc%_EXT%\basegfx\tools\keystoplerp.hxx
-..\inc\basegfx\tools\lerp.hxx %_DEST%\inc%_EXT%\basegfx\tools\lerp.hxx
-..\inc\basegfx\tools\unopolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\tools\unopolypolygon.hxx
-..\inc\basegfx\tools\b2dclipstate.hxx %_DEST%\inc%_EXT%\basegfx\tools\b2dclipstate.hxx
-..\inc\basegfx\tools\rectcliptools.hxx %_DEST%\inc%_EXT%\basegfx\tools\rectcliptools.hxx
-..\inc\basegfx\tools\tools.hxx %_DEST%\inc%_EXT%\basegfx\tools\tools.hxx
-..\inc\basegfx\tools\gradienttools.hxx %_DEST%\inc%_EXT%\basegfx\tools\gradienttools.hxx
+mkdir: %_DEST%\inc\basegfx\tools
+..\inc\basegfx\tools\canvastools.hxx %_DEST%\inc\basegfx\tools\canvastools.hxx
+..\inc\basegfx\tools\keystoplerp.hxx %_DEST%\inc\basegfx\tools\keystoplerp.hxx
+..\inc\basegfx\tools\lerp.hxx %_DEST%\inc\basegfx\tools\lerp.hxx
+..\inc\basegfx\tools\unopolypolygon.hxx %_DEST%\inc\basegfx\tools\unopolypolygon.hxx
+..\inc\basegfx\tools\b2dclipstate.hxx %_DEST%\inc\basegfx\tools\b2dclipstate.hxx
+..\inc\basegfx\tools\rectcliptools.hxx %_DEST%\inc\basegfx\tools\rectcliptools.hxx
+..\inc\basegfx\tools\tools.hxx %_DEST%\inc\basegfx\tools\tools.hxx
+..\inc\basegfx\tools\gradienttools.hxx %_DEST%\inc\basegfx\tools\gradienttools.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\color
-..\inc\basegfx\color\bcolor.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolor.hxx
-..\inc\basegfx\color\bcolortools.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolortools.hxx
-..\inc\basegfx\color\bcolormodifier.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolormodifier.hxx
+mkdir: %_DEST%\inc\basegfx\color
+..\inc\basegfx\color\bcolor.hxx %_DEST%\inc\basegfx\color\bcolor.hxx
+..\inc\basegfx\color\bcolortools.hxx %_DEST%\inc\basegfx\color\bcolortools.hxx
+..\inc\basegfx\color\bcolormodifier.hxx %_DEST%\inc\basegfx\color\bcolormodifier.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\pixel
-..\inc\basegfx\pixel\bpixel.hxx %_DEST%\inc%_EXT%\basegfx\pixel\bpixel.hxx
-..\inc\basegfx\pixel\bzpixel.hxx %_DEST%\inc%_EXT%\basegfx\pixel\bzpixel.hxx
+mkdir: %_DEST%\inc\basegfx\pixel
+..\inc\basegfx\pixel\bpixel.hxx %_DEST%\inc\basegfx\pixel\bpixel.hxx
+..\inc\basegfx\pixel\bzpixel.hxx %_DEST%\inc\basegfx\pixel\bzpixel.hxx
 
-mkdir: %_DEST%\inc%_EXT%\basegfx\raster
-..\inc\basegfx\raster\bpixelraster.hxx %_DEST%\inc%_EXT%\basegfx\raster\bpixelraster.hxx
-..\inc\basegfx\raster\bzpixelraster.hxx %_DEST%\inc%_EXT%\basegfx\raster\bzpixelraster.hxx
-..\inc\basegfx\raster\rasterconvert3d.hxx %_DEST%\inc%_EXT%\basegfx\raster\rasterconvert3d.hxx
+mkdir: %_DEST%\inc\basegfx\raster
+..\inc\basegfx\raster\bpixelraster.hxx %_DEST%\inc\basegfx\raster\bpixelraster.hxx
+..\inc\basegfx\raster\bzpixelraster.hxx %_DEST%\inc\basegfx\raster\bzpixelraster.hxx
+..\inc\basegfx\raster\rasterconvert3d.hxx %_DEST%\inc\basegfx\raster\rasterconvert3d.hxx
diff --git a/canvas/prj/d.lst b/canvas/prj/d.lst
index 701b9967f92a..8c4a583f8e75 100644
--- a/canvas/prj/d.lst
+++ b/canvas/prj/d.lst
@@ -1,33 +1,33 @@
-..\%__SRC%\bin\canvasto*.dll %_DEST%\bin%_EXT%\canvasto*.dll
-..\%__SRC%\bin\cairocan*.dll %_DEST%\bin%_EXT%\cairocan*.dll
-..\%__SRC%\bin\directx*.dll  %_DEST%\bin%_EXT%\directx*.dll
-..\%__SRC%\bin\gdiplus*.dll  %_DEST%\bin%_EXT%\gdiplus*.dll
-..\%__SRC%\bin\vclcanva*.dll %_DEST%\bin%_EXT%\vclcanva*.dll
-..\%__SRC%\bin\nullcanv*.dll %_DEST%\bin%_EXT%\nullcanv*.dll
-..\%__SRC%\bin\simpleca*.dll %_DEST%\bin%_EXT%\simpleca*.dll
-..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin%_EXT%\canvasfa*.dll
-..\%__SRC%\lib\icanvastools.lib %_DEST%\lib%_EXT%\icanvastools.lib
-..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib%_EXT%\
-..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib%_EXT%\cairocanvas.uno.so
-..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib%_EXT%\vclcanvas.uno.so
-..\%__SRC%\lib\nullcanvas.uno.so %_DEST%\lib%_EXT%\nullcanvas.uno.so
-..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib%_EXT%\simplecanvas.uno.so
-..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib%_EXT%\canvasfactory.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin%_EXT%\javacanvas.uno.jar
-..\%__SRC%\misc\cairocanvas.component %_DEST%\xml%_EXT%\cairocanvas.component
+..\%__SRC%\bin\canvasto*.dll %_DEST%\bin\canvasto*.dll
+..\%__SRC%\bin\cairocan*.dll %_DEST%\bin\cairocan*.dll
+..\%__SRC%\bin\directx*.dll  %_DEST%\bin\directx*.dll
+..\%__SRC%\bin\gdiplus*.dll  %_DEST%\bin\gdiplus*.dll
+..\%__SRC%\bin\vclcanva*.dll %_DEST%\bin\vclcanva*.dll
+..\%__SRC%\bin\nullcanv*.dll %_DEST%\bin\nullcanv*.dll
+..\%__SRC%\bin\simpleca*.dll %_DEST%\bin\simpleca*.dll
+..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin\canvasfa*.dll
+..\%__SRC%\lib\icanvastools.lib %_DEST%\lib\icanvastools.lib
+..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib\
+..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib\cairocanvas.uno.so
+..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib\vclcanvas.uno.so
+..\%__SRC%\lib\nullcanvas.uno.so %_DEST%\lib\nullcanvas.uno.so
+..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib\simplecanvas.uno.so
+..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib\canvasfactory.uno.so
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin\javacanvas.uno.jar
+..\%__SRC%\misc\cairocanvas.component %_DEST%\xml\cairocanvas.component
 
-mkdir: %_DEST%\inc%_EXT%\canvas\base
-..\inc\canvas\base\*.hxx %_DEST%\inc%_EXT%\canvas\base\*.hxx
+mkdir: %_DEST%\inc\canvas\base
+..\inc\canvas\base\*.hxx %_DEST%\inc\canvas\base\*.hxx
 
-mkdir: %_DEST%\inc%_EXT%\canvas\rendering
-..\inc\canvas\rendering\*.hxx %_DEST%\inc%_EXT%\canvas\rendering\*.hxx
+mkdir: %_DEST%\inc\canvas\rendering
+..\inc\canvas\rendering\*.hxx %_DEST%\inc\canvas\rendering\*.hxx
 
-mkdir: %_DEST%\inc%_EXT%\canvas
-..\inc\canvas\*.hxx %_DEST%\inc%_EXT%\canvas\*.hxx
-..\%__SRC%\misc\canvasfactory.component %_DEST%\xml%_EXT%\canvasfactory.component
-..\%__SRC%\misc\directx5canvas.component %_DEST%\xml%_EXT%\directx5canvas.component
-..\%__SRC%\misc\directx9canvas.component %_DEST%\xml%_EXT%\directx9canvas.component
-..\%__SRC%\misc\gdipluscanvas.component %_DEST%\xml%_EXT%\gdipluscanvas.component
-..\%__SRC%\misc\simplecanvas.component %_DEST%\xml%_EXT%\simplecanvas.component
-..\%__SRC%\misc\vclcanvas.component %_DEST%\xml%_EXT%\vclcanvas.component
+mkdir: %_DEST%\inc\canvas
+..\inc\canvas\*.hxx %_DEST%\inc\canvas\*.hxx
+..\%__SRC%\misc\canvasfactory.component %_DEST%\xml\canvasfactory.component
+..\%__SRC%\misc\directx5canvas.component %_DEST%\xml\directx5canvas.component
+..\%__SRC%\misc\directx9canvas.component %_DEST%\xml\directx9canvas.component
+..\%__SRC%\misc\gdipluscanvas.component %_DEST%\xml\gdipluscanvas.component
+..\%__SRC%\misc\simplecanvas.component %_DEST%\xml\simplecanvas.component
+..\%__SRC%\misc\vclcanvas.component %_DEST%\xml\vclcanvas.component
diff --git a/cppcanvas/prj/d.lst b/cppcanvas/prj/d.lst
index 7ed2d10bad26..7b998d9855e9 100644
--- a/cppcanvas/prj/d.lst
+++ b/cppcanvas/prj/d.lst
@@ -1,20 +1,20 @@
-..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin%_EXT%\cppcanv*.dll
-..\%__SRC%\bin\mtfrenderer*.dll %_DEST%\bin%_EXT%\mtfrenderer*.dll
-..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib%_EXT%\icppcanvas.lib
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin\cppcanv*.dll
+..\%__SRC%\bin\mtfrenderer*.dll %_DEST%\bin\mtfrenderer*.dll
+..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib\icppcanvas.lib
+..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
 
-mkdir: %_DEST%\inc%_EXT%\cppcanvas
-..\inc\cppcanvas\bitmap.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmap.hxx
-..\inc\cppcanvas\bitmapcanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmapcanvas.hxx
-..\inc\cppcanvas\canvas.hxx %_DEST%\inc%_EXT%\cppcanvas\canvas.hxx
-..\inc\cppcanvas\canvasgraphic.hxx %_DEST%\inc%_EXT%\cppcanvas\canvasgraphic.hxx
-..\inc\cppcanvas\color.hxx %_DEST%\inc%_EXT%\cppcanvas\color.hxx
-..\inc\cppcanvas\customsprite.hxx %_DEST%\inc%_EXT%\cppcanvas\customsprite.hxx
-..\inc\cppcanvas\font.hxx %_DEST%\inc%_EXT%\cppcanvas\font.hxx
-..\inc\cppcanvas\polypolygon.hxx %_DEST%\inc%_EXT%\cppcanvas\polypolygon.hxx
-..\inc\cppcanvas\renderer.hxx %_DEST%\inc%_EXT%\cppcanvas\renderer.hxx
-..\inc\cppcanvas\sprite.hxx %_DEST%\inc%_EXT%\cppcanvas\sprite.hxx
-..\inc\cppcanvas\spritecanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\spritecanvas.hxx
-..\inc\cppcanvas\text.hxx %_DEST%\inc%_EXT%\cppcanvas\text.hxx
-..\inc\cppcanvas\vclfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\vclfactory.hxx
-..\inc\cppcanvas\basegfxfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\basegfxfactory.hxx
+mkdir: %_DEST%\inc\cppcanvas
+..\inc\cppcanvas\bitmap.hxx %_DEST%\inc\cppcanvas\bitmap.hxx
+..\inc\cppcanvas\bitmapcanvas.hxx %_DEST%\inc\cppcanvas\bitmapcanvas.hxx
+..\inc\cppcanvas\canvas.hxx %_DEST%\inc\cppcanvas\canvas.hxx
+..\inc\cppcanvas\canvasgraphic.hxx %_DEST%\inc\cppcanvas\canvasgraphic.hxx
+..\inc\cppcanvas\color.hxx %_DEST%\inc\cppcanvas\color.hxx
+..\inc\cppcanvas\customsprite.hxx %_DEST%\inc\cppcanvas\customsprite.hxx
+..\inc\cppcanvas\font.hxx %_DEST%\inc\cppcanvas\font.hxx
+..\inc\cppcanvas\polypolygon.hxx %_DEST%\inc\cppcanvas\polypolygon.hxx
+..\inc\cppcanvas\renderer.hxx %_DEST%\inc\cppcanvas\renderer.hxx
+..\inc\cppcanvas\sprite.hxx %_DEST%\inc\cppcanvas\sprite.hxx
+..\inc\cppcanvas\spritecanvas.hxx %_DEST%\inc\cppcanvas\spritecanvas.hxx
+..\inc\cppcanvas\text.hxx %_DEST%\inc\cppcanvas\text.hxx
+..\inc\cppcanvas\vclfactory.hxx %_DEST%\inc\cppcanvas\vclfactory.hxx
+..\inc\cppcanvas\basegfxfactory.hxx %_DEST%\inc\cppcanvas\basegfxfactory.hxx
diff --git a/dtrans/prj/d.lst b/dtrans/prj/d.lst
index 955aa075f24b..d2332c2802ea 100644
--- a/dtrans/prj/d.lst
+++ b/dtrans/prj/d.lst
@@ -1,14 +1,14 @@
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\lib\lib*.so %_DEST%\lib
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
 
-..\source\win32\clipb\sysdtrans.xml %_DEST%\xml%_EXT%\sysdtrans.xml
-..\source\win32\dnd\dnd.xml %_DEST%\xml%_EXT%\dnd.xml
-..\source\win32\ftransl\ftransl.xml %_DEST%\xml%_EXT%\ftransl.xml
-..\source\cnttype\mcnttype.xml %_DEST%\xml%_EXT%\mcnttype.xml
-..\source\generic\dtrans.xml %_DEST%\xml%_EXT%\dtrans.xml
-..\%__SRC%\misc\dnd.component %_DEST%\xml%_EXT%\dnd.component
-..\%__SRC%\misc\dtrans.component %_DEST%\xml%_EXT%\dtrans.component
-..\%__SRC%\misc\ftransl.component %_DEST%\xml%_EXT%\ftransl.component
-..\%__SRC%\misc\mcnttype.component %_DEST%\xml%_EXT%\mcnttype.component
-..\%__SRC%\misc\sysdtrans.component %_DEST%\xml%_EXT%\sysdtrans.component
+..\source\win32\clipb\sysdtrans.xml %_DEST%\xml\sysdtrans.xml
+..\source\win32\dnd\dnd.xml %_DEST%\xml\dnd.xml
+..\source\win32\ftransl\ftransl.xml %_DEST%\xml\ftransl.xml
+..\source\cnttype\mcnttype.xml %_DEST%\xml\mcnttype.xml
+..\source\generic\dtrans.xml %_DEST%\xml\dtrans.xml
+..\%__SRC%\misc\dnd.component %_DEST%\xml\dnd.component
+..\%__SRC%\misc\dtrans.component %_DEST%\xml\dtrans.component
+..\%__SRC%\misc\ftransl.component %_DEST%\xml\ftransl.component
+..\%__SRC%\misc\mcnttype.component %_DEST%\xml\mcnttype.component
+..\%__SRC%\misc\sysdtrans.component %_DEST%\xml\sysdtrans.component
diff --git a/i18npool/prj/d.lst b/i18npool/prj/d.lst
index 8d27137424a9..71e0ae3b4758 100644
--- a/i18npool/prj/d.lst
+++ b/i18npool/prj/d.lst
@@ -1,50 +1,50 @@
-mkdir: %_DEST%\xml%_EXT%
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
+mkdir: %_DEST%\xml
+..\xml\*.xml %_DEST%\xml\*.xml
 
-mkdir: %_DEST%\inc%_EXT%\i18npool
+mkdir: %_DEST%\inc\i18npool
 
-..\inc\i18npool\*.* %_DEST%\inc%_EXT%\i18npool\*.*
+..\inc\i18npool\*.* %_DEST%\inc\i18npool\*.*
 
-..\%__SRC%\bin\i18npoo*.dll %_DEST%\bin%_EXT%\i18npoo*.dll
-..\%__SRC%\lib\i18npool.uno.so %_DEST%\lib%_EXT%\i18npool.uno.so
-..\%__SRC%\lib\i18npool.uno.dylib %_DEST%\lib%_EXT%\i18npool.uno.dylib
+..\%__SRC%\bin\i18npoo*.dll %_DEST%\bin\i18npoo*.dll
+..\%__SRC%\lib\i18npool.uno.so %_DEST%\lib\i18npool.uno.so
+..\%__SRC%\lib\i18npool.uno.dylib %_DEST%\lib\i18npool.uno.dylib
 
-..\%__SRC%\bin\i18nsea*.dll %_DEST%\bin%_EXT%\i18nsea*.dll
-..\%__SRC%\lib\i18nsearch.uno.so %_DEST%\lib%_EXT%\i18nsearch.uno.so
-..\%__SRC%\lib\i18nsearch.uno.dylib %_DEST%\lib%_EXT%\i18nsearch.uno.dylib
+..\%__SRC%\bin\i18nsea*.dll %_DEST%\bin\i18nsea*.dll
+..\%__SRC%\lib\i18nsearch.uno.so %_DEST%\lib\i18nsearch.uno.so
+..\%__SRC%\lib\i18nsearch.uno.dylib %_DEST%\lib\i18nsearch.uno.dylib
 
-..\%__SRC%\bin\localedata_*.dll %_DEST%\bin%_EXT%\localedata_*.dll
-..\%__SRC%\bin\ld_*.dll %_DEST%\bin%_EXT%\ld_*.dll
-..\%__SRC%\lib\liblocaledata_*.so %_DEST%\lib%_EXT%\liblocaledata_*.so
-..\%__SRC%\lib\liblocaledata_*.dylib %_DEST%\lib%_EXT%\liblocaledata_*.dylib
+..\%__SRC%\bin\localedata_*.dll %_DEST%\bin\localedata_*.dll
+..\%__SRC%\bin\ld_*.dll %_DEST%\bin\ld_*.dll
+..\%__SRC%\lib\liblocaledata_*.so %_DEST%\lib\liblocaledata_*.so
+..\%__SRC%\lib\liblocaledata_*.dylib %_DEST%\lib\liblocaledata_*.dylib
 
-..\%__SRC%\bin\dict_*.dll %_DEST%\bin%_EXT%\dict_*.dll
-..\%__SRC%\lib\libdict_*.so %_DEST%\lib%_EXT%\libdict_*.so
-..\%__SRC%\lib\libdict_*.dylib %_DEST%\lib%_EXT%\libdict_*.dylib
+..\%__SRC%\bin\dict_*.dll %_DEST%\bin\dict_*.dll
+..\%__SRC%\lib\libdict_*.so %_DEST%\lib\libdict_*.so
+..\%__SRC%\lib\libdict_*.dylib %_DEST%\lib\libdict_*.dylib
 
-..\%__SRC%\bin\collator*.dll %_DEST%\bin%_EXT%\collator*.dll
-..\%__SRC%\lib\libcollator_data.so %_DEST%\lib%_EXT%\libcollator_data.so
-..\%__SRC%\lib\libcollator_data.dylib %_DEST%\lib%_EXT%\libcollator_data.dylib
+..\%__SRC%\bin\collator*.dll %_DEST%\bin\collator*.dll
+..\%__SRC%\lib\libcollator_data.so %_DEST%\lib\libcollator_data.so
+..\%__SRC%\lib\libcollator_data.dylib %_DEST%\lib\libcollator_data.dylib
 
-..\%__SRC%\bin\index_da*.dll %_DEST%\bin%_EXT%\index_da*.dll
-..\%__SRC%\lib\libindex_data.so %_DEST%\lib%_EXT%\libindex_data.so
-..\%__SRC%\lib\libindex_data.dylib %_DEST%\lib%_EXT%\libindex_data.dylib
+..\%__SRC%\bin\index_da*.dll %_DEST%\bin\index_da*.dll
+..\%__SRC%\lib\libindex_data.so %_DEST%\lib\libindex_data.so
+..\%__SRC%\lib\libindex_data.dylib %_DEST%\lib\libindex_data.dylib
 
-..\%__SRC%\bin\textconv*.dll %_DEST%\bin%_EXT%\textconv*.dll
-..\%__SRC%\lib\libtextconv_dict.so %_DEST%\lib%_EXT%\libtextconv_dict.so
-..\%__SRC%\lib\libtextconv_dict.dylib %_DEST%\lib%_EXT%\libtextconv_dict.dylib
+..\%__SRC%\bin\textconv*.dll %_DEST%\bin\textconv*.dll
+..\%__SRC%\lib\libtextconv_dict.so %_DEST%\lib\libtextconv_dict.so
+..\%__SRC%\lib\libtextconv_dict.dylib %_DEST%\lib\libtextconv_dict.dylib
 
-..\version.mk  %_DEST%\inc%_EXT%\i18npool\version.mk
+..\version.mk  %_DEST%\inc\i18npool\version.mk
 
-..\%__SRC%\lib\ii18nisolang*.lib %_DEST%\lib%_EXT%\ii18nisolang*.lib
-..\%__SRC%\bin\i18nisol*.dll %_DEST%\bin%_EXT%\i18nisol*.dll
-..\%__SRC%\lib\libi18nisolang*.so %_DEST%\lib%_EXT%\libi18nisolang*.so
-..\%__SRC%\lib\libi18nisolang*.dylib %_DEST%\lib%_EXT%\libi18nisolang*.dylib
+..\%__SRC%\lib\ii18nisolang*.lib %_DEST%\lib\ii18nisolang*.lib
+..\%__SRC%\bin\i18nisol*.dll %_DEST%\bin\i18nisol*.dll
+..\%__SRC%\lib\libi18nisolang*.so %_DEST%\lib\libi18nisolang*.so
+..\%__SRC%\lib\libi18nisolang*.dylib %_DEST%\lib\libi18nisolang*.dylib
 
-..\%__SRC%\lib\ii18npaper*.lib %_DEST%\lib%_EXT%\ii18npaper*.lib
-..\%__SRC%\bin\i18npaper*.dll %_DEST%\bin%_EXT%\i18npaper*.dll
-..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib%_EXT%\libi18npaper*.so
-..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib%_EXT%\libi18npaper*.dylib
+..\%__SRC%\lib\ii18npaper*.lib %_DEST%\lib\ii18npaper*.lib
+..\%__SRC%\bin\i18npaper*.dll %_DEST%\bin\i18npaper*.dll
+..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib\libi18npaper*.so
+..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib\libi18npaper*.dylib
 
-..\%__SRC%\misc\i18npool.component %_DEST%\xml%_EXT%\i18npool.component
-..\%__SRC%\misc\i18nsearch.component %_DEST%\xml%_EXT%\i18nsearch.component
+..\%__SRC%\misc\i18npool.component %_DEST%\xml\i18npool.component
+..\%__SRC%\misc\i18nsearch.component %_DEST%\xml\i18nsearch.component
diff --git a/i18nutil/prj/d.lst b/i18nutil/prj/d.lst
index b992b05f41df..fd6c2683cb35 100644
--- a/i18nutil/prj/d.lst
+++ b/i18nutil/prj/d.lst
@@ -1,13 +1,13 @@
 
-mkdir: %_DEST%\inc%_EXT%\i18nutil
+mkdir: %_DEST%\inc\i18nutil
 
-..\inc\i18nutil\casefolding.hxx %_DEST%\inc%_EXT%\i18nutil\casefolding.hxx
-..\inc\i18nutil\oneToOneMapping.hxx %_DEST%\inc%_EXT%\i18nutil\oneToOneMapping.hxx
-..\inc\i18nutil\unicode.hxx %_DEST%\inc%_EXT%\i18nutil\unicode.hxx
-..\inc\i18nutil\widthfolding.hxx %_DEST%\inc%_EXT%\i18nutil\widthfolding.hxx
-..\inc\i18nutil\x_rtl_ustring.h %_DEST%\inc%_EXT%\i18nutil\x_rtl_ustring.h
+..\inc\i18nutil\casefolding.hxx %_DEST%\inc\i18nutil\casefolding.hxx
+..\inc\i18nutil\oneToOneMapping.hxx %_DEST%\inc\i18nutil\oneToOneMapping.hxx
+..\inc\i18nutil\unicode.hxx %_DEST%\inc\i18nutil\unicode.hxx
+..\inc\i18nutil\widthfolding.hxx %_DEST%\inc\i18nutil\widthfolding.hxx
+..\inc\i18nutil\x_rtl_ustring.h %_DEST%\inc\i18nutil\x_rtl_ustring.h
 
-..\%__SRC%\bin\i18nutil*.dll %_DEST%\bin%_EXT%\i18nutil*.dll
-..\%__SRC%\lib\libi18nutil*.so %_DEST%\lib%_EXT%\libi18nutil*.so
-..\%__SRC%\lib\libi18nutil*.dylib %_DEST%\lib%_EXT%\libi18nutil*.dylib
-..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib
+..\%__SRC%\bin\i18nutil*.dll %_DEST%\bin\i18nutil*.dll
+..\%__SRC%\lib\libi18nutil*.so %_DEST%\lib\libi18nutil*.so
+..\%__SRC%\lib\libi18nutil*.dylib %_DEST%\lib\libi18nutil*.dylib
+..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib\ii18nutil.lib
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index 5aedd5f1b050..f2051d79068a 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -1,54 +1,54 @@
-mkdir: %_DEST%\inc%_EXT%\l10ntools
-mkdir: %_DEST%\bin%_EXT%
-mkdir: %_DEST%\bin%_EXT%\help
-mkdir: %_DEST%\bin%_EXT%\help\com
-mkdir: %_DEST%\bin%_EXT%\help\com\sun
-mkdir: %_DEST%\bin%_EXT%\help\com\sun\star
-mkdir: %_DEST%\bin%_EXT%\help\com\sun\star\help
+mkdir: %_DEST%\inc\l10ntools
+mkdir: %_DEST%\bin
+mkdir: %_DEST%\bin\help
+mkdir: %_DEST%\bin\help\com
+mkdir: %_DEST%\bin\help\com\sun
+mkdir: %_DEST%\bin\help\com\sun\star
+mkdir: %_DEST%\bin\help\com\sun\star\help
 
-..\%__SRC%\bin\cfgex.exe %_DEST%\bin%_EXT%\cfgex.exe
-..\%__SRC%\bin\cfgex %_DEST%\bin%_EXT%\cfgex
-..\%__SRC%\bin\transex3.exe %_DEST%\bin%_EXT%\transex3.exe
-..\%__SRC%\bin\transex3 %_DEST%\bin%_EXT%\transex3
-..\%__SRC%\bin\lngex.exe %_DEST%\bin%_EXT%\lngex.exe
-..\%__SRC%\bin\lngex %_DEST%\bin%_EXT%\lngex
-..\%__SRC%\bin\localize_sl.exe %_DEST%\bin%_EXT%\localize_sl.exe
-..\%__SRC%\bin\localize_sl %_DEST%\bin%_EXT%\localize_sl
-..\%__SRC%\bin\xrmex.exe %_DEST%\bin%_EXT%\xrmex.exe
-..\%__SRC%\bin\xrmex %_DEST%\bin%_EXT%\xrmex
-..\%__SRC%\bin\gsicheck.exe %_DEST%\bin%_EXT%\gsicheck.exe
-..\%__SRC%\bin\gsicheck %_DEST%\bin%_EXT%\gsicheck
-..\%__SRC%\bin\helpex.exe %_DEST%\bin%_EXT%\helpex.exe
-..\%__SRC%\bin\helpex %_DEST%\bin%_EXT%\helpex
-..\%__SRC%\bin\ulfex.exe %_DEST%\bin%_EXT%\ulfex.exe
-..\%__SRC%\bin\ulfex %_DEST%\bin%_EXT%\ulfex
-..\%__SRC%\bin\txtconv.exe %_DEST%\bin%_EXT%\txtconv.exe
-..\%__SRC%\bin\txtconv %_DEST%\bin%_EXT%\txtconv
-..\%__SRC%\bin\tralay.exe %_DEST%\bin%_EXT%\tralay.exe
-..\%__SRC%\bin\tralay %_DEST%\bin%_EXT%\tralay
-..\%__SRC%\bin\ulfconv %_DEST%\bin%_EXT%\ulfconv
-..\%__SRC%\class\FCFGMerge.jar %_DEST%\bin%_EXT%\FCFGMerge.jar
-..\%__SRC%\class\HelpIndexerTool.jar %_DEST%\bin%_EXT%\HelpIndexerTool.jar
-..\%__SRC%\class\jpropex\jpropex.jar %_DEST%\bin%_EXT%\jpropex.jar
-..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
-..\%__SRC%\bin\HelpCompiler %_DEST%\bin%_EXT%\HelpCompiler
-..\%__SRC%\bin\HelpCompiler.exe %_DEST%\bin%_EXT%\HelpCompiler.exe
-..\%__SRC%\bin\HelpLinker.exe %_DEST%\bin%_EXT%\HelpLinker.exe
-..\%__SRC%\bin\HelpLinker* %_DEST%\bin%_EXT%
+..\%__SRC%\bin\cfgex.exe %_DEST%\bin\cfgex.exe
+..\%__SRC%\bin\cfgex %_DEST%\bin\cfgex
+..\%__SRC%\bin\transex3.exe %_DEST%\bin\transex3.exe
+..\%__SRC%\bin\transex3 %_DEST%\bin\transex3
+..\%__SRC%\bin\lngex.exe %_DEST%\bin\lngex.exe
+..\%__SRC%\bin\lngex %_DEST%\bin\lngex
+..\%__SRC%\bin\localize_sl.exe %_DEST%\bin\localize_sl.exe
+..\%__SRC%\bin\localize_sl %_DEST%\bin\localize_sl
+..\%__SRC%\bin\xrmex.exe %_DEST%\bin\xrmex.exe
+..\%__SRC%\bin\xrmex %_DEST%\bin\xrmex
+..\%__SRC%\bin\gsicheck.exe %_DEST%\bin\gsicheck.exe
+..\%__SRC%\bin\gsicheck %_DEST%\bin\gsicheck
+..\%__SRC%\bin\helpex.exe %_DEST%\bin\helpex.exe
+..\%__SRC%\bin\helpex %_DEST%\bin\helpex
+..\%__SRC%\bin\ulfex.exe %_DEST%\bin\ulfex.exe
+..\%__SRC%\bin\ulfex %_DEST%\bin\ulfex
+..\%__SRC%\bin\txtconv.exe %_DEST%\bin\txtconv.exe
+..\%__SRC%\bin\txtconv %_DEST%\bin\txtconv
+..\%__SRC%\bin\tralay.exe %_DEST%\bin\tralay.exe
+..\%__SRC%\bin\tralay %_DEST%\bin\tralay
+..\%__SRC%\bin\ulfconv %_DEST%\bin\ulfconv
+..\%__SRC%\class\FCFGMerge.jar %_DEST%\bin\FCFGMerge.jar
+..\%__SRC%\class\HelpIndexerTool.jar %_DEST%\bin\HelpIndexerTool.jar
+..\%__SRC%\class\jpropex\jpropex.jar %_DEST%\bin\jpropex.jar
+..\%__SRC%\bin\HelpLinker %_DEST%\bin\HelpLinker
+..\%__SRC%\bin\HelpCompiler %_DEST%\bin\HelpCompiler
+..\%__SRC%\bin\HelpCompiler.exe %_DEST%\bin\HelpCompiler.exe
+..\%__SRC%\bin\HelpLinker.exe %_DEST%\bin\HelpLinker.exe
+..\%__SRC%\bin\HelpLinker* %_DEST%\bin
 
-..\scripts\localize.pl %_DEST%\bin%_EXT%\localize.pl
-..\scripts\localize %_DEST%\bin%_EXT%\localize
-..\scripts\fast_merge.pl %_DEST%\bin%_EXT%\fast_merge.pl
-..\scripts\keyidGen.pl %_DEST%\bin%_EXT%\keyidGen.pl
-..\inc\export.hxx %_DEST%\inc%_EXT%\l10ntools\export.hxx
-..\inc\l10ntools\directory.hxx %_DEST%\inc%_EXT%\l10ntools\directory.hxx
-..\inc\l10ntools\file.hxx %_DEST%\inc%_EXT%\l10ntools\file.hxx
-..\inc\l10ntools\vosapp.hxx %_DEST%\inc%_EXT%\l10ntools\vosapp.hxx
-..\source\filter\merge\FCFGMerge.cfg  %_DEST%\inc%_EXT%\l10ntools\FCFGMerge.cfg
+..\scripts\localize.pl %_DEST%\bin\localize.pl
+..\scripts\localize %_DEST%\bin\localize
+..\scripts\fast_merge.pl %_DEST%\bin\fast_merge.pl
+..\scripts\keyidGen.pl %_DEST%\bin\keyidGen.pl
+..\inc\export.hxx %_DEST%\inc\l10ntools\export.hxx
+..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
+..\inc\l10ntools\file.hxx %_DEST%\inc\l10ntools\file.hxx
+..\inc\l10ntools\vosapp.hxx %_DEST%\inc\l10ntools\vosapp.hxx
+..\source\filter\merge\FCFGMerge.cfg  %_DEST%\inc\l10ntools\FCFGMerge.cfg
 
-..\%__SRC%\lib\transex.lib %_DEST%\lib%_EXT%\transex.lib
-..\%__SRC%\lib\libtransex.a %_DEST%\lib%_EXT%\libtransex.a
+..\%__SRC%\lib\transex.lib %_DEST%\lib\transex.lib
+..\%__SRC%\lib\libtransex.a %_DEST%\lib\libtransex.a
 
-..\source\help\compilehelp.hxx %_DEST%\inc%_EXT%\l10ntools\compilehelp.hxx
-..\%__SRC%\lib\* %_DEST%\lib%_EXT%\*
-..\%__SRC%\class\com\sun\star\help\* %_DEST%\bin%_EXT%\help\com\sun\star\help\*
+..\source\help\compilehelp.hxx %_DEST%\inc\l10ntools\compilehelp.hxx
+..\%__SRC%\lib\* %_DEST%\lib\*
+..\%__SRC%\class\com\sun\star\help\* %_DEST%\bin\help\com\sun\star\help\*
diff --git a/o3tl/prj/d.lst b/o3tl/prj/d.lst
index c15d38d1ca02..f0090a5d0ee7 100644
--- a/o3tl/prj/d.lst
+++ b/o3tl/prj/d.lst
@@ -1,2 +1,2 @@
-mkdir: %_DEST%\inc%_EXT%\o3tl
-..\inc\o3tl\*.hxx %_DEST%\inc%_EXT%\o3tl\*.hxx
+mkdir: %_DEST%\inc\o3tl
+..\inc\o3tl\*.hxx %_DEST%\inc\o3tl\*.hxx
diff --git a/psprint_config/prj/d.lst b/psprint_config/prj/d.lst
index b828f50a9561..f3886a148fdd 100644
--- a/psprint_config/prj/d.lst
+++ b/psprint_config/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %COMMON_DEST%\pck%_EXT%
+mkdir: %COMMON_DEST%\pck
 
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip
 
diff --git a/regexp/prj/d.lst b/regexp/prj/d.lst
index 79d16ef76ff0..fadeaf70053d 100644
--- a/regexp/prj/d.lst
+++ b/regexp/prj/d.lst
@@ -1,8 +1,8 @@
-mkdir: %_DEST%\inc%_EXT%\external\regexp
+mkdir: %_DEST%\inc\external\regexp
 
-..\source\reclass.hxx %_DEST%\inc%_EXT%\external\regexp\reclass.hxx
+..\source\reclass.hxx %_DEST%\inc\external\regexp\reclass.hxx
 
-..\%__SRC%\bin\i18nrege*.dll %_DEST%\bin%_EXT%\i18nrege*.dll
-..\%__SRC%\lib\libi18nregexp*.so %_DEST%\lib%_EXT%\libi18nregexp*.so
-..\%__SRC%\lib\libi18nregexp*.dylib %_DEST%\lib%_EXT%\libi18nregexp*.dylib
-..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib%_EXT%\ii18nregexp.lib
+..\%__SRC%\bin\i18nrege*.dll %_DEST%\bin\i18nrege*.dll
+..\%__SRC%\lib\libi18nregexp*.so %_DEST%\lib\libi18nregexp*.so
+..\%__SRC%\lib\libi18nregexp*.dylib %_DEST%\lib\libi18nregexp*.dylib
+..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib\ii18nregexp.lib
diff --git a/rsc/prj/d.lst b/rsc/prj/d.lst
index e79c03d9bb63..984a109cf0a6 100644
--- a/rsc/prj/d.lst
+++ b/rsc/prj/d.lst
@@ -1,9 +1,9 @@
-..\%__SRC%\bin\rsc.exe %_DEST%\bin%_EXT%\rsc.exe
-..\%__SRC%\bin\rsc2.exe %_DEST%\bin%_EXT%\rsc2.exe
-..\%__SRC%\bin\rsc %_DEST%\bin%_EXT%\rsc
-..\%__SRC%\bin\rsc2 %_DEST%\bin%_EXT%\rsc2
-..\%__SRC%\bin\rscpp.exe %_DEST%\bin%_EXT%\rscpp.exe
-..\%__SRC%\bin\rscpp %_DEST%\bin%_EXT%\rscpp
+..\%__SRC%\bin\rsc.exe %_DEST%\bin\rsc.exe
+..\%__SRC%\bin\rsc2.exe %_DEST%\bin\rsc2.exe
+..\%__SRC%\bin\rsc %_DEST%\bin\rsc
+..\%__SRC%\bin\rsc2 %_DEST%\bin\rsc2
+..\%__SRC%\bin\rscpp.exe %_DEST%\bin\rscpp.exe
+..\%__SRC%\bin\rscpp %_DEST%\bin\rscpp
 
-mkdir: %_DEST%\inc%_EXT%\rsc
-..\inc\rsc/rscsfx.hxx %_DEST%\inc%_EXT%\rsc\rscsfx.hxx
+mkdir: %_DEST%\inc\rsc
+..\inc\rsc/rscsfx.hxx %_DEST%\inc\rsc\rscsfx.hxx
diff --git a/sax/prj/d.lst b/sax/prj/d.lst
index 86617b9f3ed2..9534663d5bfb 100644
--- a/sax/prj/d.lst
+++ b/sax/prj/d.lst
@@ -1,17 +1,17 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\misc\fastsax.component %_DEST%\xml%_EXT%\fastsax.component
-..\%__SRC%\misc\sax.component %_DEST%\xml%_EXT%\sax.component
-..\%__SRC%\misc\sax.inbuild.component %_DEST%\xml%_EXT%\sax.inbuild.component
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\*.so %_DEST%\lib\*.so
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\misc\fastsax.component %_DEST%\xml\fastsax.component
+..\%__SRC%\misc\sax.component %_DEST%\xml\sax.component
+..\%__SRC%\misc\sax.inbuild.component %_DEST%\xml\sax.inbuild.component
 
-mkdir: %_DEST%\inc%_EXT%\sax
-mkdir: %_DEST%\inc%_EXT%\sax\tools
-..\inc\sax\dllapi.h %_DEST%\inc%_EXT%\sax\dllapi.h
-..\inc\sax\fshelper.hxx %_DEST%\inc%_EXT%\sax\fshelper.hxx
-..\inc\sax\fastattribs.hxx %_DEST%\inc%_EXT%\sax\fastattribs.hxx
-..\inc\sax\tools\converter.hxx %_DEST%\inc%_EXT%\sax\tools\converter.hxx
-..\inc\sax\tools\documenthandleradapter.hxx %_DEST%\inc%_EXT%\sax\tools\documenthandleradapter.hxx
+mkdir: %_DEST%\inc\sax
+mkdir: %_DEST%\inc\sax\tools
+..\inc\sax\dllapi.h %_DEST%\inc\sax\dllapi.h
+..\inc\sax\fshelper.hxx %_DEST%\inc\sax\fshelper.hxx
+..\inc\sax\fastattribs.hxx %_DEST%\inc\sax\fastattribs.hxx
+..\inc\sax\tools\converter.hxx %_DEST%\inc\sax\tools\converter.hxx
+..\inc\sax\tools\documenthandleradapter.hxx %_DEST%\inc\sax\tools\documenthandleradapter.hxx
 
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
+dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib\*.dylib; fi"
diff --git a/ucbhelper/prj/d.lst b/ucbhelper/prj/d.lst
index 21a46483789b..b7e2f9c34d59 100644
--- a/ucbhelper/prj/d.lst
+++ b/ucbhelper/prj/d.lst
@@ -1,40 +1,40 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\misc\*.sym %_DEST%\bin%_EXT%\*.sym
+..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
+..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
+..\%__SRC%\lib\lib*.dylib %_DEST%\lib\lib*.dylib
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\misc\*.map %_DEST%\bin\*.map
+..\%__SRC%\misc\*.sym %_DEST%\bin\*.sym
 
-..\util\ucbhelper.xml %_DEST%\xml%_EXT%\ucbhelper.xml
+..\util\ucbhelper.xml %_DEST%\xml\ucbhelper.xml
 
-mkdir: %_DEST%\inc%_EXT%\ucbhelper
-..\inc\ucbhelper\configurationkeys.hxx %_DEST%\inc%_EXT%\ucbhelper\configurationkeys.hxx
-..\inc\ucbhelper\registerucb.hxx %_DEST%\inc%_EXT%\ucbhelper\registerucb.hxx
-..\inc\ucbhelper\content.hxx %_DEST%\inc%_EXT%\ucbhelper\content.hxx
-..\inc\ucbhelper\contentbroker.hxx %_DEST%\inc%_EXT%\ucbhelper\contentbroker.hxx
-..\inc\ucbhelper\commandenvironment.hxx %_DEST%\inc%_EXT%\ucbhelper\commandenvironment.hxx
-..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx
-..\inc\ucbhelper\contenthelper.hxx %_DEST%\inc%_EXT%\ucbhelper\contenthelper.hxx
-..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx
-..\inc\ucbhelper\contentinfo.hxx %_DEST%\inc%_EXT%\ucbhelper\contentinfo.hxx
-..\inc\ucbhelper\fileidentifierconverter.hxx %_DEST%\inc%_EXT%\ucbhelper\fileidentifierconverter.hxx
-..\inc\ucbhelper\macros.hxx %_DEST%\inc%_EXT%\ucbhelper\macros.hxx
-..\inc\ucbhelper\propertyvalueset.hxx %_DEST%\inc%_EXT%\ucbhelper\propertyvalueset.hxx
-..\inc\ucbhelper\providerhelper.hxx %_DEST%\inc%_EXT%\ucbhelper\providerhelper.hxx
-..\inc\ucbhelper\resultset.hxx %_DEST%\inc%_EXT%\ucbhelper\resultset.hxx
-..\inc\ucbhelper\resultsetmetadata.hxx %_DEST%\inc%_EXT%\ucbhelper\resultsetmetadata.hxx
-..\inc\ucbhelper\resultsethelper.hxx %_DEST%\inc%_EXT%\ucbhelper\resultsethelper.hxx
-..\inc\ucbhelper\activedatasink.hxx %_DEST%\inc%_EXT%\ucbhelper\activedatasink.hxx
-..\inc\ucbhelper\commandenvironmentproxy.hxx %_DEST%\inc%_EXT%\ucbhelper\commandenvironmentproxy.hxx
-..\inc\ucbhelper\interactionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\interactionrequest.hxx
-..\inc\ucbhelper\interceptedinteraction.hxx %_DEST%\inc%_EXT%\ucbhelper\interceptedinteraction.hxx
-..\inc\ucbhelper\simpleinteractionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleinteractionrequest.hxx
-..\inc\ucbhelper\simpleauthenticationrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleauthenticationrequest.hxx
-..\inc\ucbhelper\simplenameclashresolverequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simplenameclashresolverequest.hxx
-..\inc\ucbhelper\simplecertificatevalidationrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simplecertificatevalidationrequest.hxx
-..\inc\ucbhelper\simpleioerrorrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleioerrorrequest.hxx
-..\inc\ucbhelper\cancelcommandexecution.hxx %_DEST%\inc%_EXT%\ucbhelper\cancelcommandexecution.hxx
-..\inc\ucbhelper\handleinteractionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\handleinteractionrequest.hxx
-..\inc\ucbhelper\proxydecider.hxx %_DEST%\inc%_EXT%\ucbhelper\proxydecider.hxx
-..\version.mk %_DEST%\inc%_EXT%\ucbhelper\version.mk
-..\inc\ucbhelper\ucbhelperdllapi.h %_DEST%\inc%_EXT%\ucbhelper\ucbhelperdllapi.h
+mkdir: %_DEST%\inc\ucbhelper
+..\inc\ucbhelper\configurationkeys.hxx %_DEST%\inc\ucbhelper\configurationkeys.hxx
+..\inc\ucbhelper\registerucb.hxx %_DEST%\inc\ucbhelper\registerucb.hxx
+..\inc\ucbhelper\content.hxx %_DEST%\inc\ucbhelper\content.hxx
+..\inc\ucbhelper\contentbroker.hxx %_DEST%\inc\ucbhelper\contentbroker.hxx
+..\inc\ucbhelper\commandenvironment.hxx %_DEST%\inc\ucbhelper\commandenvironment.hxx
+..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc\ucbhelper\contentidentifier.hxx
+..\inc\ucbhelper\contenthelper.hxx %_DEST%\inc\ucbhelper\contenthelper.hxx
+..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc\ucbhelper\contentidentifier.hxx
+..\inc\ucbhelper\contentinfo.hxx %_DEST%\inc\ucbhelper\contentinfo.hxx
+..\inc\ucbhelper\fileidentifierconverter.hxx %_DEST%\inc\ucbhelper\fileidentifierconverter.hxx
+..\inc\ucbhelper\macros.hxx %_DEST%\inc\ucbhelper\macros.hxx
+..\inc\ucbhelper\propertyvalueset.hxx %_DEST%\inc\ucbhelper\propertyvalueset.hxx
+..\inc\ucbhelper\providerhelper.hxx %_DEST%\inc\ucbhelper\providerhelper.hxx
+..\inc\ucbhelper\resultset.hxx %_DEST%\inc\ucbhelper\resultset.hxx
+..\inc\ucbhelper\resultsetmetadata.hxx %_DEST%\inc\ucbhelper\resultsetmetadata.hxx
+..\inc\ucbhelper\resultsethelper.hxx %_DEST%\inc\ucbhelper\resultsethelper.hxx
+..\inc\ucbhelper\activedatasink.hxx %_DEST%\inc\ucbhelper\activedatasink.hxx
+..\inc\ucbhelper\commandenvironmentproxy.hxx %_DEST%\inc\ucbhelper\commandenvironmentproxy.hxx
+..\inc\ucbhelper\interactionrequest.hxx %_DEST%\inc\ucbhelper\interactionrequest.hxx
+..\inc\ucbhelper\interceptedinteraction.hxx %_DEST%\inc\ucbhelper\interceptedinteraction.hxx
+..\inc\ucbhelper\simpleinteractionrequest.hxx %_DEST%\inc\ucbhelper\simpleinteractionrequest.hxx
+..\inc\ucbhelper\simpleauthenticationrequest.hxx %_DEST%\inc\ucbhelper\simpleauthenticationrequest.hxx
+..\inc\ucbhelper\simplenameclashresolverequest.hxx %_DEST%\inc\ucbhelper\simplenameclashresolverequest.hxx
+..\inc\ucbhelper\simplecertificatevalidationrequest.hxx %_DEST%\inc\ucbhelper\simplecertificatevalidationrequest.hxx
+..\inc\ucbhelper\simpleioerrorrequest.hxx %_DEST%\inc\ucbhelper\simpleioerrorrequest.hxx
+..\inc\ucbhelper\cancelcommandexecution.hxx %_DEST%\inc\ucbhelper\cancelcommandexecution.hxx
+..\inc\ucbhelper\handleinteractionrequest.hxx %_DEST%\inc\ucbhelper\handleinteractionrequest.hxx
+..\inc\ucbhelper\proxydecider.hxx %_DEST%\inc\ucbhelper\proxydecider.hxx
+..\version.mk %_DEST%\inc\ucbhelper\version.mk
+..\inc\ucbhelper\ucbhelperdllapi.h %_DEST%\inc\ucbhelper\ucbhelperdllapi.h
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 0d5befed1e78..16647e36920a 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -1,4 +1,4 @@
-..\inc\vcl\fontcapabilities.hxx %_DEST%\inc%_EXT%\vcl\fontcapabilities.hxx
-..\inc\vcl\scopedbitmapaccess.hxx %_DEST%\inc%_EXT%\vcl\scopedbitmapaccess.hxx
-..\inc\vcl\solarmutex.hxx %_DEST%\inc%_EXT%\vcl\solarmutex.hxx
+..\inc\vcl\fontcapabilities.hxx %_DEST%\inc\vcl\fontcapabilities.hxx
+..\inc\vcl\scopedbitmapaccess.hxx %_DEST%\inc\vcl\scopedbitmapaccess.hxx
+..\inc\vcl\solarmutex.hxx %_DEST%\inc\vcl\solarmutex.hxx