diff --git a/components/edbimage/packages/delphi10/DCLSer.bdsproj b/components/edbimage/packages/delphi10/DCLSer.bdsproj
index ca85c2ba..15d5b91a 100644
--- a/components/edbimage/packages/delphi10/DCLSer.bdsproj
+++ b/components/edbimage/packages/delphi10/DCLSer.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
-			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\..\resources;..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\resources;..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs">..\..\source</Directories>
diff --git a/components/edbimage/packages/delphi10/VCLser.bdsproj b/components/edbimage/packages/delphi10/VCLser.bdsproj
index 5522117b..840e143d 100644
--- a/components/edbimage/packages/delphi10/VCLser.bdsproj
+++ b/components/edbimage/packages/delphi10/VCLser.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
-			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/edbimage/packages/delphi11/DCLSer.dproj b/components/edbimage/packages/delphi11/DCLSer.dproj
index 8971fa8a..8e78aaca 100644
--- a/components/edbimage/packages/delphi11/DCLSer.dproj
+++ b/components/edbimage/packages/delphi11/DCLSer.dproj
@@ -16,8 +16,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
-    <DCC_BplOutput>$(BDSCOMMONDIR)\Bpl</DCC_BplOutput>
-    <DCC_DcpOutput>$(BDSCOMMONDIR)\Dcp</DCC_DcpOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -32,8 +32,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
-    <DCC_BplOutput>$(BDSCOMMONDIR)\Bpl</DCC_BplOutput>
-    <DCC_DcpOutput>$(BDSCOMMONDIR)\Dcp</DCC_DcpOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\..\compilerdetection\include;..\..\resources</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\compilerdetection\include;..\..\resources</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\compilerdetection\include;..\..\resources</DCC_ObjPath>
diff --git a/components/edbimage/packages/delphi11/VCLSer.dproj b/components/edbimage/packages/delphi11/VCLSer.dproj
index 94b4706b..9184c855 100644
--- a/components/edbimage/packages/delphi11/VCLSer.dproj
+++ b/components/edbimage/packages/delphi11/VCLSer.dproj
@@ -16,8 +16,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
-    <DCC_BplOutput>$(BDSCOMMONDIR)\Bpl</DCC_BplOutput>
-    <DCC_DcpOutput>$(BDSCOMMONDIR)\Dcp</DCC_DcpOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -32,8 +32,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
-    <DCC_BplOutput>$(BDSCOMMONDIR)\Bpl</DCC_BplOutput>
-    <DCC_DcpOutput>$(BDSCOMMONDIR)\Dcp</DCC_DcpOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\..\compilerdetection\include;..\..\resources</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\compilerdetection\include;..\..\resources</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\compilerdetection\include;..\..\resources</DCC_ObjPath>
diff --git a/components/heidisql/packages/delphi10/HeidiComponents.bdsproj b/components/heidisql/packages/delphi10/HeidiComponents.bdsproj
index 49975be3..9277ff41 100644
--- a/components/heidisql/packages/delphi10/HeidiComponents.bdsproj
+++ b/components/heidisql/packages/delphi10/HeidiComponents.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
-			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\..\..\components\zeosdbo\build;..\..\..\..\source</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\..\components\zeosdbo\build;..\..\..\heidisql\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/heidisql/packages/delphi11/HeidiComponents.dproj b/components/heidisql/packages/delphi11/HeidiComponents.dproj
index 60e501c0..af493a9e 100644
--- a/components/heidisql/packages/delphi11/HeidiComponents.dproj
+++ b/components/heidisql/packages/delphi11/HeidiComponents.dproj
@@ -14,6 +14,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_Define>RELEASE</DCC_Define>
     <DCC_UnitSearchPath>..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include</DCC_ResourcePath>
