Preparing for separate pre-compiled header file required by Clang

- Once doing that, including more headers to PCH, not just vcl.h
- Clang won't need explicit include, but we will probably keep it anyway.
- #pragma hdrstop has no effect in Clang

Source commit: adc8a268b6907c5337ccaa430cca7526793a3019

source/WinSCP.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <WinPCH.h>
 #pragma hdrstop
 
 USEFORM("forms\CustomScpExplorer.cpp", CustomScpExplorerForm);
@@ -7,14 +7,8 @@ USEFORM("forms\NonVisual.cpp", NonVisualDataModule); /* TDataModule: File Type *
 USEFORM("forms\ScpCommander.cpp", ScpCommanderForm);
 USEFORM("forms\ScpExplorer.cpp", ScpExplorerForm);
 //---------------------------------------------------------------------------
-#include <CoreMain.h>
-#include <WinInterface.h>
 #include <ProgParams.h>
-#include <VCLCommon.h>
-#include <Setup.h>
 #include <PuttyTools.h>
-#include <GUITools.h>
-#include <Tools.h>
 //---------------------------------------------------------------------------
 void __fastcall AppLogImpl(UnicodeString S)
 {

source/core/Bookmarks.cpp

@@ -1,12 +1,10 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
-#include <Common.h>
 #include "NamedObjs.h"
 #include "Bookmarks.h"
 #include "Configuration.h"
 #include "HierarchicalStorage.h"
-#include "TextsCore.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/Common.cpp

@@ -1,24 +1,13 @@
 //---------------------------------------------------------------------------
-#define NO_WIN32_LEAN_AND_MEAN
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "Exceptions.h"
-#include "TextsCore.h"
-#include "Interface.h"
-#include <StrUtils.hpp>
-#include <DateUtils.hpp>
-#include <System.IOUtils.hpp>
 #include <math.h>
 #include <shlobj.h>
-#include <limits>
-#include <algorithm>
-#include <memory>
 #include <shlwapi.h>
 #include <tlhelp32.h>
 #include <psapi.h>
-#include <CoreMain.h>
 #include <SessionInfo.h>
 #include <Soap.EncdDecd.hpp>
 #include <openssl/pkcs12.h>

source/core/Common.h

@@ -113,7 +113,8 @@ int __fastcall CompareNumber(__int64 Value1, __int64 Value2);
 bool ContainsTextSemiCaseSensitive(const UnicodeString & Text, const UnicodeString & SubText);
 bool __fastcall IsReservedName(UnicodeString FileName);
 UnicodeString __fastcall ApiPath(UnicodeString Path);
-bool IsWideChar(wchar_t Ch) { return (Ch >= L'\x80'); }
+// Classic compiler does not support inlines in PCH, so macro is used. With Clang, we can return to inline.
+#define IsWideChar(Ch) (static_cast<wchar_t>(Ch) >= L'\x80')
 UnicodeString __fastcall DisplayableStr(const RawByteString & Str);
 UnicodeString __fastcall ByteToHex(unsigned char B, bool UpperCase = true);
 UnicodeString __fastcall BytesToHex(const unsigned char * B, size_t Length, bool UpperCase = true, wchar_t Separator = L'\0');

source/core/Configuration.cpp

@@ -1,23 +1,15 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include <FileInfo.h>
 
-#include "Common.h"
-#include "Exceptions.h"
 #include "Configuration.h"
 #include "PuttyIntf.h"
-#include "TextsCore.h"
-#include "Interface.h"
-#include "CoreMain.h"
 #include "Security.h"
 #include "FileMasks.h"
 #include "CopyParam.h"
 #include <shlobj.h>
-#include <System.IOUtils.hpp>
-#include <System.StrUtils.hpp>
-#include <System.DateUtils.hpp>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/CopyParam.cpp

@@ -1,13 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
-#include "Exceptions.h"
 #include "CopyParam.h"
 #include "HierarchicalStorage.h"
-#include "TextsCore.h"
-#include "Interface.h"
 //---------------------------------------------------------------------------
 const wchar_t * TransferModeNames[] = { L"binary", L"ascii", L"automatic" };
 const int TransferModeNamesCount = LENOF(TransferModeNames);

source/core/CoreMain.cpp

@@ -1,18 +1,12 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "CoreMain.h"
-
-#include "Common.h"
-#include "Interface.h"
 #include "Configuration.h"
 #include "PuttyIntf.h"
 #include "Cryptography.h"
-#include <DateUtils.hpp>
 #include "FileZillaIntf.h"
 #include "NeonIntf.h"
-#include "TextsCore.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/CorePCH.h

@@ -0,0 +1,22 @@
+#include <vcl.h>
+
+#include <Common.h>
+
+#include <CoreMain.h>
+#include <Interface.h>
+// Good candidate is also Exceptions.h, but Classic compiler does not support non-trivial default arguments in PCH
+
+#include <HelpCore.h>
+#include <TextsCore.h>
+
+#include <System.DateUtils.hpp>
+#include <System.IOUtils.hpp>
+#include <System.Math.hpp>
+#include <System.StrUtils.hpp>
+#include <System.SysUtils.hpp>
+#include <Winapi.Windows.hpp>
+
+#include <algorithm>
+#include <limits>
+#include <memory>
+#include <vector>

source/core/Cryptography.cpp

@@ -1,20 +1,16 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "PuttyIntf.h"
 #include "Cryptography.h"
 #include "FileBuffer.h"
-#include "TextsCore.h"
-#include "CoreMain.h"
 #include "Exceptions.h"
 #include <openssl\rand.h>
 #include <openssl\err.h>
 #include <openssl\ssl.h>
 #include <process.h>
 #include <Soap.EncdDecd.hpp>
-#include <System.StrUtils.hpp>
 
 /*
  ---------------------------------------------------------------------------

source/core/Exceptions.cpp

@@ -1,15 +1,10 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "Exceptions.h"
-#include "TextsCore.h"
-#include "HelpCore.h"
+
 #include "Configuration.h"
-#include "CoreMain.h"
-#include "Interface.h"
-#include <StrUtils.hpp>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/FileBuffer.cpp

@@ -1,8 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "FileBuffer.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/core/FileInfo.cpp

@@ -1,11 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <Exceptions.h>
-#include <Windows.hpp>
-#include <Math.hpp>
 #include "FileInfo.h"
 #include "FileBuffer.h"
 //---------------------------------------------------------------------------

source/core/FileMasks.cpp

@@ -1,15 +1,11 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "FileMasks.h"
-
-#include "Common.h"
-#include "TextsCore.h"
 #include "RemoteFiles.h"
 #include "PuttyTools.h"
 #include "Terminal.h"
-#include <StrUtils.hpp>
 //---------------------------------------------------------------------------
 extern const wchar_t IncludeExcludeFileMasksDelimiter = L'|';
 UnicodeString FileMasksDelimiters = L";,";

source/core/FileOperationProgress.cpp

@@ -1,11 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "FileOperationProgress.h"
-#include "CoreMain.h"
-#include "Interface.h"
 //---------------------------------------------------------------------------
 #define TRANSFER_BUF_SIZE 32768
 //---------------------------------------------------------------------------

source/core/FileSystems.cpp

@@ -1,10 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "FileSystems.h"
 #include "RemoteFiles.h"
-#include "Common.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/FtpFileSystem.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 //---------------------------------------------------------------------------
@@ -7,21 +7,14 @@
 #include "FtpFileSystem.h"
 #include "FileZillaIntf.h"
 
-#include "Common.h"
-#include "Exceptions.h"
 #include "Terminal.h"
-#include "TextsCore.h"
 #include "TextsFileZilla.h"
-#include "HelpCore.h"
 #include "Security.h"
 #include "NeonIntf.h"
 #include "SessionInfo.h"
 #include "Cryptography.h"
-#include <StrUtils.hpp>
-#include <DateUtils.hpp>
 #include <openssl/x509_vfy.h>
 #include <openssl/err.h>
-#include <limits>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/Global.cpp

@@ -1,8 +1,6 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
-
-#include "Global.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/HierarchicalStorage.cpp

@@ -1,15 +1,10 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "Exceptions.h"
 #include "PuttyIntf.h"
 #include "HierarchicalStorage.h"
-#include <Interface.h>
-#include <TextsCore.h>
-#include <StrUtils.hpp>
-#include <vector>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/Http.cpp

@@ -1,13 +1,11 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "Http.h"
 #include "NeonIntf.h"
 #include "Exceptions.h"
-#include "CoreMain.h"
 #include "ne_request.h"
-#include "TextsCore.h"
 #include <openssl/ssl.h>
 //---------------------------------------------------------------------------
 const int BasicHttpResponseLimit = 102400;

source/core/NamedObjs.cpp

@@ -1,8 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "NamedObjs.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/core/NeonIntf.cpp

@@ -1,21 +1,16 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "NeonIntf.h"
-#include "Interface.h"
-#include "CoreMain.h"
-#include "Exceptions.h"
 #include "Security.h"
 #include "Terminal.h"
 #include "Cryptography.h"
-#include <TextsCore.h>
 extern "C"
 {
 #include <ne_redirect.h>
 #include <ne_auth.h>
 }
-#include <StrUtils.hpp>
 #include <openssl/ssl.h>
 //---------------------------------------------------------------------------
 #define SESSION_PROXY_AUTH_KEY "proxyauth"

source/core/Option.cpp

@@ -1,11 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include <Common.h>
 #include "Option.h"
-#include "TextsCore.h"
-#include "System.StrUtils.hpp"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/PuttyIntf.cpp

@@ -1,14 +1,10 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "PuttyIntf.h"
-#include "Interface.h"
 #include "SecureShell.h"
 #include "Exceptions.h"
-#include "CoreMain.h"
-#include "TextsCore.h"
-#include <StrUtils.hpp>
 #include <Soap.EncdDecd.hpp>
 //---------------------------------------------------------------------------
 char sshver[50];

source/core/Queue.cpp

@@ -1,13 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "Terminal.h"
 #include "Queue.h"
-#include "Exceptions.h"
-#include <System.DateUtils.hpp>
-#include <algorithm>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/RemoteFiles.cpp

@@ -1,19 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "RemoteFiles.h"
-
-#include <SysUtils.hpp>
-#include <StrUtils.hpp>
-#include <DateUtils.hpp>
-
-#include "Exceptions.h"
-#include "Interface.h"
 #include "Terminal.h"
-#include "TextsCore.h"
-#include "HelpCore.h"
 #include "Cryptography.h"
 /* TODO 1 : Path class instead of UnicodeString (handle relativity...) */
 //---------------------------------------------------------------------------

