Removed unused units from the uses clause

source/uCEFAccessibilityHandler.pas

@@ -12,7 +12,7 @@ unit uCEFAccessibilityHandler;
 interface
 
 uses
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFChromiumEvents;
+  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
 
 type
   TOnAccessibilityEvent = procedure(Sender: TObject; const value: ICefValue) of object;

source/uCEFApp.pas

@@ -71,8 +71,8 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFCommandLine, uCEFConstants,
-  uCEFBrowserProcessHandler, uCEFResourceBundleHandler, uCEFRenderProcessHandler;
+  uCEFMiscFunctions, uCEFCommandLine, uCEFBrowserProcessHandler,
+  uCEFResourceBundleHandler, uCEFRenderProcessHandler;
 
 
 // TCefAppOwn

source/uCEFApplication.pas

@@ -216,6 +216,8 @@ begin
          else
           TempHandle := Application.Handle;
 
+     TempDPI := 0;
+
      if GetDPIForHandle(TempHandle, TempDPI) then
        FDeviceScaleFactor := TempDPI / USER_DEFAULT_SCREEN_DPI
       else

source/uCEFApplicationCore.pas

@@ -18,16 +18,16 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes, System.UITypes, System.SyncObjs,
+    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes, System.UITypes,
     {$IFDEF FMX}uCEFLinuxTypes,{$ENDIF}
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, {$IFDEF FPC}dynlibs,{$ENDIF} SyncObjs,
+    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, {$IFDEF FPC}dynlibs,{$ENDIF}
   {$ENDIF}
   {$IFDEF LINUX}
     {$IFDEF FPC}xlib,{$ENDIF} uCEFArgCopy,
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFApplicationEvents, uCEFBaseRefCounted,
-  uCEFSchemeRegistrar, uCEFPreferenceRegistrar, uCEFComponentIdList;
+  uCEFTypes, uCEFInterfaces, uCEFApplicationEvents, uCEFSchemeRegistrar,
+  uCEFPreferenceRegistrar, uCEFComponentIdList;
 
 const
   {$I uCEFVersion.inc}
@@ -2083,9 +2083,7 @@ uses
     {$ENDIF}
   {$ENDIF}
   {$IFDEF MACOSX}uCEFMacOSFunctions,{$ENDIF}
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFCommandLine, uCEFConstants,
-  uCEFSchemeHandlerFactory, uCEFCookieManager, uCEFApp, uCEFCompletionCallback,
-  uCEFWaitableEvent, uCEFBrowser;
+  uCEFLibFunctions, uCEFMiscFunctions, uCEFConstants, uCEFApp, uCEFBrowser;
 
 procedure DestroyGlobalCEFApp;
 begin
@@ -2867,7 +2865,8 @@ var
   TempMachine : integer;
   TempVersionInfo : TFileVersionInfo;
 begin
-  Result := False;
+  Result      := False;
+  TempMachine := 0;
 
   if CheckDLLVersion(LibCefPath,
                      CEF_SUPPORTED_VERSION_MAJOR,
@@ -4512,7 +4511,7 @@ end;
 
 function TCefApplicationCore.Load_cef_api_hash_h : boolean;
 begin
-  {$IFDEF FPC}Pointer({$ENDIF}cef_api_hash{$IFDEF FPC}){$ENDIF} := GetProcAddress(FLibHandle, 'cef_api_hash');
+  {$IFDEF FPC}Pointer({$ENDIF}uCEFLibFunctions.cef_api_hash{$IFDEF FPC}){$ENDIF}    := GetProcAddress(FLibHandle, 'cef_api_hash');
   {$IFDEF FPC}Pointer({$ENDIF}uCEFLibFunctions.cef_api_version{$IFDEF FPC}){$ENDIF} := GetProcAddress(FLibHandle, 'cef_api_version');
 
   Result := assigned(cef_api_hash) and
@@ -4593,7 +4592,7 @@ end;
 
 function TCefApplicationCore.Load_cef_cookie_capi_h : boolean;
 begin
-  {$IFDEF FPC}Pointer({$ENDIF}cef_cookie_manager_get_global_manager{$IFDEF FPC}){$ENDIF}   := GetProcAddress(FLibHandle, 'cef_cookie_manager_get_global_manager');
+  {$IFDEF FPC}Pointer({$ENDIF}cef_cookie_manager_get_global_manager{$IFDEF FPC}){$ENDIF} := GetProcAddress(FLibHandle, 'cef_cookie_manager_get_global_manager');
 
   Result := assigned(cef_cookie_manager_get_global_manager);
 end;
@@ -4901,7 +4900,7 @@ begin
   {$IFDEF FPC}Pointer({$ENDIF}cef_v8_value_create_function{$IFDEF FPC}){$ENDIF}                 := GetProcAddress(FLibHandle, 'cef_v8_value_create_function');
   {$IFDEF FPC}Pointer({$ENDIF}cef_v8_value_create_promise{$IFDEF FPC}){$ENDIF}                  := GetProcAddress(FLibHandle, 'cef_v8_value_create_promise');
   {$IFDEF FPC}Pointer({$ENDIF}cef_v8_stack_trace_get_current{$IFDEF FPC}){$ENDIF}               := GetProcAddress(FLibHandle, 'cef_v8_stack_trace_get_current');
-  {$IFDEF FPC}Pointer({$ENDIF}cef_register_extension{$IFDEF FPC}){$ENDIF}                      := GetProcAddress(FLibHandle, 'cef_register_extension');
+  {$IFDEF FPC}Pointer({$ENDIF}cef_register_extension{$IFDEF FPC}){$ENDIF}                       := GetProcAddress(FLibHandle, 'cef_register_extension');
 
   Result := assigned(cef_v8_context_get_current_context) and
             assigned(cef_v8_context_get_entered_context) and

source/uCEFAudioHandler.pas

@@ -54,7 +54,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser;
+  uCEFMiscFunctions, uCEFBrowser;
 
 function cef_audio_handler_get_audio_parameters(self    : PCefAudioHandler;
                                                 browser : PCefBrowser;

source/uCEFAuthCallback.pas

@@ -27,7 +27,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure TCefAuthCallbackRef.Cancel;
 begin

source/uCEFBeforeDownloadCallback.pas

@@ -26,7 +26,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure TCefBeforeDownloadCallbackRef.Cont(const downloadPath: ustring; showDialog: Boolean);
 var

source/uCEFBrowserBitmap.pas

@@ -48,9 +48,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions;
-
 constructor TCEFBrowserBitmap.Create;
 begin
   inherited Create;

source/uCEFBrowserProcessHandler.pas

@@ -17,7 +17,7 @@ uses
   {$ELSE}
   Classes,
   {$ENDIF}
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplicationCore, uCEFPreferenceRegistrar;
+  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplicationCore;
 
 type
   TCefBrowserProcessHandlerOwn = class(TCefBaseRefCountedOwn, ICefBrowserProcessHandler)
@@ -63,7 +63,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFCommandLine, uCEFListValue, uCEFConstants, uCEFStringList;
+  uCEFMiscFunctions, uCEFCommandLine;
 
 procedure cef_browser_process_handler_on_register_custom_preferences(self: PCefBrowserProcessHandler; type_: TCefPreferencesType; registrar: PCefPreferenceRegistrar); stdcall;
 var

source/uCEFBrowserViewComponent.pas

@@ -13,14 +13,14 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes,
+    System.Classes, uCEFConstants,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes,
+    Classes,
     {$IFDEF FPC}
     LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFConstants, uCEFViewsFrameworkEvents, uCEFViewComponent;
+  uCEFTypes, uCEFInterfaces, uCEFViewsFrameworkEvents, uCEFViewComponent;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows or pfidOSX or pfidLinux)]{$ENDIF}{$ENDIF}