@@ -25,6 +27,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\zeosdbo\build;..\..\..\..\source;..\..\include</DCC_ObjPath>
diff --git a/components/smdbgrid/packages/delphi10/SMDBGridComponents.bdsproj b/components/smdbgrid/packages/delphi10/SMDBGridComponents.bdsproj
index 6ff07624..2b267ca3 100644
--- a/components/smdbgrid/packages/delphi10/SMDBGridComponents.bdsproj
+++ b/components/smdbgrid/packages/delphi10/SMDBGridComponents.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
-			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\..\..\compilerdetection;..\..\resources</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\..\compilerdetection\include;..\..\resources</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs">..\..\source</Directories>
diff --git a/components/smdbgrid/packages/delphi11/SMDBGridComponents.dproj b/components/smdbgrid/packages/delphi11/SMDBGridComponents.dproj
index e63ed0f4..fe982f32 100644
--- a/components/smdbgrid/packages/delphi11/SMDBGridComponents.dproj
+++ b/components/smdbgrid/packages/delphi11/SMDBGridComponents.dproj
@@ -14,6 +14,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\..\compilerdetection\include;..\..\resources</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\compilerdetection\include;..\..\resources</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\compilerdetection\include;..\..\resources</DCC_ObjPath>
@@ -25,6 +27,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\..\compilerdetection\include;..\..\resources</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\compilerdetection\include;..\..\resources</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\compilerdetection\include;..\..\resources</DCC_ObjPath>
diff --git a/components/synedit/Packages/delphi10/SynEditD.bdsproj b/components/synedit/Packages/delphi10/SynEditD.bdsproj
index 7fddc1b1..2945fce8 100644
--- a/components/synedit/Packages/delphi10/SynEditD.bdsproj
+++ b/components/synedit/Packages/delphi10/SynEditD.bdsproj
@@ -121,12 +121,12 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
-			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\..\build;..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\build;..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
-			<Directories Name="DebugSourceDirs">..\..\Source</Directories>
+			<Directories Name="DebugSourceDirs">..\..\source</Directories>
 			<Directories Name="UsePackages">False</Directories>
 		</Directories>
 		<Parameters>
diff --git a/components/synedit/Packages/delphi10/SynEditR.bdsproj b/components/synedit/Packages/delphi10/SynEditR.bdsproj
index 5d076e73..74bb9627 100644
--- a/components/synedit/Packages/delphi10/SynEditR.bdsproj
+++ b/components/synedit/Packages/delphi10/SynEditR.bdsproj
@@ -121,12 +121,12 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
-			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\..\resources;..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\resources;..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
-			<Directories Name="DebugSourceDirs">..\..\Source</Directories>
+			<Directories Name="DebugSourceDirs">..\..\source</Directories>
 			<Directories Name="UsePackages">False</Directories>
 		</Directories>
 		<Parameters>
diff --git a/components/synedit/Packages/delphi11/SynEditD.dproj b/components/synedit/Packages/delphi11/SynEditD.dproj
index c1f326c2..c1f4e108 100644
--- a/components/synedit/Packages/delphi11/SynEditD.dproj
+++ b/components/synedit/Packages/delphi11/SynEditD.dproj
@@ -15,6 +15,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\resources;..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\resources;..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>..\..\resources;..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -27,6 +29,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\resources;..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\resources;..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>..\..\resources;..\..\..\compilerdetection\include</DCC_ObjPath>
diff --git a/components/synedit/Packages/delphi11/SynEditR.dproj b/components/synedit/Packages/delphi11/SynEditR.dproj
index ae30a313..9404dffe 100644
--- a/components/synedit/Packages/delphi11/SynEditR.dproj
+++ b/components/synedit/Packages/delphi11/SynEditR.dproj
@@ -15,6 +15,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\resources;..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\resources;..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>..\..\resources;..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -27,6 +29,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\resources;..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\resources;..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>..\..\resources;..\..\..\compilerdetection\include</DCC_ObjPath>
diff --git a/components/virtualtreeview/packages/delphi10/VirtualTreesD.bdsproj b/components/virtualtreeview/packages/delphi10/VirtualTreesD.bdsproj
index 00706c05..f49db287 100644
--- a/components/virtualtreeview/packages/delphi10/VirtualTreesD.bdsproj
+++ b/components/virtualtreeview/packages/delphi10/VirtualTreesD.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
-			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\..\source;..\..\resources;..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\source;..\..\resources;..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/virtualtreeview/packages/delphi10/VirtualTreesR.bdsproj b/components/virtualtreeview/packages/delphi10/VirtualTreesR.bdsproj
index 204f5fc4..e0f8e8e8 100644
--- a/components/virtualtreeview/packages/delphi10/VirtualTreesR.bdsproj
+++ b/components/virtualtreeview/packages/delphi10/VirtualTreesR.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
-			<Directories Name="PackageDCPOutputDir"></Directories>
-			<Directories Name="SearchPath">..\..\..\compilerdetection;..\..\resources</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\..\compilerdetection\include;..\..\resources</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/virtualtreeview/packages/delphi11/VirtualTreesD.dproj b/components/virtualtreeview/packages/delphi11/VirtualTreesD.dproj
index 4968dc75..dbab79b2 100644
--- a/components/virtualtreeview/packages/delphi11/VirtualTreesD.dproj
+++ b/components/virtualtreeview/packages/delphi11/VirtualTreesD.dproj
@@ -19,6 +19,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\Source\</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\Source\</DCC_ResourcePath>
     <DCC_ObjPath>..\..\Source\</DCC_ObjPath>