source/core/S3FileSystem.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #define NE_LFS
@@ -8,21 +8,12 @@
 #include "S3FileSystem.h"
 
 #include "SessionData.h"
-#include "Interface.h"
-#include "Common.h"
-#include "Exceptions.h"
 #include "Terminal.h"
-#include "TextsCore.h"
-#include "HelpCore.h"
 #include "NeonIntf.h"
 #include <ne_request.h>
-#include <StrUtils.hpp>
-#include <limits>
-#include "CoreMain.h"
 #include "Http.h"
 #include "Cryptography.h"
 #include <System.JSON.hpp>
-#include <System.DateUtils.hpp>
 #include "request.h"
 #include <XMLDoc.hpp>
 //---------------------------------------------------------------------------

source/core/ScpFileSystem.cpp

@@ -1,19 +1,11 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "ScpFileSystem.h"
 
 #include "Terminal.h"
-#include "Common.h"
-#include "Exceptions.h"
-#include "Interface.h"
-#include "TextsCore.h"
-#include "HelpCore.h"
 #include "SecureShell.h"
-#include <StrUtils.hpp>
-
-#include <stdio.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/Script.cpp

@@ -1,16 +1,10 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include <SysUtils.hpp>
-
-#include "Common.h"
-#include "Exceptions.h"
-#include "TextsCore.h"
 #include "Script.h"
 #include "Terminal.h"
 #include "SessionData.h"