source/uCEFBrowserViewDelegate.pas

@@ -159,7 +159,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFBrowserView, uCEFBrowser, uCEFClient, uCEFConstants;
+  uCEFMiscFunctions, uCEFBrowserView, uCEFBrowser, uCEFClient, uCEFConstants;
 
 
 // **************************************************************

source/uCEFBrowserWindow.pas

@@ -9,7 +9,7 @@ uses
   {$IFDEF FPC}
   LResources, PropEdits,
   {$ENDIF}
-  uCEFApplication, uCEFChromiumWindow, uCEFTypes, uCEFInterfaces, uCEFChromium,
+  uCEFApplication, uCEFTypes, uCEFInterfaces, uCEFChromium,
   uCEFLinkedWinControlBase, uCEFBrowserViewComponent,
   uCEFChromiumEvents, Forms, ExtCtrls, Controls, Classes, sysutils;
 

source/uCEFBufferPanel.pas

@@ -15,10 +15,10 @@ uses
   {$ELSE}
     {$IFDEF MSWINDOWS}Windows, imm, {$ENDIF} Classes, Forms, Controls, Graphics,
     {$IFDEF FPC}
-      LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase, {$IFDEF MSWINDOWS}Win32Extra,{$ENDIF}
-      {$IFDEF LINUXFPC}Messages,{$ENDIF}
+      LCLProc, LCLType, LCLIntf, LResources, InterfaceBase, {$IFDEF MSWINDOWS}Win32Extra,{$ENDIF}
+      {$IFDEF LINUXFPC}Messages, LMessages,{$ENDIF}
       {$IFDEF LCLGTK2}glib2, gdk2, gtk2,{$ENDIF}         
-      {$IFDEF LCLGTK3}LazGdk3, LazGtk3, LazGObject2, LazGLib2, gtk3procs, gtk3objects, gtk3widgets,{$ENDIF}
+      {$IFDEF LCLGTK3}LazGdk3, LazGtk3, LazGObject2, LazGLib2, gtk3procs, gtk3widgets,{$ENDIF}
       {$IFDEF LCLQT}qtobjects, qtwidgets, qt4, QtWSExtCtrls, QtWSControls, WSLCLClasses,{$ENDIF}
       {$IFDEF LCLQT5}qtobjects, qtwidgets, qt5, QtWSExtCtrls, QtWSControls, WSLCLClasses,{$ENDIF}
       {$IFDEF LCLQT6}qtobjects, qtwidgets, qt6, QtWSExtCtrls, QtWSControls, WSLCLClasses,{$ENDIF}

source/uCEFButton.pas

@@ -67,7 +67,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFLabelButton;
+  uCEFMiscFunctions, uCEFLabelButton;
 
 function TCefButtonRef.AsLabelButton : ICefLabelButton;
 begin

source/uCEFButtonComponent.pas

@@ -13,9 +13,9 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes,
+    System.Classes,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes,
+    Classes,
     {$IFDEF FPC}
     LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ENDIF}
@@ -110,9 +110,6 @@ type
 
 implementation
 
-uses
-  uCEFButtonDelegate;
-
 procedure TCEFButtonComponent.Initialize;
 begin
   inherited Initialize;

source/uCEFButtonDelegate.pas

@@ -93,7 +93,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFButton;
+  uCEFMiscFunctions, uCEFButton;
 
 
 // **************************************************************

source/uCEFCallback.pas

@@ -26,9 +26,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefCallbackRef.Cancel;
 begin
   PCefCallback(FData)^.cancel(PCefCallback(FData));

source/uCEFChromium.pas

@@ -17,12 +17,12 @@ uses
   {$ELSE}
     {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, Controls, Graphics, Forms,
     {$IFDEF FPC}
-    LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
+    LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ELSE}
     Messages,
     {$ENDIF}
   {$ENDIF}
-  uCEFConstants, uCEFTypes, uCEFInterfaces, uCEFChromiumCore;
+  uCEFTypes, uCEFInterfaces, uCEFChromiumCore, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows)]{$ENDIF}{$ENDIF}

source/uCEFChromiumCore.pas

@@ -18,7 +18,7 @@ uses
   {$ELSE}
     {$IFDEF MSWINDOWS}Windows, ActiveX, CommCtrl,{$ENDIF} Classes,
     {$IFDEF FPC}
-      LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
+      LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
       {$IFDEF LINUX}xlib,{$ENDIF}
     {$ELSE}
       Messages,
@@ -26,9 +26,10 @@ uses
     SyncObjs,
   {$ENDIF}
   uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFMiscFunctions, uCEFClient,
-  uCEFConstants, uCEFTask, uCEFDomVisitor, uCEFChromiumEvents,
-  {$IFDEF MSWINDOWS}uCEFDragAndDropMgr,{$ENDIF}
-  {$IFDEF LINUX}uCEFLinuxTypes, uCEFLinuxFunctions,{$ENDIF}
+  uCEFConstants, uCEFTask, uCEFChromiumEvents,
+  {$IFDEF MSWINDOWS}uCEFDragAndDropMgr,{$ENDIF}    
+  {$IFDEF LINUXFMX}uCEFLinuxTypes,{$ENDIF}
+  {$IFDEF LCLGTK3}uCEFLinuxFunctions,{$ENDIF}
   uCEFChromiumOptions, uCEFChromiumFontOptions, uCEFPDFPrintOptions,
   uCEFBrowserViewComponent, uCEFWindowInfoWrapper, uCEFPreferenceObserver,
   uCEFSettingObserver;
@@ -4242,15 +4243,15 @@ uses
     {$IFDEF FPC}
       {$IFDEF LINUX}x, xatom,
         {$IFDEF LCLGTK2}gdk2x, gtk2,{$ENDIF}