@@ -34,6 +36,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\source;..\..\..\compilerdetection\include;..\..\resources</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\source;..\..\..\compilerdetection\include;..\..\resources</DCC_ResourcePath>
     <DCC_ObjPath>..\..\source;..\..\..\compilerdetection\include;..\..\resources</DCC_ObjPath>
diff --git a/components/virtualtreeview/packages/delphi11/VirtualTreesR.dproj b/components/virtualtreeview/packages/delphi11/VirtualTreesR.dproj
index 63f06e00..9e139746 100644
--- a/components/virtualtreeview/packages/delphi11/VirtualTreesR.dproj
+++ b/components/virtualtreeview/packages/delphi11/VirtualTreesR.dproj
@@ -19,6 +19,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <Version>7.0</Version>
@@ -32,6 +34,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\..\compilerdetection\include;..\..\resources</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\..\compilerdetection\include;..\..\resources</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\compilerdetection\include;..\..\resources</DCC_ObjPath>
diff --git a/components/zeosdbo/packages/delphi10/ZComponent.bdsproj b/components/zeosdbo/packages/delphi10/ZComponent.bdsproj
index 22cd4ee1..13cf0763 100644
--- a/components/zeosdbo/packages/delphi10/ZComponent.bdsproj
+++ b/components/zeosdbo/packages/delphi10/ZComponent.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="PackageDCPOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="SearchPath">.\..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/zeosdbo/packages/delphi10/ZComponentDesign.bdsproj b/components/zeosdbo/packages/delphi10/ZComponentDesign.bdsproj
index d91a47e3..85baa72e 100644
--- a/components/zeosdbo/packages/delphi10/ZComponentDesign.bdsproj
+++ b/components/zeosdbo/packages/delphi10/ZComponentDesign.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="PackageDCPOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="SearchPath">..\..\build;..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\build;..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/zeosdbo/packages/delphi10/ZCore.bdsproj b/components/zeosdbo/packages/delphi10/ZCore.bdsproj
index 6d17fc39..75f7c381 100644
--- a/components/zeosdbo/packages/delphi10/ZCore.bdsproj
+++ b/components/zeosdbo/packages/delphi10/ZCore.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="PackageDCPOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="SearchPath">.\..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">.\..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/zeosdbo/packages/delphi10/ZDbc.bdsproj b/components/zeosdbo/packages/delphi10/ZDbc.bdsproj
index d84c673f..e001dad4 100644
--- a/components/zeosdbo/packages/delphi10/ZDbc.bdsproj
+++ b/components/zeosdbo/packages/delphi10/ZDbc.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="PackageDCPOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="SearchPath">.\..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/zeosdbo/packages/delphi10/ZParseSql.bdsproj b/components/zeosdbo/packages/delphi10/ZParseSql.bdsproj
index 8ab420c8..d383dedb 100644
--- a/components/zeosdbo/packages/delphi10/ZParseSql.bdsproj
+++ b/components/zeosdbo/packages/delphi10/ZParseSql.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="PackageDCPOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="SearchPath">.\..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/zeosdbo/packages/delphi10/ZPlain.bdsproj b/components/zeosdbo/packages/delphi10/ZPlain.bdsproj
index 449d9a25..32c109cb 100644
--- a/components/zeosdbo/packages/delphi10/ZPlain.bdsproj
+++ b/components/zeosdbo/packages/delphi10/ZPlain.bdsproj
@@ -121,9 +121,9 @@
 		<Directories>
 			<Directories Name="OutputDir"></Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="PackageDCPOutputDir">$(BDSPROJECTSDIR)\bpl</Directories>