-#include "CoreMain.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/SecureShell.cpp

@@ -1,16 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include "Common.h"
 #include "PuttyIntf.h"
-#include "Exceptions.h"
-#include "Interface.h"
 #include "SecureShell.h"
-#include "TextsCore.h"
-#include "HelpCore.h"
-#include "CoreMain.h"
-#include <StrUtils.hpp>
 #include <Consts.hpp>
 
 #ifndef AUTO_WINSOCK

source/core/Security.cpp

@@ -1,9 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include <limits>
-#include "Common.h"
 #include "Security.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/core/SessionData.cpp

@@ -1,24 +1,17 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "SessionData.h"
 
-#include "Common.h"
-#include "Exceptions.h"
 #include "FileBuffer.h"
-#include "CoreMain.h"
-#include "TextsCore.h"
 #include "PuttyIntf.h"
 #include "RemoteFiles.h"
 #include "SftpFileSystem.h"
 #include "S3FileSystem.h"
 #include "FileMasks.h"
 #include <Soap.EncdDecd.hpp>
-#include <StrUtils.hpp>
 #include <XMLDoc.hpp>
-#include <System.IOUtils.hpp>
-#include <algorithm>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/SessionInfo.cpp

@@ -1,21 +1,14 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
-#include <stdio.h>
 #include <lmcons.h>
 #define SECURITY_WIN32
 #include <sspi.h>
 #include <secext.h>
 
-#include "Common.h"
 #include "SessionInfo.h"
-#include "Exceptions.h"
-#include "TextsCore.h"
-#include "CoreMain.h"
 #include "Script.h"
-#include <System.IOUtils.hpp>
-#include <DateUtils.hpp>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/SftpFileSystem.cpp

@@ -1,22 +1,14 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "SftpFileSystem.h"
 
 #include "PuttyTools.h"
-#include "Common.h"
-#include "Exceptions.h"
-#include "Interface.h"
 #include "Terminal.h"
-#include "TextsCore.h"
-#include "HelpCore.h"
 #include "SecureShell.h"
 #include "Cryptography.h"
 #include <WideStrUtils.hpp>
-#include <limits>
-
-#include <memory>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 //---------------------------------------------------------------------------

source/core/Terminal.cpp

@@ -1,18 +1,11 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include "Terminal.h"
 
-#include <SysUtils.hpp>
-#include <FileCtrl.hpp>
-#include <StrUtils.hpp>
-#include <System.IOUtils.hpp>
-
-#include "Common.h"
 #include "PuttyTools.h"
 #include "FileBuffer.h"
-#include "Interface.h"
 #include "RemoteFiles.h"
 #include "SecureShell.h"
 #include "ScpFileSystem.h"
@@ -20,16 +13,12 @@
 #include "FtpFileSystem.h"
 #include "WebDAVFileSystem.h"
 #include "S3FileSystem.h"