-        {$IFDEF LCLGTK3}LazGdk3, LazGtk3, LazGLib2,{$ENDIF}
+        {$IFDEF LCLGTK3}LazGLib2,{$ENDIF}
         {$IFDEF LCLQT}qt4,{$ENDIF}
         {$IFDEF LCLQT5}qt5,{$ENDIF}
         {$IFDEF LCLQT6}qtint,{$ENDIF}
       {$ENDIF}
     {$ENDIF}
   {$ENDIF}
-  uCEFBrowser, uCEFValue, uCEFDictionaryValue, uCEFStringMultimap, uCEFFrame,
-  uCEFApplicationCore, uCEFProcessMessage, uCEFRequestContext,
+  uCEFBrowser, uCEFValue, uCEFDictionaryValue, uCEFStringMultimap,
+  uCEFApplicationCore, uCEFRequestContext,
   {$IFDEF MSWINDOWS}uCEFOLEDragAndDrop,{$ENDIF}
   uCEFPDFPrintCallback, uCEFResolveCallback, uCEFDeleteCookiesCallback,
   uCEFStringVisitor, uCEFListValue, uCEFNavigationEntryVisitor,

source/uCEFChromiumWindow.pas

@@ -17,13 +17,12 @@ uses
   {$ELSE}
     {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, Forms, Controls, Graphics,
     {$IFDEF FPC}
-    LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
+    LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ELSE}
     Messages,
     {$ENDIF}
   {$ENDIF}
-  uCEFWindowParent, uCEFChromium, uCEFInterfaces, uCEFConstants, uCEFTypes,
-  uCEFWinControl, uCEFLinkedWinControlBase;
+  uCEFChromium, uCEFInterfaces, uCEFTypes, uCEFLinkedWinControlBase, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows)]{$ENDIF}{$ENDIF}

source/uCEFClient.pas

@@ -129,12 +129,13 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFProcessMessage, uCEFBrowser, uCEFLoadHandler,
-  uCEFFocusHandler, uCEFContextMenuHandler, uCEFDialogHandler, uCEFKeyboardHandler,
-  uCEFDisplayHandler, uCEFDownloadHandler, uCEFJsDialogHandler,
-  uCEFLifeSpanHandler, uCEFRequestHandler, uCEFRenderHandler, uCEFDragHandler,
-  uCEFFindHandler, uCEFConstants, uCEFApplicationCore, uCEFFrame, uCEFAudioHandler,
-  uCEFPrintHandler, uCEFFrameHandler, uCEFCommandHandler, uCEFPermissionHandler;
+  uCEFMiscFunctions, uCEFProcessMessage, uCEFBrowser, uCEFLoadHandler,
+  uCEFFocusHandler, uCEFContextMenuHandler, uCEFDialogHandler,
+  uCEFKeyboardHandler, uCEFDisplayHandler, uCEFDownloadHandler,
+  uCEFJsDialogHandler, uCEFLifeSpanHandler, uCEFRequestHandler,
+  uCEFRenderHandler, uCEFDragHandler, uCEFFindHandler, uCEFFrame,
+  uCEFAudioHandler, uCEFPrintHandler, uCEFFrameHandler, uCEFCommandHandler,
+  uCEFPermissionHandler;
 
 
 // ******************************************************

source/uCEFCommandHandler.pas