-			<Directories Name="SearchPath">.\..\..\..\compilerdetection</Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
+			<Directories Name="PackageDCPOutputDir">..\..\build</Directories>
+			<Directories Name="SearchPath">..\..\..\compilerdetection\include</Directories>
 			<Directories Name="Packages"></Directories>
 			<Directories Name="Conditionals"></Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
diff --git a/components/zeosdbo/packages/delphi11/ZComponent.dproj b/components/zeosdbo/packages/delphi11/ZComponent.dproj
index 52f22597..e88223d2 100644
--- a/components/zeosdbo/packages/delphi11/ZComponent.dproj
+++ b/components/zeosdbo/packages/delphi11/ZComponent.dproj
@@ -16,6 +16,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -29,6 +31,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
diff --git a/components/zeosdbo/packages/delphi11/ZComponentDesign.dproj b/components/zeosdbo/packages/delphi11/ZComponentDesign.dproj
index e1fb2714..cd6c8a52 100644
--- a/components/zeosdbo/packages/delphi11/ZComponentDesign.dproj
+++ b/components/zeosdbo/packages/delphi11/ZComponentDesign.dproj
@@ -16,6 +16,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -29,6 +31,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
diff --git a/components/zeosdbo/packages/delphi11/ZCore.dproj b/components/zeosdbo/packages/delphi11/ZCore.dproj
index a2bc8b2c..5a89641f 100644
--- a/components/zeosdbo/packages/delphi11/ZCore.dproj
+++ b/components/zeosdbo/packages/delphi11/ZCore.dproj
@@ -16,6 +16,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -29,6 +31,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\Lib\Debug\Indy10;$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
diff --git a/components/zeosdbo/packages/delphi11/ZDbc.dproj b/components/zeosdbo/packages/delphi11/ZDbc.dproj
index 983366e4..16f1859a 100644
--- a/components/zeosdbo/packages/delphi11/ZDbc.dproj
+++ b/components/zeosdbo/packages/delphi11/ZDbc.dproj
@@ -16,6 +16,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -29,6 +31,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
diff --git a/components/zeosdbo/packages/delphi11/ZParseSql.dproj b/components/zeosdbo/packages/delphi11/ZParseSql.dproj
index b71e6130..df834d7c 100644
--- a/components/zeosdbo/packages/delphi11/ZParseSql.dproj
+++ b/components/zeosdbo/packages/delphi11/ZParseSql.dproj
@@ -16,6 +16,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -29,6 +31,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
diff --git a/components/zeosdbo/packages/delphi11/ZPlain.dproj b/components/zeosdbo/packages/delphi11/ZPlain.dproj
index 963e3f6d..d101f936 100644
--- a/components/zeosdbo/packages/delphi11/ZPlain.dproj
+++ b/components/zeosdbo/packages/delphi11/ZPlain.dproj
@@ -18,6 +18,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
@@ -33,6 +35,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;.\..\..\..\compilerdetection\include</DCC_ObjPath>
diff --git a/extra/build_super.cmd b/extra/build_super.cmd
index 88ea9256..52fe8f9c 100644
--- a/extra/build_super.cmd
+++ b/extra/build_super.cmd
@@ -99,12 +99,12 @@ set compiler=dcc32.exe
 set params=--no-config
 set params=%params% -aWinTypes=Windows;WinProcs=Windows;DbiProcs=BDE;DbiTypes=BDE;DbiErrs=BDE
 set params=%params% -B
-set params=%params% -N0"..\..\build" 
-set params=%params% -u"%compiler_dir%\lib;%compiler_dir%\lib\obj;%base_dir%\components\zeosdbo\build;%base_dir%\components\virtualtreeview\build;%base_dir%\components\synedit\build;%base_dir%\components\smdbgrid\build;%base_dir%\components\heidisql\build;%base_dir%\components\edbimage\build"
 set params=%params% -i"%base_dir%\components\compilerdetection\include;%base_dir%\components\heidisql\include"
-set params=%params% -LE"%base_dir%\build"
-set params=%params% -LN"%base_dir%\build"
 set params=%params% -r"%base_dir%\components\smdbgrid\Resources;%base_dir%\components\synedit\resources;%base_dir%\components\virtualtreeview\Resources;%base_dir%\components\edbimage\resources"