-#include "TextsCore.h"
-#include "HelpCore.h"
-#include "CoreMain.h"
 #include "Queue.h"
 #include "Cryptography.h"
 #include "NeonIntf.h"
 #include <PuttyTools.h>
 #include <openssl/pkcs12.h>
 #include <openssl/err.h>
-#include <algorithm>
 
 #ifndef AUTO_WINSOCK
 #include <winsock2.h>

source/core/Usage.cpp

@@ -1,10 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include <Configuration.h>
-#include <CoreMain.h>
-#include <Common.h>
 #include <Usage.h>
 #include <FileInfo.h>
 //---------------------------------------------------------------------------

source/core/WebDAVFileSystem.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <CorePCH.h>
 #pragma hdrstop
 
 #include <io.h>
@@ -21,16 +21,9 @@
 
 #include "WebDAVFileSystem.h"
 
-#include "Interface.h"
-#include "Common.h"
-#include "Exceptions.h"
 #include "Terminal.h"
-#include "TextsCore.h"
 #include "SecureShell.h"
-#include "HelpCore.h"
-#include "CoreMain.h"
 #include "Security.h"
-#include <StrUtils.hpp>
 #include <NeonIntf.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/filezilla/ApiLog.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "ApiLog.h"
 
 //////////////////////////////////////////////////////////////////////

source/filezilla/AsyncProxySocketLayer.cpp

@@ -6,7 +6,7 @@
 // If you use this class in commercial applications, please send a short message
 // to [email protected]
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "AsyncProxySocketLayer.h"
 #include "atlconv.h" //Unicode<->Ascii conversion macros declared here
 #include <Soap.EncdDecd.hpp>

source/filezilla/AsyncSocketEx.cpp

@@ -6,7 +6,7 @@
 // If you use this class in commercial applications, please send a short message
 // to [email protected]
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "AsyncSocketEx.h"
 #include "wtypes.h"
 #include "oleauto.h"

source/filezilla/AsyncSocketExLayer.cpp

@@ -6,7 +6,7 @@
 // If you use this class in commercial applications, please send a short message
 // to [email protected]
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "AsyncSocketExLayer.h"
 
 #include "AsyncSocketEx.h"

source/filezilla/AsyncSslSocketLayer.cpp

@@ -6,7 +6,7 @@
 // If you use this class in commercial applications, please send a short message
 // to [email protected]
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "AsyncSslSocketLayer.h"
 #include "FilezillaTools.h"
 

source/filezilla/FileZillaApi.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "FileZillaApi.h"
 #include "MainThread.h"
 

source/filezilla/FileZillaIntern.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 //---------------------------------------------------------------------------
 #include "FileZillaIntern.h"
 #include "FileZillaIntf.h"

source/filezilla/FileZillaIntf.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 //---------------------------------------------------------------------------
 #include "FileZillaIntf.h"
 #include "FileZillaIntern.h"

source/filezilla/FileZillaPCH.h

@@ -0,0 +1 @@
+#include "stdafx.h"

source/filezilla/FtpControlSocket.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "FtpControlSocket.h"
 #include "MainThread.h"
 #include "transfersocket.h"

source/filezilla/FtpListResult.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "FtpListResult.h"
 #include "FileZillaApi.h"
 #include <WideStrUtils.hpp>

source/filezilla/FzApiStructures.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "FzApiStructures.h"
 //---------------------------------------------------------------------------
 t_server::t_server()

