diff --git a/source/const.inc b/source/const.inc
index ae587b41..eecc6346 100644
--- a/source/const.inc
+++ b/source/const.inc
@@ -72,4 +72,11 @@ const
   {PetaByte} NAME_PB = ' PB';
 
   // See reference: mysql.cpp Ver 14.12 Distrib 5.0.45, for Win32 (ia32): Line 112
-  DEFAULT_DELIMITER = ';';
\ No newline at end of file
+  DEFAULT_DELIMITER = ';';
+
+  // Copied constants from [delphi11]\source\win32\rtl\win\ShlObj.pas to make them
+  // available in Delphi 10. We don't use the constants from ShlObj until delphi 10
+  // support is removed.
+  CSIDL_COMMON_APPDATA = $0023; { All Users\Application Data }
+  CSIDL_APPDATA = $001a; { <user name>\Application Data }
+
diff --git a/source/main.pas b/source/main.pas
index 2c5b5b32..6adbdac0 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -16,7 +16,7 @@ uses
   StdCtrls, Dialogs, Buttons, Messages, ExtCtrls, ComCtrls, StdActns,
   ActnList, ImgList, Registry, ShellApi, ToolWin, Clipbrd, db, DBCtrls,
   SynMemo, synedit, SynEditTypes, smdbgrid, ZDataSet, ZSqlProcessor,
-  HeidiComp, sqlhelp, MysqlQueryThread, Childwin, VirtualTrees, ShlObj;
+  HeidiComp, sqlhelp, MysqlQueryThread, Childwin, VirtualTrees;
 
 type
   TMainForm = class(TForm)