+set params=%params% -u"%compiler_dir%\lib;%compiler_dir%\lib\obj;%base_dir%\components\zeosdbo\build;%base_dir%\components\virtualtreeview\build;%base_dir%\components\synedit\build;%base_dir%\components\smdbgrid\build;%base_dir%\components\heidisql\build;%base_dir%\components\edbimage\build"
+set params=%params% -N0"..\..\build" 
+set params=%params% -LE"..\..\build"
+set params=%params% -LN"..\..\build"
 
 rem -Q = Quiet compile
 rem      This is a workaround for avoiding error D21153
diff --git a/packages/delphi10/heidisql.bdsproj b/packages/delphi10/heidisql.bdsproj
index 095a5d2b..1aea3fe8 100644
--- a/packages/delphi10/heidisql.bdsproj
+++ b/packages/delphi10/heidisql.bdsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<PersonalityInfo>
 		<Option>
@@ -121,12 +121,12 @@
 		<Directories>
 			<Directories Name="OutputDir">..\..\out</Directories>
 			<Directories Name="UnitOutputDir">..\..\build</Directories>
-			<Directories Name="PackageDLLOutputDir"></Directories>
+			<Directories Name="PackageDLLOutputDir">..\..\build</Directories>
 			<Directories Name="PackageDCPOutputDir"></Directories>
 			<Directories Name="SearchPath">..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources</Directories>
 			<Directories Name="Packages">Vcl50;Vclx50;VclSmp50;Vcldb50;vclado50;ibevnt50;Vclbde50;vcldbx50;Qrpt50;TeeUI50;TeeDB50;Tee50;Dss50;TeeQR50;VCLIB50;Vclmid50;vclie50;Inetdb50;Inet50;NMFast50;webmid50;dclocx50;dclaxserver50;vcl;rtl;dbrtl;vcldb;bdertl;ZUtils6;ZCommon6</Directories>
 			<Directories Name="Conditionals"></Directories>
-			<Directories Name="DebugSourceDirs">..\..;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\source;..\..\components\heidisql\source;..\..\components\smdbgrid\source;..\..\components\synedit\source;..\..\components\zeosdbo\src;..\..\components\zeosdbo\src\plain;..\..\components\zeosdbo\src\component;..\..\components\zeosdbo\src\core;..\..\components\zeosdbo\src\dbc;..\..\components\zeosdbo\src\parsesql;..\..\components\virtualtreeview\Source</Directories>
+			<Directories Name="DebugSourceDirs">..\..\source;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\source;..\..\components\heidisql\source;..\..\components\smdbgrid\source;..\..\components\synedit\source;..\..\components\zeosdbo\src;..\..\components\zeosdbo\src\plain;..\..\components\zeosdbo\src\component;..\..\components\zeosdbo\src\core;..\..\components\zeosdbo\src\dbc;..\..\components\zeosdbo\src\parsesql;..\..\components\virtualtreeview\Source</Directories>
 			<Directories Name="UsePackages">False</Directories>
 		</Directories>
 		<Parameters>
diff --git a/packages/delphi11/heidisql.dproj b/packages/delphi11/heidisql.dproj
index 50be6636..2389ace7 100644
--- a/packages/delphi11/heidisql.dproj
+++ b/packages/delphi11/heidisql.dproj
@@ -17,6 +17,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources</DCC_UnitSearchPath>
     <DCC_ResourcePath>..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources</DCC_ResourcePath>
     <DCC_ObjPath>..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\Resources</DCC_ObjPath>
@@ -39,6 +41,8 @@
     <DCC_DcuOutput>..\..\build</DCC_DcuOutput>
     <DCC_ObjOutput>..\..\build</DCC_ObjOutput>
     <DCC_HppOutput>..\..\build</DCC_HppOutput>
+    <DCC_BplOutput>..\..\build</DCC_BplOutput>
+    <DCC_DcpOutput>..\..\build</DCC_DcpOutput>
     <DCC_UnitSearchPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources</DCC_UnitSearchPath>
     <DCC_ResourcePath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\RaveReports\Lib;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;..\..\components\compilerdetection\include;..\..\components\heidisql\include;..\..\components\edbimage\build;..\..\components\heidisql\build;..\..\components\smdbgrid\build;..\..\components\smdbgrid\resources;..\..\components\synedit\build;..\..\components\synedit\resources;..\..\components\zeosdbo\build;..\..\components\virtualtreeview\build;..\..\components\virtualtreeview\resources</DCC_ObjPath>