source/filezilla/MFC64bitFix.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 
 __int64 GetLength64(CFile &file)
 {

source/filezilla/MainThread.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "MainThread.h"
 
 #define ECS m_CriticalSection.Lock()

source/filezilla/ServerPath.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "ServerPath.h"
 #include "structures.h"
 

source/filezilla/TransferSocket.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 #include "TransferSocket.h"
 #include "MainThread.h"
 #include "AsyncProxySocketLayer.h"

source/filezilla/structures.cpp

@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
-#include "stdafx.h"
+#include "FileZillaPCH.h"
 
 t_directory::t_directory()
 {

source/forms/About.cpp

@@ -1,29 +1,15 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <SysUtils.hpp>
-//---------------------------------------------------------------------
-#include <VCLCommon.h>
-#include <Common.h>
-#include <Tools.h>
-#include <GUITools.h>
-#include <CoreMain.h>
 #include <PuttyTools.h>
-#include "WinInterface.h"
 #include "About.h"
-#include "TextsCore.h"
-#include "TextsWin.h"
-#ifndef NO_COMPONENTS
 // must be included before WebBrowserEx.hpp to avoid ambiguity of tagLOGFONTW
 #include <TB2Version.hpp>
 #include <TBX.hpp>
-#endif
 #include <JclBase.hpp>
 #include <JclDebug.hpp>
 #include <WebBrowserEx.hpp>
-#include <StrUtils.hpp>
-#include <Dialogs.hpp>
 #include <FtpFileSystem.h>
 #include <S3FileSystem.h>
 //---------------------------------------------------------------------
@@ -264,8 +250,6 @@ void __fastcall TAboutDialog::DoLoadThirdParty()
 
   AddBrowserLinkHandler(FThirdPartyWebBrowser, EXPAT_LICENSE_URL, ExpatLicenceHandler);
 
-#ifndef NO_COMPONENTS
-
   AddPara(ThirdParty,
     FMTLOAD(ABOUT_TOOLBAR2000, (Toolbar2000Version)) + Br +
     LoadStr(ABOUT_TOOLBAR2000_COPYRIGHT) + Br +
@@ -280,8 +264,6 @@ void __fastcall TAboutDialog::DoLoadThirdParty()
     LoadStr(ABOUT_FILEMANAGER) + Br +
     LoadStr(ABOUT_FILEMANAGER_COPYRIGHT));
 
-#endif
-
   UnicodeString JclVersion =
     FormatVersion(JclVersionMajor, JclVersionMinor, JclVersionRelease) + L" " + JclCommit;
   AddPara(ThirdParty,

source/forms/Animations120.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
+#include <ResourcesPCH.h>
 #pragma hdrstop
 
-#include "Global.h"
 #include "Animations120.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/Animations144.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
+#include <ResourcesPCH.h>
 #pragma hdrstop
 
-#include "Global.h"
 #include "Animations144.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/Animations192.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
+#include <ResourcesPCH.h>
 #pragma hdrstop
 
-#include "Global.h"
 #include "Animations192.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/Animations96.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
+#include <ResourcesPCH.h>
 #pragma hdrstop
 
-#include "Global.h"
 #include "Animations96.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/Authenticate.cpp

@@ -1,19 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-
 #include "Authenticate.h"
-
-#include <VCLCommon.h>
-#include <TextsWin.h>
-#include <Terminal.h>
-#include <CoreMain.h>
-#include <PasTools.hpp>
-#include <CustomWinConfiguration.h>
 #include <Character.hpp>
-#include <Tools.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma resource "*.dfm"

source/forms/Cleanup.cpp

@@ -1,13 +1,7 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <VCLCommon.h>
-#include <CoreMain.h>
-#include <WinConfiguration.h>
-#include <TextsWin.h>
-#include <HelpWin.h>
 #include <PuttyTools.h>
 #include "Cleanup.h"
 //---------------------------------------------------------------------

source/forms/Console.cpp

@@ -1,18 +1,8 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <TextsWin.h>
-#include <Interface.h>
-#include <CoreMain.h>
-#include <VCLCommon.h>
-#include <CustomWinConfiguration.h>
-
 #include "Console.h"
-#include <Tools.h>
-#include <PasTools.hpp>
-#include <GUITools.h>
 //---------------------------------------------------------------------
 #pragma link "HistoryComboBox"
 #pragma link "PathLabel"

source/forms/Copy.cpp

@@ -1,16 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <WinInterface.h>
-#include <CoreMain.h>
-#include <TextsWin.h>
-#include <VCLCommon.h>
-#include <CustomWinConfiguration.h>
-#include <Tools.h>
-#include <GUITools.h>
-
 #include "Copy.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/CopyLocal.cpp

@@ -1,14 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
 #include "CopyLocal.h"
-#include "VCLCommon.h"
-#include "TextsWin.h"
-#include "GUITools.h"
-#include "Tools.h"
-#include "WinInterface.h"
 #include "ComboEdit.hpp"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/CopyParamCustom.cpp

@@ -1,14 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <TextsWin.h>
-#include <GUIConfiguration.h>
-#include <GUITools.h>
-#include <Tools.h>
 #include "CopyParamCustom.h"
-#include "VCLCommon.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "CopyParams"

source/forms/CopyParamPreset.cpp

@@ -1,14 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <TextsWin.h>
-#include <GUIConfiguration.h>
-#include <GUITools.h>
-#include <Tools.h>
 #include "CopyParamPreset.h"
-#include "VCLCommon.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "CopyParams"

source/forms/CopyParams.cpp

@@ -1,16 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-
 #include "CopyParams.h"
-
-#include <VCLCommon.h>
-#include <CoreMain.h>
-#include "CustomWinConfiguration.h"
-#include "TextsWin.h"
-#include "Tools.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "Rights"

source/forms/CreateDirectory.cpp

@@ -1,16 +1,8 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <CoreMain.h>
-#include <Configuration.h>
 #include <RemoteFiles.h>
-#include <VCLCommon.h>
-#include <TextsWin.h>
-#include <Common.h>
-#include <WinInterface.h>
-#include <Tools.h>
-
 #include "CreateDirectory.h"
 //---------------------------------------------------------------------
 #pragma link "Rights"

source/forms/Custom.cpp

@@ -1,23 +1,10 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Dialogs.hpp>
-//---------------------------------------------------------------------
-#include <Common.h>
-#include <CustomWinConfiguration.h>
-#include <WinInterface.h>
-#include <VCLCommon.h>
-#include <TextsWin.h>
-#include <HelpWin.h>
-#include <CoreMain.h>
-#include <PasTools.hpp>
 #include <ProgParams.h>
-#include <Tools.h>
-#include <GUITools.h>
 #include <PuttyTools.h>
 #include <HistoryComboBox.hpp>
-#include <Math.hpp>
 #include <System.Character.hpp>
 
 #include "Custom.h"

source/forms/CustomCommand.cpp

@@ -1,16 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
 #include <Terminal.h>
-#include <TextsWin.h>
-#include <WinConfiguration.h>
-#include <WinInterface.h>
-#include <GUITools.h>
-#include <CoreMain.h>
 #include "CustomCommand.h"
-#include "VCLCommon.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"

source/forms/CustomScpExplorer.cpp

@@ -1,43 +1,24 @@
 //---------------------------------------------------------------------------
-#define NO_WIN32_LEAN_AND_MEAN
-#include <vcl.h>
+#include <WinPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-
 #include "CustomScpExplorer.h"
 
-#include <algorithm>
 #include <Bookmarks.h>
-#include <Interface.h>
-#include <Exceptions.h>
-#include <CoreMain.h>
 #include <FileSystems.h>
-#include <TextsCore.h>
-#include <TextsWin.h>
-#include <HelpWin.h>
-
-#include <VCLCommon.h>
 #include <Progress.h>
 #include <SynchronizeProgress.h>
-
 #include <DragExt.h>
 #include <WinApi.h>
-
 #include "NonVisual.h"
 #include "Glyphs.h"
-#include "Tools.h"
-#include "WinConfiguration.h"
 #include "TerminalManager.h"
 #include "EditorManager.h"
 #include "ProgParams.h"
 #include "Setup.h"
-#include <Consts.hpp>
-#include <DateUtils.hpp>
 #include <TB2Common.hpp>
 #include <DirectoryMonitor.hpp>
-#include <System.IOUtils.hpp>
-#include <System.StrUtils.hpp>
+#include <mmsystem.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "CustomDirView"

source/forms/EditMask.cpp

@@ -1,16 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
 #include <FileMasks.h>
-#include <CoreMain.h>
-#include <TextsWin.h>
-#include <Tools.h>
-#include <VCLCommon.h>
-
 #include "EditMask.h"
-#include "WinConfiguration.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma resource "*.dfm"

source/forms/Editor.cpp

@@ -1,17 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
 #include "Editor.h"
-#include "TextsWin.h"
-#include "Tools.h"
-#include <CoreMain.h>
-#include "VCLCommon.h"
-#include "WinConfiguration.h"
-#include "HelpWin.h"
-#include <BaseUtils.hpp>
-#include <GUITools.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "TB2Dock"

source/forms/EditorPreferences.cpp

@@ -1,14 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <WinConfiguration.h>
-#include <WinInterface.h>
-#include <VCLCommon.h>
-#include <TextsWin.h>
-#include <Tools.h>
-#include <CoreMain.h>
 #include "EditorPreferences.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/FileFind.cpp

@@ -1,15 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <WinInterface.h>
-#include <VCLCommon.h>
-#include <TextsWin.h>
-#include <WinConfiguration.h>
-#include <CoreMain.h>
-#include <Tools.h>
-#include <BaseUtils.hpp>
 #include <Terminal.h>
 #include "FileFind.h"
 //---------------------------------------------------------------------------

source/forms/FileSystemInfo.cpp

@@ -1,17 +1,9 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
 #include <Terminal.h>
-#include <VCLCommon.h>
-#include "WinInterface.h"
 #include "FileSystemInfo.h"
-#include "TextsCore.h"
-#include "TextsWin.h"
-#include "GUITools.h"
-#include <BaseUtils.hpp>
-#include <StrUtils.hpp>
 //---------------------------------------------------------------------
 #pragma link "HistoryComboBox"
 #pragma resource "*.dfm"

source/forms/FormsPCH.h

@@ -0,0 +1,12 @@
+#include <CorePCH.h>
+
+#include <Vcl.Consts.hpp>
+
+#include <GUITools.h>
+#include <HelpWin.h>
+#include <PasTools.hpp>
+#include <Tools.h>
+#include <TextsWin.h>
+#include <VCLCommon.h>
+#include <WinConfiguration.h>
+#include <WinInterface.h>

source/forms/FullSynchronize.cpp

@@ -1,22 +1,10 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-
-#include "WinInterface.h"
 #include "FullSynchronize.h"
 #include "CopyParams.h"
-#include "VCLCommon.h"
-
-#include <CoreMain.h>
-#include <Configuration.h>
-#include <TextsWin.h>
-#include <HelpWin.h>
-#include <GUITools.h>
 #include <Terminal.h>
-#include <CustomWinConfiguration.h>
-#include <Tools.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"

source/forms/GenerateUrl.cpp

@@ -1,17 +1,10 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include "VCLCommon.h"
 #include "GenerateUrl.h"
-#include "CoreMain.h"
-#include "WinConfiguration.h"
-#include <StrUtils.hpp>
-#include <Tools.h>
 #include <PuttyTools.h>
-#include <TextsWin.h>
 #include <ProgParams.h>
-#include <GUITools.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma resource "*.dfm"

source/forms/Glyphs.cpp

@@ -1,15 +1,11 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <ResourcesPCH.h>
 #pragma hdrstop
 
-#include "Global.h"
 #include "Glyphs.h"
 #include "Glyphs120.h"
 #include "Glyphs144.h"
 #include "Glyphs192.h"
-#include "Common.h"
-#include "GUITools.h"
-#include "GUIConfiguration.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "PngImageList"

source/forms/Glyphs120.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
+#include <ResourcesPCH.h>
 #pragma hdrstop
 
-#include "Global.h"
 #include "Glyphs120.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/Glyphs144.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
+#include <ResourcesPCH.h>
 #pragma hdrstop
 
-#include "Global.h"
 #include "Glyphs144.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/Glyphs192.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
+#include <ResourcesPCH.h>
 #pragma hdrstop
 
-#include "Global.h"
 #include "Glyphs192.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/ImportSessions.cpp

@@ -1,21 +1,9 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-
 #include "ImportSessions.h"
-
-#include <Configuration.h>
-#include <CoreMain.h>
-
-#include <VCLCommon.h>
-#include <WinInterface.h>
-#include <TextsWin.h>
-#include <CoreMain.h>
-#include <Tools.h>
 #include <WinApi.h>
-#include <PasTools.hpp>
 //---------------------------------------------------------------------
 #pragma resource "*.dfm"
 //---------------------------------------------------------------------

source/forms/InputDlg.cpp

@@ -1,13 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include "WinInterface.h"
-#include <VCLCommon.h>
-#include <Windows.hpp>
-#include <Consts.hpp>
-#include <HistoryComboBox.hpp>
-#include <PasTools.hpp>
 #include <Custom.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/License.cpp

@@ -1,14 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <TextsWin.h>
-
-#include <VCLCommon.h>
-#include "WinInterface.h"
 #include "License.h"
-#include "Tools.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma resource "*.dfm"

source/forms/LocationProfiles.cpp

@@ -1,20 +1,10 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <CoreMain.h>
-#include <Configuration.h>
 #include <RemoteFiles.h>
-#include <VCLCommon.h>
-#include <TextsWin.h>
-#include <HelpWin.h>
-#include <Common.h>
-
 #include "LocationProfiles.h"
-#include "WinConfiguration.h"
 #include "Custom.h"
-#include <Math.hpp>
-#include <GUITools.h>
 //---------------------------------------------------------------------
 #pragma link "HistoryComboBox"
 #pragma link "PngImageList"

source/forms/Login.cpp

@@ -1,23 +1,10 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <StrUtils.hpp>
-#include <CoreMain.h>
-#include <Common.h>
 #include <PuttyTools.h>
-#include <TextsWin.h>
-#include <TextsCore.h>
-#include <HelpWin.h>
-#include <VCLCommon.h>
-#include <limits>
-
-#include "WinInterface.h"
 #include "Login.h"
-#include "GUITools.h"
-#include "Tools.h"
 #include "Setup.h"
-#include "WinConfiguration.h"
 #include "ProgParams.h"
 #include "WinApi.h"
 #include "S3FileSystem.h"

source/forms/MessageDlg.cpp

@@ -1,21 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Consts.hpp>
-#include <GUITools.h>
-
-#include <Common.h>
-#include <VCLCommon.h>
-#include <CoreMain.h>
-#include <WinInterface.h>
-#include <Tools.h>
-#include <TextsWin.h>
-#include <TextsCore.h>
 #include <Vcl.Imaging.pngimage.hpp>
-#include <StrUtils.hpp>
-#include <PasTools.hpp>
-#include <Math.hpp>
 #include <WebBrowserEx.hpp>
 #include <RegularExpressions.hpp>
 #include <Setup.h>

source/forms/NonVisual.cpp

@@ -1,21 +1,12 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <WinPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-
 #include "NonVisual.h"
 
-#include <CoreMain.h>
-#include <TextsWin.h>
-#include <Tools.h>
 #include <Setup.h>
-
-#include <Interface.h>
-#include "WinConfiguration.h"
 #include "TerminalManager.h"
 #include "TBX.hpp"
-#include "VCLCommon.h"
 #include <HistoryComboBox.hpp>
 #include "Glyphs.h"
 //---------------------------------------------------------------------------

source/forms/OpenDirectory.cpp

@@ -1,18 +1,10 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <CoreMain.h>
-#include <Configuration.h>
 #include <RemoteFiles.h>
-#include <VCLCommon.h>
-#include <TextsWin.h>
-#include <Common.h>
-#include <Math.hpp>
-#include <GUITools.h>
 
 #include "OpenDirectory.h"
-#include "WinConfiguration.h"
 //---------------------------------------------------------------------
 #pragma link "HistoryComboBox"
 #pragma resource "*.dfm"

source/forms/Preferences.cpp

@@ -1,29 +1,12 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <StrUtils.hpp>
-#include <System.IOUtils.hpp>
-#include <Common.h>
-#include <math.h>
-#include <limits>
-#include <algorithm>
-
 #include "Preferences.h"
-#include "Custom.h"
 
-#include <CoreMain.h>
+#include "Custom.h"
 #include <Terminal.h>
 #include <Bookmarks.h>
-
-#include "VCLCommon.h"
-#include "GUITools.h"
-#include "Tools.h"
-#include "TextsCore.h"
-#include "TextsWin.h"
-#include "HelpWin.h"
-#include "WinInterface.h"
-#include "WinConfiguration.h"
 #include "Setup.h"
 #include "ProgParams.h"
 #include "Http.h"

source/forms/Progress.cpp

@@ -1,21 +1,8 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <CoreMain.h>
-#include <TextsWin.h>
-#include <HelpWin.h>
-#include <WinInterface.h>
-#include <VCLCommon.h>
-#include <CustomWinConfiguration.h>
-#include <GUITools.h>
-#include <BaseUtils.hpp>
-#include <DateUtils.hpp>
-#include <Consts.hpp>
-#include <HistoryComboBox.hpp>
 #include <windowsx.h>
-#include <algorithm>
 
 #include "Progress.h"
 //---------------------------------------------------------------------

source/forms/Properties.cpp

@@ -1,18 +1,10 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include "WinInterface.h"
 #include "Properties.h"
 
-#include <VCLCommon.h>
-#include <Common.h>
 #include <Terminal.h>
-#include <TextsWin.h>
-#include <GUITools.h>
-#include <CoreMain.h>
-#include <Tools.h>
-#include <BaseUtils.hpp>
 //---------------------------------------------------------------------
 #pragma link "PathLabel"
 #pragma link "Rights"

source/forms/RemoteTransfer.cpp

@@ -1,15 +1,7 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-#include <VCLCommon.h>
-#include <TextsWin.h>
-#include <CustomWinConfiguration.h>
-#include <CoreMain.h>
-#include <WinInterface.h>
-#include <GUITools.h>
-
 #include "RemoteTransfer.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

source/forms/ResourcesPCH.h

@@ -0,0 +1,9 @@
+#include <System.Classes.hpp>
+#include <System.ImageList.hpp>
+#include <Vcl.Controls.hpp>
+#include <Vcl.ImgList.hpp>
+
+#include "Common.h"
+#include "GUITools.h"
+#include "GUIConfiguration.h"
+#include "PngImageList.hpp"

source/forms/Rights.cpp

@@ -1,14 +1,8 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
-
 #include "Rights.h"
-
-#include <VCLCommon.h>
-#include <Tools.h>
-#include <TextsWin.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GrayedCheckBox"

source/forms/ScpCommander.cpp

@@ -1,26 +1,12 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <WinPCH.h>
 #pragma hdrstop
 
 #include "ScpCommander.h"
 
-#include <Common.h>
-#include <CoreMain.h>
-#include <Interface.h>
-#include <TextsCore.h>
-#include <TextsWin.h>
-#include <HelpWin.h>
-#include <VCLCommon.h>
-#include <GUITools.h>
 #include <DragDrop.hpp>
-#include <StrUtils.hpp>
-#include <IOUtils.hpp>
-#include <DateUtils.hpp>
-
 #include "Glyphs.h"
 #include "NonVisual.h"
-#include "Tools.h"
-#include "WinConfiguration.h"
 #include "TerminalManager.h"
 #include "Bookmarks.h"
 //---------------------------------------------------------------------------

source/forms/ScpExplorer.cpp

@@ -1,18 +1,11 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <WinPCH.h>
 #pragma hdrstop
 
 #include "ScpExplorer.h"
 
-#include <Common.h>
-#include <CoreMain.h>
-
 #include "NonVisual.h"
 #include "Glyphs.h"
-#include "Tools.h"
-#include "WinConfiguration.h"
-#include <VCLCommon.h>
-#include <TextsWin.h>
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "CustomDirView"

source/forms/SelectMask.cpp

@@ -1,17 +1,9 @@
 //---------------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <Common.h>
 #include <FileMasks.h>
-#include <CoreMain.h>
-#include <TextsWin.h>
-#include <HelpWin.h>
-#include <Tools.h>
-#include <VCLCommon.h>
-
 #include "SelectMask.h"
-#include "WinConfiguration.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "HistoryComboBox"

source/forms/SiteAdvanced.cpp

@@ -1,23 +1,10 @@
 //---------------------------------------------------------------------
-#include <vcl.h>
+#include <FormsPCH.h>
 #pragma hdrstop
 
-#include <StrUtils.hpp>
-#include <CoreMain.h>
-#include <Common.h>
-#include <TextsWin.h>
-#include <TextsCore.h>
-#include <HelpCore.h>
-#include <HelpWin.h>
-#include <VCLCommon.h>
 #include <Cryptography.h>
 #include <S3FileSystem.h>
-
-#include "WinInterface.h"
 #include "SiteAdvanced.h"
-#include "GUITools.h"
-#include "Tools.h"
-#include "WinConfiguration.h"
 #include "PuttyTools.h"
 #include "TerminalManager.h"
 #include "Authenticate.h"