diff --git a/windows/src/buildtools/buildpkg/buildpkg.dpr b/windows/src/buildtools/buildpkg/buildpkg.dpr
index 5a25f3ff0e..c0ce7767d9 100644
--- a/windows/src/buildtools/buildpkg/buildpkg.dpr
+++ b/windows/src/buildtools/buildpkg/buildpkg.dpr
@@ -51,10 +51,6 @@ uses
ExtShiftState in '..\..\global\delphi\comp\ExtShiftState.pas',
VKeyChars in '..\..\global\delphi\general\VKeyChars.pas',
VKeys in '..\..\global\delphi\general\VKeys.pas',
- DCPcrypt2 in '..\..\ext\dcpcrypt\DCPcrypt2.pas',
- DCPbase64 in '..\..\ext\dcpcrypt\DCPbase64.pas',
- DCPconst in '..\..\ext\dcpcrypt\DCPconst.pas',
- DCPrc4 in '..\..\ext\dcpcrypt\DCPrc4.pas',
JsonUtil in '..\..\global\delphi\general\JsonUtil.pas',
Keyman.System.PackageInfoRefreshKeyboards in '..\..\global\delphi\packages\Keyman.System.PackageInfoRefreshKeyboards.pas',
Keyman.System.KMXFileLanguages in '..\..\global\delphi\keyboards\Keyman.System.KMXFileLanguages.pas',
diff --git a/windows/src/buildtools/buildpkg/buildpkg.dproj b/windows/src/buildtools/buildpkg/buildpkg.dproj
index 6787866ad6..c20fb26fd0 100644
--- a/windows/src/buildtools/buildpkg/buildpkg.dproj
+++ b/windows/src/buildtools/buildpkg/buildpkg.dproj
@@ -40,7 +40,7 @@
$(BDS)\bin\delphi_PROJECTICNS.icns
true
true
- C:\keyman\9.0\src\ext\vclzip;c:\keyman\9.0\src\ext\jedi\jwa\branches\2.3\common;c:\keyman\9.0\src\ext\jedi\jwa\branches\2.3\win32api;c:\keyman\9.0\src\ext\dcpcrypt;c:\keyman\9.0\src\ext\dcpcrypt\ciphers;c:\keyman\9.0\src\ext\dcpcrypt\hashes;$(DELPHI)\lib;$(DCC_UnitSearchPath)
+ $(DELPHI)\lib;$(DCC_UnitSearchPath)
false
28
true
@@ -107,15 +107,15 @@
-
-
+
+
-
+
TTntForm
@@ -130,8 +130,7 @@
-
-
+
@@ -142,10 +141,6 @@
-
-
-
-
@@ -164,7 +159,7 @@
-
+
Cfg_2
Base
diff --git a/windows/src/buildtools/buildunidata/buildunidata.bdsproj b/windows/src/buildtools/buildunidata/buildunidata.bdsproj
deleted file mode 100644
index 91d8767085..0000000000
--- a/windows/src/buildtools/buildunidata/buildunidata.bdsproj
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- buildunidata.dpr
-
-
- 7.0
-
-
- 1
- 0
- 1
- 1
- 0
- 0
- 1
- 1
- 1
- 1
- 0
- 1
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 1
- 1
- 1
- 2
- 1
- True
- True
- WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-
- False
-
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- False
- False
- False
- True
- True
- True
- True
- True
- True
-
-
-
- 3
- 0
- False
- 1
- True
- False
- False
- 16384
- 1048576
- 4194304
-
-
-
-
-
-
-
- $(DELPHI)\lib;$(DELPHI)\source\vcl;\keyman\7.0\src\global\delphi\jedi
- Vcl40;Vclx40;comp51;VCLZipD4;PMemoPack4;dclkmn;vcljpg40;Vcl50;Vclx50;rtl;keyman_components
- VERSION_KEYMAN_DEVELOPER;DaoCheck;DaoNamedEx;DaoDebug;DaoMessageEx;DAOIdent
-
- False
-
-
- Data Data\UnicodeData.mdb
-
-
- False
- c:\keyman\7.0\src\global\inst
-
- True
- False
-
-
-
- $00000C09
-
-
-
- False
- True
- 5
- 0
- 0
- 23
- False
- False
- False
- False
- False
- 3081
- 1252
-
-
-
- Tavultesoft IKE
- 5.0.0.23
-
-
-
-
-
- 5.0.0.0
-
-
-
-
-
-
diff --git a/windows/src/buildtools/buildunidata/buildunidata.dproj b/windows/src/buildtools/buildunidata/buildunidata.dproj
index 74c11b2011..23413ed66f 100644
--- a/windows/src/buildtools/buildunidata/buildunidata.dproj
+++ b/windows/src/buildtools/buildunidata/buildunidata.dproj
@@ -38,7 +38,7 @@
$(BDS)\bin\delphi_PROJECTICON.ico
buildunidata
$(BDS)\bin\delphi_PROJECTICNS.icns
- C:\keyman\9.0\src\ext\vclzip;c:\keyman\9.0\src\ext\jedi\jwa\branches\2.3\common;c:\keyman\9.0\src\ext\jedi\jwa\branches\2.3\win32api;c:\keyman\9.0\src\ext\dcpcrypt;c:\keyman\9.0\src\ext\dcpcrypt\ciphers;c:\keyman\9.0\src\ext\dcpcrypt\hashes;$(DELPHI)\lib;$(DCC_UnitSearchPath)
+ $(DELPHI)\lib;$(DCC_UnitSearchPath)
VERSION_KEYMAN_DEVELOPER;$(DCC_Define)
false
23
diff --git a/windows/src/buildtools/devtools/devtools.dproj b/windows/src/buildtools/devtools/devtools.dproj
index a0f8bfa2e1..3d9f9ad341 100644
--- a/windows/src/buildtools/devtools/devtools.dproj
+++ b/windows/src/buildtools/devtools/devtools.dproj
@@ -78,7 +78,7 @@
true
- C:\Projects\keyman\apps\windows\src\ext\dcpcrypt
+
-buildsetupstrings ..\..\desktop\setup\locale ..\..\desktop\setup
1033
None
diff --git a/windows/src/engine/keyman/keyman.dpr b/windows/src/engine/keyman/keyman.dpr
index 5e3b38abb0..71070c0fcc 100644
--- a/windows/src/engine/keyman/keyman.dpr
+++ b/windows/src/engine/keyman/keyman.dpr
@@ -62,10 +62,6 @@ uses
VisualKeyboardParameters in '..\..\global\delphi\visualkeyboard\VisualKeyboardParameters.pas',
utilxml in '..\..\global\delphi\general\utilxml.pas',
MSXML2_TLB in '..\..\global\delphi\tlb\MSXML2_TLB.pas',
- DCPcrypt2 in '..\..\global\delphi\crypt\DCPcrypt2.pas',
- DCPbase64 in '..\..\global\delphi\crypt\DCPbase64.pas',
- DCPconst in '..\..\global\delphi\crypt\DCPconst.pas',
- DCPrc4 in '..\..\global\delphi\crypt\DCPrc4.pas',
KeymanControlMessages in '..\..\global\delphi\general\KeymanControlMessages.pas',
UfrmOSKFontHelper in 'viskbd\UfrmOSKFontHelper.pas' {frmOSKFontHelper},
HintConsts in '..\..\global\delphi\hints\HintConsts.pas',
diff --git a/windows/src/engine/keyman/keyman.dproj b/windows/src/engine/keyman/keyman.dproj
index 12fa8295c6..f7de634bd1 100644
--- a/windows/src/engine/keyman/keyman.dproj
+++ b/windows/src/engine/keyman/keyman.dproj
@@ -176,10 +176,6 @@
-
-
-
-
@@ -308,9 +304,9 @@
False
-
+
- keyman.exe
+ .\
true
@@ -320,9 +316,9 @@
true
-
+
- .\
+ keyman.exe
true
diff --git a/windows/src/engine/kmcomapi/kmcomapi.dpr b/windows/src/engine/kmcomapi/kmcomapi.dpr
index 5a72e20e94..71d87b15e1 100644
--- a/windows/src/engine/kmcomapi/kmcomapi.dpr
+++ b/windows/src/engine/kmcomapi/kmcomapi.dpr
@@ -81,10 +81,6 @@ uses
custinterfaces in '..\..\global\delphi\cust\custinterfaces.pas',
utilkeymancontrol in 'util\utilkeymancontrol.pas',
klog in '..\..\global\delphi\general\klog.pas',
- DCPcrypt2 in '..\..\ext\dcpcrypt\DCPcrypt2.pas',
- DCPbase64 in '..\..\ext\dcpcrypt\DCPbase64.pas',
- DCPconst in '..\..\ext\dcpcrypt\DCPconst.pas',
- DCPrc4 in '..\..\ext\dcpcrypt\DCPrc4.pas',
utilfiletypes in '..\..\global\delphi\general\utilfiletypes.pas',
keymanapi_TLB in 'keymanapi_TLB.pas',
kmxfile in '..\..\global\delphi\general\kmxfile.pas',
diff --git a/windows/src/engine/kmcomapi/kmcomapi.dproj b/windows/src/engine/kmcomapi/kmcomapi.dproj
index a7649dd8f3..655f74c243 100644
--- a/windows/src/engine/kmcomapi/kmcomapi.dproj
+++ b/windows/src/engine/kmcomapi/kmcomapi.dproj
@@ -219,10 +219,6 @@
-
-
-
-
@@ -376,7 +372,7 @@
true
-
+
kmcomapi.dll
true