@@ -54,7 +54,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser;
+  uCEFMiscFunctions, uCEFBrowser;
 
 function cef_command_handler_on_chrome_command(self        : PCefCommandHandler;
                                                browser     : PCefBrowser;

source/uCEFCompletionCallback.pas

@@ -12,7 +12,7 @@ unit uCEFCompletionCallback;
 interface
 
 uses
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFWaitableEvent;
+  uCEFBaseRefCounted, uCEFInterfaces;
 
 type
   TCefCompletionCallbackOwn = class(TCefBaseRefCountedOwn, ICefCompletionCallback)
@@ -56,7 +56,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFTypes;
+  uCEFMiscFunctions, uCEFTypes;
 
 procedure cef_completion_callback_on_complete(self: PCefCompletionCallback); stdcall;
 var

source/uCEFComponentIdList.pas

@@ -10,7 +10,7 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-  System.Classes, System.SyncObjs;
+  System.Classes, System.SyncObjs, System.Types;
   {$ELSE}
   Classes, SyncObjs;
   {$ENDIF}
@@ -57,9 +57,9 @@ implementation
 
 uses
   {$IFDEF DELPHI16_UP}
-  System.SysUtils, System.Types;
+    System.SysUtils;
   {$ELSE}
-  SysUtils, Types;
+    SysUtils;
   {$ENDIF}
 
 constructor TCEFComponentIdList.Create;

source/uCEFContextMenuHandler.pas

@@ -58,7 +58,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFContextMenuParams,
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFContextMenuParams,
   uCEFMenuModel, uCEFRunContextMenuCallback, uCEFRunQuickMenuCallback;
 
 procedure cef_context_menu_handler_on_before_context_menu(self    : PCefContextMenuHandler;

source/uCEFContextMenuParams.pas

@@ -49,8 +49,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFStringList;
-
+  uCEFMiscFunctions, uCEFStringList;
 
 function TCefContextMenuParamsRef.GetDictionarySuggestions(const suggestions : TStringList): Boolean;
 var

source/uCEFCookieAccessFilter.pas

@@ -58,7 +58,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCefResponse;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCefResponse;
 
 // TCefCookieAccessFilterOwn
 

source/uCEFCookieManager.pas

@@ -48,7 +48,7 @@ implementation
 
 uses
   uCEFMiscFunctions, uCEFLibFunctions, uCEFDeleteCookiesCallback,
-  uCEFSetCookieCallback, uCEFCookieVisitor, uCEFStringList;
+  uCEFSetCookieCallback, uCEFCookieVisitor;
 
 
 function TCefCookieManagerRef.DeleteCookies(const url        : ustring;

source/uCEFCookieVisitor.pas

@@ -53,7 +53,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function cef_cookie_visitor_visit(      self         : PCefCookieVisitor;
                                   const cookie       : PCefCookie;

source/uCEFCustomStreamReader.pas

@@ -40,7 +40,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function cef_stream_reader_read(self: PCefReadHandler; ptr: Pointer; size, n: NativeUInt): NativeUInt; stdcall;
 var

source/uCEFDeleteCookiesCallback.pas

@@ -53,7 +53,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure cef_delete_cookie_callback_on_complete(self: PCefDeleteCookiesCallback; num_deleted: Integer); stdcall;
 var

source/uCEFDevToolsMessageObserver.pas

@@ -50,7 +50,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFJson;
+  uCEFMiscFunctions, uCEFBrowser;
 
 
 // ************************************************************

source/uCEFDialogHandler.pas

@@ -51,7 +51,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFileDialogCallback, uCEFStringList;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFileDialogCallback, uCEFStringList;
 
 function cef_dialog_handler_on_file_dialog(self                    : PCefDialogHandler;
                                            browser                 : PCefBrowser;

source/uCEFDisplayHandler.pas

@@ -167,7 +167,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFStringList;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFStringList;
 
 
 procedure cef_display_handler_on_address_change(      self    : PCefDisplayHandler;

source/uCEFDomNode.pas

@@ -13,9 +13,9 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes, System.SysUtils,
+    System.Classes, System.SysUtils,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, SysUtils,
+    Classes, SysUtils,
   {$ENDIF}
   uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
 

source/uCEFDomVisitor.pas

@@ -64,7 +64,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFDomDocument;
+  uCEFMiscFunctions, uCEFDomDocument;
 
 procedure cef_dom_visitor_visite(self: PCefDomVisitor; document: PCefDomDocument); stdcall;
 var

source/uCEFDownloadHandler.pas

@@ -45,7 +45,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFDownloadItem, uCEFBeforeDownloadCallback,
+  uCEFMiscFunctions, uCEFBrowser, uCEFDownloadItem, uCEFBeforeDownloadCallback,
   uCEFDownloadItemCallback;
 
 function cef_download_handler_can_download(      self           : PCefDownloadHandler;
@@ -188,4 +188,4 @@ begin
     IChromiumEvents(FEvents).doOnDownloadUpdated(browser, downloadItem, callback);
 end;
 
-end.
+end.

source/uCEFDownloadImageCallBack.pas

@@ -53,7 +53,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFImage;
+  uCEFMiscFunctions, uCEFImage;
 
 
 // TCefDownloadImageCallbackOwn

source/uCEFDownloadItem.pas

@@ -43,7 +43,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function TCefDownloadItemRef.GetContentDisposition: ustring;
 begin

source/uCEFDownloadItemCallback.pas

@@ -26,9 +26,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefDownloadItemCallbackRef.cancel;
 begin
   PCefDownloadItemCallback(FData)^.cancel(PCefDownloadItemCallback(FData));

source/uCEFDragAndDropMgr.pas

@@ -15,11 +15,12 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-  {$IFDEF MSWINDOWS}WinApi.Windows, WinApi.ActiveX, WinApi.ShlObj, WinApi.ShellApi,{$ENDIF}
-  System.Classes, System.SysUtils, System.Math, System.StrUtils, System.AnsiStrings,
+    {$IFDEF MSWINDOWS}WinApi.Windows, WinApi.ActiveX, WinApi.ShlObj, WinApi.ShellApi,{$ENDIF}
+    System.Classes, System.SysUtils, System.Math, System.StrUtils, System.AnsiStrings,
   {$ELSE}
-  {$IFDEF MSWINDOWS}Windows, ActiveX, ShlObj, Shellapi,{$ENDIF}
-  Classes, SysUtils, Math, StrUtils, {$IFDEF DELPHI12_UP}AnsiStrings,{$ENDIF}
+    {$IFDEF MSWINDOWS}Windows, ActiveX, Shellapi,{$ENDIF}
+    {$IFNDEF FPC}ShlObj,{$ENDIF} Classes, SysUtils, StrUtils,
+    {$IFDEF DELPHI12_UP}AnsiStrings,{$ENDIF}
   {$ENDIF}
   uCEFDragData, uCEFInterfaces, uCEFTypes, uCEFOLEDragAndDrop;
 
@@ -388,8 +389,6 @@ const
   CFHTML_ENDHTML   : AnsiString = 'EndHTML:';
   CFHTML_STARTFRAG : AnsiString = 'StartFragment:';
   CFHTML_ENDFRAG   : AnsiString = 'EndFragment:';
-  CFHTML_STARSEL   : AnsiString = 'StartSelection:';
-  CFHTML_ENDSEL    : AnsiString = 'EndSelection:';
   CFHTML_SOURCEURL : AnsiString = 'SourceURL:';
   FRAGMENT_START   : AnsiString = '<!--StartFragment';
   FRAGMENT_END     : AnsiString = '<!--EndFragment';

source/uCEFDragHandler.pas

@@ -48,7 +48,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFDragData, uCEFFrame;
+  uCEFMiscFunctions, uCEFBrowser, uCEFDragData, uCEFFrame;
 
 function cef_drag_handler_on_drag_enter(self     : PCefDragHandler;
                                         browser  : PCefBrowser;

source/uCEFEndTracingCallback.pas

@@ -33,7 +33,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 // TCefEndTracingCallbackOwn
 

source/uCEFFileDialogCallback.pas

@@ -31,7 +31,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFStringList;
+  uCEFStringList;
 
 procedure TCefFileDialogCallbackRef.Cancel;
 begin

source/uCEFFillLayout.pas

@@ -17,7 +17,7 @@ uses
   {$ELSE}
   Classes, SysUtils,
   {$ENDIF}
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFLayout;
+  uCEFBaseRefCounted, uCEFInterfaces, uCEFLayout;
 
 type
   /// <summary>

source/uCEFFindHandler.pas

@@ -46,7 +46,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser;
+  uCEFMiscFunctions, uCEFBrowser;
 
 procedure cef_find_handler_on_find_result(      self                 : PCefFindHandler;
                                                 browser              : PCefBrowser;

source/uCEFFocusHandler.pas

@@ -50,7 +50,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser;
+  uCEFMiscFunctions, uCEFBrowser;
 
 procedure cef_focus_handler_on_take_focus(self    : PCefFocusHandler;
                                           browser : PCefBrowser;

source/uCEFFrame.pas

@@ -53,7 +53,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFStringVisitor, uCEFv8Context, uCEFDomVisitor, uCEFUrlRequest;
+  uCEFMiscFunctions, uCEFBrowser, uCEFStringVisitor, uCEFv8Context, uCEFDomVisitor, uCEFUrlRequest;
 
 function TCefFrameRef.IsValid: Boolean;
 begin

source/uCEFFrameHandler.pas

@@ -54,7 +54,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFClient, uCEFBrowser, uCEFFrame;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame;
 
 
 // TCefFrameHandlerOwn

source/uCEFImage.pas

@@ -12,11 +12,6 @@ unit uCEFImage;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-  {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF}
-  {$ELSE}
-  {$IFDEF MSWINDOWS}Windows,{$ENDIF}
-  {$ENDIF}
   uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
 
 type

source/uCEFInterfaces.pas

@@ -13,9 +13,9 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes,
+    System.Classes,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes,
+    Classes,
   {$ENDIF}
   uCEFTypes, uCEFSchemeRegistrar;
 

source/uCEFJsDialogCallback.pas

@@ -26,7 +26,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure TCefJsDialogCallbackRef.Cont(success: Boolean; const userInput: ustring);
 var

source/uCEFJsDialogHandler.pas

@@ -52,7 +52,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFJsDialogCallback;
+  uCEFMiscFunctions, uCEFBrowser, uCEFJsDialogCallback;
 
 function cef_jsdialog_handler_on_jsdialog(      self                : PCefJsDialogHandler;
                                                 browser             : PCefBrowser;

source/uCEFKeyboardHandler.pas

@@ -48,7 +48,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser;
+  uCEFMiscFunctions, uCEFBrowser;
 
 function cef_keyboard_handler_on_pre_key_event(      self                 : PCefKeyboardHandler;
                                                      browser              : PCefBrowser;

source/uCEFLabelButtonComponent.pas

@@ -13,14 +13,14 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes,
+    System.Classes,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes,
+    Classes,
     {$IFDEF FPC}
     LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFConstants, uCEFViewsFrameworkEvents, uCEFButtonComponent;
+  uCEFTypes, uCEFInterfaces, uCEFButtonComponent, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows or pfidOSX or pfidLinux)]{$ENDIF}{$ENDIF}
@@ -140,7 +140,7 @@ procedure Register;
 implementation
 
 uses
-  uCEFLabelButton, uCEFMiscFunctions, uCEFButtonDelegate;
+  uCEFLabelButton, uCEFButtonDelegate;
 
 procedure TCEFLabelButtonComponent.CreateLabelButton(const aText : ustring);
 begin

source/uCEFLayout.pas

@@ -53,7 +53,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFBoxLayout, uCEFFillLayout;
+  uCEFBoxLayout, uCEFFillLayout;
 
 function TCefLayoutRef.AsBoxLayout : ICefBoxLayout;
 begin

source/uCEFLibFunctions.pas

@@ -12,11 +12,6 @@ unit uCEFLibFunctions;
 interface
 
 uses
-  {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Math,
-  {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Math,
-  {$ENDIF}
   {$IFDEF LINUX}
     {$IFDEF FPC}xlib,{$ENDIF}
     {$IFDEF FMX}uCEFLinuxTypes,{$ENDIF}

source/uCEFLifeSpanHandler.pas

@@ -56,7 +56,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFClient, uCEFBrowser, uCEFFrame, uCEFDictionaryValue;
+  uCEFMiscFunctions, uCEFClient, uCEFBrowser, uCEFFrame, uCEFDictionaryValue;
 
 function cef_life_span_handler_on_before_popup(      self                 : PCefLifeSpanHandler;
                                                      browser              : PCefBrowser;

source/uCEFLinkedWinControlBase.pas

@@ -21,7 +21,7 @@ uses
     {$IFDEF MSWINDOWS}Windows, Messages,{$ENDIF} Classes, Controls,
     {$IFDEF FPC}{$IFDEF MACOSX}CocoaAll,{$ENDIF}LCLProc, LCLType, LCLIntf,{$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFWinControl, uCEFChromium;
+  uCEFWinControl, uCEFChromium;
 
 type
   /// <summary>
@@ -78,7 +78,6 @@ begin
   {$ENDIF}
   {$IF DEFINED(LCLQT) OR DEFINED(LCLQT5) OR DEFINED(LCLQT6) OR DEFINED(LCLGTK3)}
   BevelOuter   := bvNone;
-  BevelWidth   := 0;
   Caption      := '';
   ControlStyle := ControlStyle - [csNoFocus];
   TabStop      := True;

source/uCEFLinkedWindowParent.pas

@@ -13,18 +13,16 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes, Vcl.Controls,
+    System.Classes, Vcl.Controls,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, Forms, Controls, Graphics,
+    Classes, Forms, Controls, Graphics,
     {$IFDEF FPC}
-      LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
-      {$IFDEF LINUX}xlib, x,{$ENDIF}
+      LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ELSE}
       Messages,
     {$ENDIF}
   {$ENDIF}
-  uCEFWinControl, uCEFTypes, uCEFInterfaces, uCEFChromium,
-  uCEFConstants, uCEFLinkedWinControlBase;
+  uCEFChromium, uCEFLinkedWinControlBase, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows)]{$ENDIF}{$ENDIF}
@@ -64,9 +62,6 @@ procedure Register;
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFClient, uCEFLibFunctions, uCEFApplication;
-
 constructor TCEFLinkedWindowParent.Create(AOwner : TComponent);
 begin
   inherited Create(AOwner);

source/uCEFLinuxFunctions.pas

@@ -11,18 +11,20 @@ unit uCEFLinuxFunctions;
 
 interface
 
+{$IFDEF LINUX}
 uses
-  {$IFDEF LINUX}
-    {$IFDEF FPC}
-      ctypes, keysym, xf86keysym, x, xlib, LCLVersion,
-      {$IFDEF LCLGTK2}gtk2, glib2, gdk2, gtk2proc, gtk2int, Gtk2Def, gdk2x, Gtk2Extra,{$ENDIF}
-      {$IFDEF LCLGTK3}LazGdk3, LazGtk3, LazGObject2, LazGLib2, gtk3objects, gtk3procs,{$ENDIF}
-      {$IFDEF LCLQT}qt4,{$ENDIF}
-      {$IFDEF LCLQT5}qt5,{$ENDIF}
-      {$IFDEF LCLQT6}qt6,{$ENDIF}
-    {$ENDIF}
+  {$IFDEF FPC}
+    ctypes, keysym, xf86keysym, x, xlib, LCLVersion,
+    {$IFDEF LCLGTK2}gdk2, gtk2proc, gtk2int, Gtk2Def, gdk2x, Gtk2Extra,{$ENDIF}
+    {$IFDEF LCLGTK3}LazGdk3, LazGtk3, LazGLib2, gtk3procs,{$ENDIF}
+    {$IFDEF LCLQT}qt4,{$ENDIF}
+    {$IFDEF LCLQT5}qt5,{$ENDIF}
+    {$IFDEF LCLQT6}qt6,{$ENDIF}
+  {$ELSE}
+    uCEFLinuxTypes,
   {$ENDIF}
-  uCEFLinuxTypes, uCEFTypes;
+  uCEFTypes;
+{$ENDIF}
 
 {$IFNDEF FPC}
 const
@@ -84,14 +86,15 @@ procedure ShowX11Message(const aMessage : string);
 
 implementation
 
+{$IFDEF LINUX}
 uses
   {$IFDEF DELPHI16_UP}
   System.SysUtils,
   {$ELSE}
   SysUtils,
-  {$ENDIF}
-  {$IFDEF LCLGTK3}gtk3widgets,{$ENDIF}
+  {$ENDIF}                   
   uCEFLinuxConstants, uCEFConstants;
+{$ENDIF}
 
 {$IFDEF LINUX}
 function KeyboardCodeFromXKeysym(keysym : uint32) : integer;

source/uCEFLoadHandler.pas

@@ -68,7 +68,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame;
 
 procedure cef_load_handler_on_loading_state_change(self         : PCefLoadHandler;
                                                    browser      : PCefBrowser;

source/uCEFMediaAccessCallback.pas

@@ -26,9 +26,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefMediaAccessCallbackRef.cont(allowed_permissions: TCefMediaAccessPermissionTypes);
 begin
   PCefMediaAccessCallback(FData)^.cont(PCefMediaAccessCallback(FData), allowed_permissions);

source/uCEFMediaObserver.pas

@@ -48,8 +48,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFMediaSource, uCEFMediaSink,
-  uCEFMediaRoute;
+  uCEFMiscFunctions, uCEFMediaSink, uCEFMediaRoute;
 
 // **************************************************
 // ************** TCefMediaObserverOwn **************

source/uCEFMediaRoute.pas

@@ -29,7 +29,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFMediaSource, uCEFMediaSink;
+  uCEFMiscFunctions, uCEFMediaSource, uCEFMediaSink;
 
 function TCefMediaRouteRef.GetId: ustring;
 begin

source/uCEFMediaRouteCreateCallback.pas

@@ -50,7 +50,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFMediaRoute;
+  uCEFMiscFunctions, uCEFMediaRoute;
 
 procedure cef_media_route_create_callback_on_media_route_create_finished(      self   : PCefMediaRouteCreateCallback;
                                                                                result : TCefMediaRouterCreateResult;

source/uCEFMediaRouter.pas

@@ -30,8 +30,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFMediaSource, uCEFRegistration,
-  uCEFMediaRouteCreateCallback;
+  uCEFMiscFunctions, uCEFLibFunctions, uCEFMediaSource, uCEFRegistration;
 
 function TCefMediaRouterRef.AddObserver(const observer: ICefMediaObserver): ICefRegistration;
 begin

source/uCEFMediaSink.pas

@@ -31,7 +31,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function TCefMediaSinkRef.GetId: ustring;
 begin

source/uCEFMediaSinkDeviceInfoCallback.pas

@@ -50,7 +50,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFMediaSink;
+  uCEFMiscFunctions;
 
 procedure cef_media_sink_device_info_callback_on_media_sink_device_info(self        : PCefMediaSinkDeviceInfoCallback;
                                                                         device_info : PCefMediaSinkDeviceInfo); stdcall;

source/uCEFMediaSource.pas

@@ -27,7 +27,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function TCefMediaSourceRef.GetId: ustring;
 begin

source/uCEFMenuButtonComponent.pas

@@ -13,14 +13,14 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes,
+    System.Classes,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes,
+    Classes,
     {$IFDEF FPC}
     LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFConstants, uCEFViewsFrameworkEvents, uCEFLabelButtonComponent;
+  uCEFTypes, uCEFInterfaces, uCEFViewsFrameworkEvents, uCEFLabelButtonComponent, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows or pfidOSX or pfidLinux)]{$ENDIF}{$ENDIF}

source/uCEFMenuButtonDelegate.pas

@@ -94,7 +94,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFMenuButton, uCEFMenuButtonPressedLock;
+  uCEFMiscFunctions, uCEFMenuButton, uCEFMenuButtonPressedLock;
 
 
 // **************************************************************

source/uCEFMenuButtonPressedLock.pas

@@ -17,7 +17,7 @@ uses
   {$ELSE}
   Classes, SysUtils,
   {$ENDIF}
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
+  uCEFBaseRefCounted, uCEFInterfaces;
 
 type
   /// <summary>

source/uCEFMenuModelDelegate.pas

@@ -31,7 +31,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFMenuModel;
+  uCEFMiscFunctions, uCEFMenuModel;
 
 procedure cef_menu_model_delegate_execute_command(self        : PCefMenuModelDelegate;
                                                   menu_model  : PCefMenuModel;

source/uCEFMiscFunctions.pas

@@ -32,14 +32,12 @@ uses
     {$IFDEF MSWINDOWS}Windows, ActiveX, ShellApi, Registry,{$ENDIF}
     {$IFDEF DELPHI14_UP}Types, IOUtils,{$ENDIF} Classes, SysUtils, Math,
     {$IFDEF FPC}LCLType, LazFileUtils,{$IFNDEF MSWINDOWS}InterfaceBase, Forms,{$ENDIF}{$ENDIF}
-    {$IFDEF LINUX}{$IFDEF FPC}
-      ctypes, keysym, xf86keysym, x, xlib,
-      {$IFDEF LCLGTK2}gtk2, glib2, gdk2, gtk2proc, gtk2int, Gtk2Def, gdk2x, Gtk2Extra,{$ENDIF}
-      {$IFDEF LCLGTK3}LazGdk3, LazGtk3, LazGLib2, gtk3widgets,{$ENDIF}
-    {$ENDIF}{$ENDIF}
+    {$IFDEF LINUXFPC}
+      {$IFDEF LCLGTK2}gtk2proc, gtk2int, Gtk2Def, gdk2x, Gtk2Extra,{$ENDIF}
+      {$IFDEF LCLGTK3}LazGLib2,{$ENDIF}
+    {$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFResourceHandler,
-  {$IFDEF LINUX}{$IFDEF FPC}uCEFLinuxFunctions,{$ENDIF}{$ENDIF} uCEFConstants;
+  uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFResourceHandler, uCEFConstants;
 
 const
   Kernel32DLL = 'kernel32.dll';
@@ -851,8 +849,8 @@ implementation
 uses
   {$IFDEF LINUX}{$IFDEF FMX}uCEFLinuxFunctions, Posix.Unistd, Posix.Stdio,{$ENDIF}{$ENDIF}
   {$IFDEF MACOSX}{$IFDEF FPC}CocoaAll,{$ELSE}Posix.Unistd, Posix.Stdio,{$ENDIF}{$ENDIF}
-  uCEFApplicationCore, uCEFSchemeHandlerFactory, uCEFValue,
-  uCEFBinaryValue, uCEFStringList, uCEFWindowInfoWrapper;
+  uCEFApplicationCore, uCEFSchemeHandlerFactory, uCEFBinaryValue, uCEFStringList,
+  uCEFWindowInfoWrapper;
 
 function CefColorGetA(color: TCefColor): Byte;
 begin
@@ -1564,8 +1562,10 @@ begin
 end;
 
 procedure OutputDebugMessage(const aMessage : string);
+{$IFDEF DEBUG}
 const
   DEFAULT_LINE = 1;
+{$ENDIF}
 begin
   {$IFDEF DEBUG}
     {$IFDEF MSWINDOWS}
@@ -2146,6 +2146,9 @@ var
   TempMajor, TempMinor : cardinal;
   TempResultAPI, TempResultReg : boolean;
 begin
+  TempMajor := 0;
+  TempMinor := 0;
+
   TempResultAPI := GetRealWindowsVersion(TempMajor, TempMinor) and
                    ((TempMajor > aMajor) or
                     ((TempMajor = aMajor) and (TempMinor >= aMinor)));
@@ -2727,7 +2730,9 @@ begin
   // See GetUserAgentPlatform() and BuildOSCpuInfo() in
   // https://source.chromium.org/chromium/chromium/src/+/main:content/common/user_agent.cc
   {$IFDEF MSWINDOWS}
-  TempOS := 'Windows NT ';
+  TempOS       := 'Windows NT ';
+  TempMajorVer := 0;
+  TempMinorVer := 0;
 
   if GetWindowsMajorMinorVersion(TempMajorVer, TempMinorVer) then
     TempOS := TempOS + inttostr(TempMajorVer) + '.' + inttostr(TempMinorVer)
@@ -2876,12 +2881,8 @@ end;
 
 procedure CefCheckAltGrPressed(aWparam : WPARAM; var aEvent : TCefKeyEvent);
 const
-  EITHER_SHIFT_KEY_PRESSED     = $01;
   EITHER_CONTROL_KEY_PRESSED   = $02;
   EITHER_ALT_KEY_PRESSED       = $04;
-  EITHER_HANKAKU_KEY_PRESSED   = $08;
-  EITHER_RESERVED1_KEY_PRESSED = $10;
-  EITHER_RESERVED2_KEY_PRESSED = $20;
 var
   TempKBLayout       : HKL;
   TempTranslatedChar : SHORT;
@@ -2996,6 +2997,9 @@ var
   Temp64bit : BOOL;
   TempProcessMachine, TempNativeMachine : WORD;
 begin
+  TempNativeMachine  := 0;
+  TempProcessMachine := 0;
+
   if GetIsWow64Process2(TempProcessMachine, TempNativeMachine) then
     Result := (TempProcessMachine = IMAGE_FILE_MACHINE_I386) and
               (TempNativeMachine  = IMAGE_FILE_MACHINE_AMD64)
@@ -3042,7 +3046,10 @@ function RunningWindows10OrNewer : boolean;
 var
   TempMajorVer, TempMinorVer : DWORD;
 begin
-  Result := GetWindowsMajorMinorVersion(TempMajorVer, TempMinorVer) and (TempMajorVer >= 10);
+  TempMajorVer := 0;
+  TempMinorVer := 0;
+  Result       := GetWindowsMajorMinorVersion(TempMajorVer, TempMinorVer) and
+                  (TempMajorVer >= 10);
 end;
 
 {$IFDEF DELPHI14_UP}

source/uCEFOAuth2Helper.pas

@@ -6,9 +6,9 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF}System.Classes, System.UITypes, System.SysUtils,
+    System.Classes, System.UITypes, System.SysUtils,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, {$IFDEF FPC}dynlibs,{$ENDIF}SysUtils,
+    Classes, {$IFDEF FPC}dynlibs,{$ENDIF}SysUtils,
   {$ENDIF}
   uCEFInterfaces, uCEFTypes;
 

source/uCEFOSRIMEHandler.pas

@@ -10,9 +10,9 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes, System.Math, WinApi.imm,
+    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes, WinApi.imm,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows, imm, {$IFDEF FPC}imm_dyn,{$ENDIF}{$ENDIF} Classes, Math,
+    {$IFDEF MSWINDOWS}Windows, imm, {$IFDEF FPC}imm_dyn,{$ENDIF}{$ENDIF} Classes,
   {$ENDIF}
   uCEFTypes;
 
@@ -182,11 +182,11 @@ implementation
 
 uses
   {$IFDEF DELPHI16_UP}
-  System.SysUtils,
+    System.SysUtils
   {$ELSE}
-  SysUtils,
+    SysUtils
   {$ENDIF}
-  uCEFMiscFunctions;
+  {$IFDEF MSWINDOWS}, uCEFMiscFunctions{$ENDIF};
 
 constructor TCEFOSRIMEHandler.Create(aHWND : HWND);
 begin

source/uCEFOsrBrowserWindow.pas

@@ -15,10 +15,9 @@ uses
   {$IFDEF FPC}
   LResources, PropEdits,
   {$ENDIF}
-  uCEFApplication, uCEFChromiumWindow, uCEFTypes, uCEFInterfaces, uCEFChromium,
-  uCEFLinkedWinControlBase, uCEFBufferPanel,
-  uCEFBrowserWindow, uCEFBitmapBitBuffer, uCEFMiscFunctions,
-  uCEFConstants, uCEFChromiumEvents, Forms, ExtCtrls, LCLType, Graphics,
+  uCEFApplication, uCEFTypes, uCEFInterfaces, uCEFBufferPanel,
+  uCEFBrowserWindow, uCEFMiscFunctions, uCEFConstants, uCEFChromiumEvents,
+  Forms, ExtCtrls, LCLType, Graphics,
   Controls, syncobjs, Classes, sysutils, math;
 
 type

source/uCEFOverlayController.pas

@@ -157,7 +157,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFView, uCEFWindow;
+  uCEFMiscFunctions, uCEFView, uCEFWindow;
 
 function TCefOverlayControllerRef.IsValid: boolean;
 begin

source/uCEFPDFPrintCallback.pas

@@ -53,7 +53,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure cef_pdf_print_callback_on_pdf_print_finished(      self : PCefPdfPrintCallback;
                                                        const path : PCefString;

source/uCEFPanelComponent.pas

@@ -13,14 +13,14 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Classes,
+    System.Classes,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes,
+    Classes,
     {$IFDEF FPC}
     LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFConstants, uCEFViewsFrameworkEvents, uCEFViewComponent;
+  uCEFTypes, uCEFInterfaces, uCEFViewComponent, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows or pfidOSX or pfidLinux)]{$ENDIF}{$ENDIF}
@@ -133,7 +133,7 @@ procedure Register;
 implementation
 
 uses
-  uCEFPanelDelegate, uCEFPanel, uCEFMiscFunctions, uCEFTask;
+  uCEFPanelDelegate, uCEFPanel;
 
 procedure TCEFPanelComponent.CreatePanel;
 begin

source/uCEFPanelDelegate.pas

@@ -72,7 +72,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions;
+  uCEFMiscFunctions;
 
 // **************************************************************
 // ******************** TCefPanelDelegateRef ********************

source/uCEFPermissionHandler.pas

@@ -50,7 +50,8 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFPermissionPromptCallback, uCEFMediaAccessCallback;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFPermissionPromptCallback,
+  uCEFMediaAccessCallback;
 
 function cef_permission_handler_on_request_media_access_permission(      self                  : PCefPermissionHandler;
                                                                          browser               : PCefBrowser;

source/uCEFPermissionPromptCallback.pas

@@ -25,9 +25,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefPermissionPromptCallbackRef.cont(result: TCefPermissionRequestResult);
 begin
   PCefPermissionPromptCallback(FData)^.cont(PCefPermissionPromptCallback(FData), result);

source/uCEFPreferenceObserver.pas

@@ -78,7 +78,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser;
+  uCEFMiscFunctions;
 
 
 // TCefPreferenceObserverOwn

source/uCEFPrintDialogCallback.pas

@@ -27,7 +27,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure TCefPrintDialogCallbackRef.cancel;
 begin

source/uCEFPrintHandler.pas

@@ -12,7 +12,7 @@ unit uCEFPrintHandler;
 interface
 
 uses
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFApplicationCore;
+  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
 
 type
   TCefPrintHandlerOwn = class(TCefBaseRefCountedOwn, ICefPrintHandler)
@@ -56,7 +56,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFPrintSettings,
+  uCEFMiscFunctions, uCEFBrowser, uCEFPrintSettings,
   uCEFPrintDialogCallback, uCEFPrintJobCallback;
 
 

source/uCEFPrintJobCallback.pas

@@ -25,9 +25,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefPrintJobCallbackRef.cont;
 begin
   PCefPrintJobCallback(FData)^.cont(PCefPrintJobCallback(FData));

source/uCEFRegistration.pas

@@ -12,7 +12,7 @@ unit uCEFRegistration;
 interface
 
 uses
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
+  uCEFBaseRefCounted, uCEFInterfaces;
 
 type
   TCefRegistrationRef = class(TCefBaseRefCountedRef, ICefRegistration)

source/uCEFRenderHandler.pas

@@ -78,7 +78,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFDragData;
+  uCEFMiscFunctions, uCEFBrowser, uCEFDragData;
 
 
 function cef_render_handler_get_accessibility_handler(self: PCefRenderHandler): PCefAccessibilityHandler; stdcall;

source/uCEFRenderProcessHandler.pas

@@ -17,8 +17,9 @@ uses
   {$ELSE}
   Classes,
   {$ENDIF}
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFListValue, uCEFBrowser, uCEFFrame, uCEFRequest,
-  uCEFv8Context, uCEFv8Exception, uCEFv8StackTrace, uCEFDomNode, uCEFProcessMessage, uCEFApplicationCore;
+  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFBrowser, uCEFFrame,
+  uCEFv8Context, uCEFv8Exception, uCEFv8StackTrace, uCEFDomNode,
+  uCEFProcessMessage, uCEFApplicationCore;
 
 type
   TCefRenderProcessHandlerOwn = class(TCefBaseRefCountedOwn, ICefRenderProcessHandler)
@@ -69,7 +70,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFConstants, uCEFLoadHandler, uCEFDictionaryValue;
+  uCEFMiscFunctions, uCEFLoadHandler, uCEFDictionaryValue;
 
 procedure cef_render_process_handler_on_web_kit_initialized(self: PCefRenderProcessHandler); stdcall;
 var

source/uCEFRequestContext.pas

@@ -269,7 +269,7 @@ implementation
 
 uses
   uCEFMiscFunctions, uCEFLibFunctions, uCEFCookieManager, uCEFRequestContextHandler,
-  uCEFStringList, uCEFMediaRouter, uCEFValue, uCEFRegistration;
+  uCEFMediaRouter, uCEFValue, uCEFRegistration;
 
 function TCefRequestContextRef.ClearSchemeHandlerFactories: Boolean;
 begin

source/uCEFRequestContextHandler.pas

@@ -58,8 +58,8 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest,
-  uCEFRequestContext, uCEFResourceRequestHandler;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCEFRequestContext,
+  uCEFResourceRequestHandler;
 
 // TCefRequestContextHandlerOwn
 

source/uCEFRequestHandler.pas

@@ -65,9 +65,9 @@ uses
   {$ELSE}
     {$IFDEF MSWINDOWS}Windows,{$ENDIF} SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCEFCallback,
-  uCEFResponse, uCEFAuthCallback, uCEFSslInfo, uCEFSelectClientCertificateCallback, uCEFX509Certificate,
-  uCEFApplicationCore, uCEFUnresponsiveProcessCallback;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCEFCallback,
+  uCEFAuthCallback, uCEFSslInfo, uCEFSelectClientCertificateCallback,
+  uCEFX509Certificate, uCEFUnresponsiveProcessCallback;
 
 function cef_request_handler_on_before_browse(self         : PCefRequestHandler;
                                               browser      : PCefBrowser;

source/uCEFResolveCallback.pas

@@ -42,7 +42,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFStringList;
+  uCEFMiscFunctions, uCEFStringList;
 
 procedure cef_resolve_callback_on_resolve_completed(self         : PCefResolveCallback;
                                                     result       : TCefErrorCode;

source/uCEFResourceBundleHandler.pas

@@ -50,7 +50,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFConstants;
+  uCEFMiscFunctions;
 
 function cef_resource_bundle_handler_get_localized_string(self       : PCefResourceBundleHandler;
                                                           string_id  : Integer;
@@ -196,4 +196,4 @@ begin
   end;
 end;
 
-end.
+end.

source/uCEFResourceHandler.pas

@@ -48,7 +48,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFCallback, uCEFRequest, uCEFResponse,
+  uCEFMiscFunctions, uCEFCallback, uCEFRequest, uCEFResponse,
   uCEFResourceSkipCallback, uCEFResourceReadCallback;
 
 

source/uCEFResourceReadCallback.pas

@@ -25,9 +25,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefResourceReadCallbackRef.Cont(bytes_read: int64);
 begin
   PCefResourceReadCallback(FData)^.cont(PCefResourceReadCallback(FData), bytes_read);

source/uCEFResourceRequestHandler.pas

@@ -78,7 +78,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCEFCallback,
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCEFCallback,
   uCEFResponse, uCEFResponseFilter, uCEFCookieAccessFilter, uCEFResourceHandler;
 
 

source/uCEFResourceSkipCallback.pas

@@ -25,9 +25,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefResourceSkipCallbackRef.Cont(bytes_skipped: int64);
 begin
   PCefResourceSkipCallback(FData)^.cont(PCefResourceSkipCallback(FData), bytes_skipped);