diff --git a/source/uCEFAccessibilityHandler.pas b/source/uCEFAccessibilityHandler.pas
index 4ee213aa..b6e4b3ea 100644
--- a/source/uCEFAccessibilityHandler.pas
+++ b/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;
diff --git a/source/uCEFApp.pas b/source/uCEFApp.pas
index c66c188f..82e3900f 100644
--- a/source/uCEFApp.pas
+++ b/source/uCEFApp.pas
@@ -71,8 +71,8 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFCommandLine, uCEFConstants,
-  uCEFBrowserProcessHandler, uCEFResourceBundleHandler, uCEFRenderProcessHandler;
+  uCEFMiscFunctions, uCEFCommandLine, uCEFBrowserProcessHandler,
+  uCEFResourceBundleHandler, uCEFRenderProcessHandler;
 
 
 // TCefAppOwn
diff --git a/source/uCEFApplication.pas b/source/uCEFApplication.pas
index 6ee62fe9..c60704ce 100644
--- a/source/uCEFApplication.pas
+++ b/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
diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas
index 55dadad0..9c73f692 100644
--- a/source/uCEFApplicationCore.pas
+++ b/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
diff --git a/source/uCEFAudioHandler.pas b/source/uCEFAudioHandler.pas
index e15f4a93..8f4f798b 100644
--- a/source/uCEFAudioHandler.pas
+++ b/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;
diff --git a/source/uCEFAuthCallback.pas b/source/uCEFAuthCallback.pas
index 2e9f2428..34b33ae5 100644
--- a/source/uCEFAuthCallback.pas
+++ b/source/uCEFAuthCallback.pas
@@ -27,7 +27,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure TCefAuthCallbackRef.Cancel;
 begin
diff --git a/source/uCEFBeforeDownloadCallback.pas b/source/uCEFBeforeDownloadCallback.pas
index 9519c89a..48f08f46 100644
--- a/source/uCEFBeforeDownloadCallback.pas
+++ b/source/uCEFBeforeDownloadCallback.pas
@@ -26,7 +26,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure TCefBeforeDownloadCallbackRef.Cont(const downloadPath: ustring; showDialog: Boolean);
 var
diff --git a/source/uCEFBrowserBitmap.pas b/source/uCEFBrowserBitmap.pas
index 117f6ef3..c43e31bf 100644
--- a/source/uCEFBrowserBitmap.pas
+++ b/source/uCEFBrowserBitmap.pas
@@ -48,9 +48,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions;
-
 constructor TCEFBrowserBitmap.Create;
 begin
   inherited Create;
diff --git a/source/uCEFBrowserProcessHandler.pas b/source/uCEFBrowserProcessHandler.pas
index 9df38817..4379a1f3 100644
--- a/source/uCEFBrowserProcessHandler.pas
+++ b/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
diff --git a/source/uCEFBrowserViewComponent.pas b/source/uCEFBrowserViewComponent.pas
index 51424daf..170ff210 100644
--- a/source/uCEFBrowserViewComponent.pas
+++ b/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}
diff --git a/source/uCEFBrowserViewDelegate.pas b/source/uCEFBrowserViewDelegate.pas
index c4a15fad..4f4466fd 100644
--- a/source/uCEFBrowserViewDelegate.pas
+++ b/source/uCEFBrowserViewDelegate.pas
@@ -159,7 +159,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFBrowserView, uCEFBrowser, uCEFClient, uCEFConstants;
+  uCEFMiscFunctions, uCEFBrowserView, uCEFBrowser, uCEFClient, uCEFConstants;
 
 
 // **************************************************************
diff --git a/source/uCEFBrowserWindow.pas b/source/uCEFBrowserWindow.pas
index 0fb91849..4f4c10bf 100644
--- a/source/uCEFBrowserWindow.pas
+++ b/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;
 
diff --git a/source/uCEFBufferPanel.pas b/source/uCEFBufferPanel.pas
index 1d1ab05b..4489fc83 100644
--- a/source/uCEFBufferPanel.pas
+++ b/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}
diff --git a/source/uCEFButton.pas b/source/uCEFButton.pas
index f5ff5a94..47a6e9c0 100644
--- a/source/uCEFButton.pas
+++ b/source/uCEFButton.pas
@@ -67,7 +67,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFLabelButton;
+  uCEFMiscFunctions, uCEFLabelButton;
 
 function TCefButtonRef.AsLabelButton : ICefLabelButton;
 begin
diff --git a/source/uCEFButtonComponent.pas b/source/uCEFButtonComponent.pas
index e6ccf27f..035ec9c3 100644
--- a/source/uCEFButtonComponent.pas
+++ b/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;
diff --git a/source/uCEFButtonDelegate.pas b/source/uCEFButtonDelegate.pas
index 92caddcf..69e9053f 100644
--- a/source/uCEFButtonDelegate.pas
+++ b/source/uCEFButtonDelegate.pas
@@ -93,7 +93,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFButton;
+  uCEFMiscFunctions, uCEFButton;
 
 
 // **************************************************************
diff --git a/source/uCEFCallback.pas b/source/uCEFCallback.pas
index 0f1e2db8..846ca2da 100644
--- a/source/uCEFCallback.pas
+++ b/source/uCEFCallback.pas
@@ -26,9 +26,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefCallbackRef.Cancel;
 begin
   PCefCallback(FData)^.cancel(PCefCallback(FData));
diff --git a/source/uCEFChromium.pas b/source/uCEFChromium.pas
index 21d3cd4b..79e6ca2d 100644
--- a/source/uCEFChromium.pas
+++ b/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}
diff --git a/source/uCEFChromiumCore.pas b/source/uCEFChromiumCore.pas
index aeca7521..70b542e8 100644
--- a/source/uCEFChromiumCore.pas
+++ b/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,
diff --git a/source/uCEFChromiumWindow.pas b/source/uCEFChromiumWindow.pas
index 6949a2d0..52448ec2 100644
--- a/source/uCEFChromiumWindow.pas
+++ b/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}
diff --git a/source/uCEFClient.pas b/source/uCEFClient.pas
index d91a2e14..dc7dfd56 100644
--- a/source/uCEFClient.pas
+++ b/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;
 
 
 // ******************************************************
diff --git a/source/uCEFCommandHandler.pas b/source/uCEFCommandHandler.pas
index fd2cd05f..eecadffc 100644
--- a/source/uCEFCommandHandler.pas
+++ b/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;
diff --git a/source/uCEFCompletionCallback.pas b/source/uCEFCompletionCallback.pas
index 220ba7a4..6c3cb9fa 100644
--- a/source/uCEFCompletionCallback.pas
+++ b/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
diff --git a/source/uCEFComponentIdList.pas b/source/uCEFComponentIdList.pas
index 67cb1d34..93b2d06b 100644
--- a/source/uCEFComponentIdList.pas
+++ b/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;
diff --git a/source/uCEFContextMenuHandler.pas b/source/uCEFContextMenuHandler.pas
index 51242147..7c5c39ac 100644
--- a/source/uCEFContextMenuHandler.pas
+++ b/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;
diff --git a/source/uCEFContextMenuParams.pas b/source/uCEFContextMenuParams.pas
index c865f556..82d1721e 100644
--- a/source/uCEFContextMenuParams.pas
+++ b/source/uCEFContextMenuParams.pas
@@ -49,8 +49,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFStringList;
-
+  uCEFMiscFunctions, uCEFStringList;
 
 function TCefContextMenuParamsRef.GetDictionarySuggestions(const suggestions : TStringList): Boolean;
 var
diff --git a/source/uCEFCookieAccessFilter.pas b/source/uCEFCookieAccessFilter.pas
index d6144e84..5db4c03c 100644
--- a/source/uCEFCookieAccessFilter.pas
+++ b/source/uCEFCookieAccessFilter.pas
@@ -58,7 +58,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCefResponse;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCefResponse;
 
 // TCefCookieAccessFilterOwn
 
diff --git a/source/uCEFCookieManager.pas b/source/uCEFCookieManager.pas
index 61e375d4..2a911858 100644
--- a/source/uCEFCookieManager.pas
+++ b/source/uCEFCookieManager.pas
@@ -48,7 +48,7 @@ implementation
 
 uses
   uCEFMiscFunctions, uCEFLibFunctions, uCEFDeleteCookiesCallback,
-  uCEFSetCookieCallback, uCEFCookieVisitor, uCEFStringList;
+  uCEFSetCookieCallback, uCEFCookieVisitor;
 
 
 function TCefCookieManagerRef.DeleteCookies(const url        : ustring;
diff --git a/source/uCEFCookieVisitor.pas b/source/uCEFCookieVisitor.pas
index b658514c..ead404c3 100644
--- a/source/uCEFCookieVisitor.pas
+++ b/source/uCEFCookieVisitor.pas
@@ -53,7 +53,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function cef_cookie_visitor_visit(      self         : PCefCookieVisitor;
                                   const cookie       : PCefCookie;
diff --git a/source/uCEFCustomStreamReader.pas b/source/uCEFCustomStreamReader.pas
index 7c0b2d37..1e4056ca 100644
--- a/source/uCEFCustomStreamReader.pas
+++ b/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
diff --git a/source/uCEFDeleteCookiesCallback.pas b/source/uCEFDeleteCookiesCallback.pas
index 8e86600a..6f3b9114 100644
--- a/source/uCEFDeleteCookiesCallback.pas
+++ b/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
diff --git a/source/uCEFDevToolsMessageObserver.pas b/source/uCEFDevToolsMessageObserver.pas
index 8f14d53b..a00a1203 100644
--- a/source/uCEFDevToolsMessageObserver.pas
+++ b/source/uCEFDevToolsMessageObserver.pas
@@ -50,7 +50,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFJson;
+  uCEFMiscFunctions, uCEFBrowser;
 
 
 // ************************************************************
diff --git a/source/uCEFDialogHandler.pas b/source/uCEFDialogHandler.pas
index bd589929..9362b423 100644
--- a/source/uCEFDialogHandler.pas
+++ b/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;
diff --git a/source/uCEFDisplayHandler.pas b/source/uCEFDisplayHandler.pas
index d3a6aa77..b156ea28 100644
--- a/source/uCEFDisplayHandler.pas
+++ b/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;
diff --git a/source/uCEFDomNode.pas b/source/uCEFDomNode.pas
index bcba5b5d..5eee8e3c 100644
--- a/source/uCEFDomNode.pas
+++ b/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;
 
diff --git a/source/uCEFDomVisitor.pas b/source/uCEFDomVisitor.pas
index fd9f4ac4..9123ed92 100644
--- a/source/uCEFDomVisitor.pas
+++ b/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
diff --git a/source/uCEFDownloadHandler.pas b/source/uCEFDownloadHandler.pas
index 066105d1..3144c30d 100644
--- a/source/uCEFDownloadHandler.pas
+++ b/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.
\ No newline at end of file
+end.
diff --git a/source/uCEFDownloadImageCallBack.pas b/source/uCEFDownloadImageCallBack.pas
index 02af502b..1548378a 100644
--- a/source/uCEFDownloadImageCallBack.pas
+++ b/source/uCEFDownloadImageCallBack.pas
@@ -53,7 +53,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFImage;
+  uCEFMiscFunctions, uCEFImage;
 
 
 // TCefDownloadImageCallbackOwn
diff --git a/source/uCEFDownloadItem.pas b/source/uCEFDownloadItem.pas
index a8691a34..ea23acb0 100644
--- a/source/uCEFDownloadItem.pas
+++ b/source/uCEFDownloadItem.pas
@@ -43,7 +43,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function TCefDownloadItemRef.GetContentDisposition: ustring;
 begin
diff --git a/source/uCEFDownloadItemCallback.pas b/source/uCEFDownloadItemCallback.pas
index 476c8cbb..02c450d2 100644
--- a/source/uCEFDownloadItemCallback.pas
+++ b/source/uCEFDownloadItemCallback.pas
@@ -26,9 +26,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefDownloadItemCallbackRef.cancel;
 begin
   PCefDownloadItemCallback(FData)^.cancel(PCefDownloadItemCallback(FData));
diff --git a/source/uCEFDragAndDropMgr.pas b/source/uCEFDragAndDropMgr.pas
index 36074127..2b4ac5e7 100644
--- a/source/uCEFDragAndDropMgr.pas
+++ b/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';
diff --git a/source/uCEFDragHandler.pas b/source/uCEFDragHandler.pas
index 6490708d..94c5721a 100644
--- a/source/uCEFDragHandler.pas
+++ b/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;
diff --git a/source/uCEFEndTracingCallback.pas b/source/uCEFEndTracingCallback.pas
index 198d77d0..8cce595e 100644
--- a/source/uCEFEndTracingCallback.pas
+++ b/source/uCEFEndTracingCallback.pas
@@ -33,7 +33,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 // TCefEndTracingCallbackOwn
 
diff --git a/source/uCEFFileDialogCallback.pas b/source/uCEFFileDialogCallback.pas
index 95fd1d87..4b3efd57 100644
--- a/source/uCEFFileDialogCallback.pas
+++ b/source/uCEFFileDialogCallback.pas
@@ -31,7 +31,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFStringList;
+  uCEFStringList;
 
 procedure TCefFileDialogCallbackRef.Cancel;
 begin
diff --git a/source/uCEFFillLayout.pas b/source/uCEFFillLayout.pas
index e0b65677..85ff2b72 100644
--- a/source/uCEFFillLayout.pas
+++ b/source/uCEFFillLayout.pas
@@ -17,7 +17,7 @@ uses
   {$ELSE}
   Classes, SysUtils,
   {$ENDIF}
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes, uCEFLayout;
+  uCEFBaseRefCounted, uCEFInterfaces, uCEFLayout;
 
 type
   /// <summary>
diff --git a/source/uCEFFindHandler.pas b/source/uCEFFindHandler.pas
index f11c13ec..278f315a 100644
--- a/source/uCEFFindHandler.pas
+++ b/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;
diff --git a/source/uCEFFocusHandler.pas b/source/uCEFFocusHandler.pas
index 03c43145..af5b583d 100644
--- a/source/uCEFFocusHandler.pas
+++ b/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;
diff --git a/source/uCEFFrame.pas b/source/uCEFFrame.pas
index b6f910c7..407d934d 100644
--- a/source/uCEFFrame.pas
+++ b/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
diff --git a/source/uCEFFrameHandler.pas b/source/uCEFFrameHandler.pas
index f5deacc4..d20534ad 100644
--- a/source/uCEFFrameHandler.pas
+++ b/source/uCEFFrameHandler.pas
@@ -54,7 +54,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFClient, uCEFBrowser, uCEFFrame;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame;
 
 
 // TCefFrameHandlerOwn
diff --git a/source/uCEFImage.pas b/source/uCEFImage.pas
index 12551c49..ee7988a9 100644
--- a/source/uCEFImage.pas
+++ b/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
diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas
index ff931971..86699815 100644
--- a/source/uCEFInterfaces.pas
+++ b/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;
 
diff --git a/source/uCEFJsDialogCallback.pas b/source/uCEFJsDialogCallback.pas
index 1e3e79c3..63763cfe 100644
--- a/source/uCEFJsDialogCallback.pas
+++ b/source/uCEFJsDialogCallback.pas
@@ -26,7 +26,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure TCefJsDialogCallbackRef.Cont(success: Boolean; const userInput: ustring);
 var
diff --git a/source/uCEFJsDialogHandler.pas b/source/uCEFJsDialogHandler.pas
index 5d5af39e..92b715d3 100644
--- a/source/uCEFJsDialogHandler.pas
+++ b/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;
diff --git a/source/uCEFKeyboardHandler.pas b/source/uCEFKeyboardHandler.pas
index b4b4a1e4..2d591a1c 100644
--- a/source/uCEFKeyboardHandler.pas
+++ b/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;
diff --git a/source/uCEFLabelButtonComponent.pas b/source/uCEFLabelButtonComponent.pas
index 7ee638d3..916adfed 100644
--- a/source/uCEFLabelButtonComponent.pas
+++ b/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
diff --git a/source/uCEFLayout.pas b/source/uCEFLayout.pas
index cc0f9e8f..28c5172f 100644
--- a/source/uCEFLayout.pas
+++ b/source/uCEFLayout.pas
@@ -53,7 +53,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFBoxLayout, uCEFFillLayout;
+  uCEFBoxLayout, uCEFFillLayout;
 
 function TCefLayoutRef.AsBoxLayout : ICefBoxLayout;
 begin
diff --git a/source/uCEFLibFunctions.pas b/source/uCEFLibFunctions.pas
index 1b35bf20..00982932 100644
--- a/source/uCEFLibFunctions.pas
+++ b/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}
diff --git a/source/uCEFLifeSpanHandler.pas b/source/uCEFLifeSpanHandler.pas
index ac0f71a5..a9afe2a2 100644
--- a/source/uCEFLifeSpanHandler.pas
+++ b/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;
diff --git a/source/uCEFLinkedWinControlBase.pas b/source/uCEFLinkedWinControlBase.pas
index dcab7acd..fb921477 100644
--- a/source/uCEFLinkedWinControlBase.pas
+++ b/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;
diff --git a/source/uCEFLinkedWindowParent.pas b/source/uCEFLinkedWindowParent.pas
index f8074b3e..0651aa6e 100644
--- a/source/uCEFLinkedWindowParent.pas
+++ b/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);
diff --git a/source/uCEFLinuxFunctions.pas b/source/uCEFLinuxFunctions.pas
index 5755141b..cdca4f93 100644
--- a/source/uCEFLinuxFunctions.pas
+++ b/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;
diff --git a/source/uCEFLoadHandler.pas b/source/uCEFLoadHandler.pas
index 2c57d761..6d31c051 100644
--- a/source/uCEFLoadHandler.pas
+++ b/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;
diff --git a/source/uCEFMediaAccessCallback.pas b/source/uCEFMediaAccessCallback.pas
index dcccf434..7360b023 100644
--- a/source/uCEFMediaAccessCallback.pas
+++ b/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);
diff --git a/source/uCEFMediaObserver.pas b/source/uCEFMediaObserver.pas
index fb6f326d..96994fa7 100644
--- a/source/uCEFMediaObserver.pas
+++ b/source/uCEFMediaObserver.pas
@@ -48,8 +48,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFMediaSource, uCEFMediaSink,
-  uCEFMediaRoute;
+  uCEFMiscFunctions, uCEFMediaSink, uCEFMediaRoute;
 
 // **************************************************
 // ************** TCefMediaObserverOwn **************
diff --git a/source/uCEFMediaRoute.pas b/source/uCEFMediaRoute.pas
index 94e44577..c6564520 100644
--- a/source/uCEFMediaRoute.pas
+++ b/source/uCEFMediaRoute.pas
@@ -29,7 +29,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFMediaSource, uCEFMediaSink;
+  uCEFMiscFunctions, uCEFMediaSource, uCEFMediaSink;
 
 function TCefMediaRouteRef.GetId: ustring;
 begin
diff --git a/source/uCEFMediaRouteCreateCallback.pas b/source/uCEFMediaRouteCreateCallback.pas
index 5b9163df..5c80186b 100644
--- a/source/uCEFMediaRouteCreateCallback.pas
+++ b/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;
diff --git a/source/uCEFMediaRouter.pas b/source/uCEFMediaRouter.pas
index b9013312..42a75ff2 100644
--- a/source/uCEFMediaRouter.pas
+++ b/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
diff --git a/source/uCEFMediaSink.pas b/source/uCEFMediaSink.pas
index e2e496b5..592c9640 100644
--- a/source/uCEFMediaSink.pas
+++ b/source/uCEFMediaSink.pas
@@ -31,7 +31,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function TCefMediaSinkRef.GetId: ustring;
 begin
diff --git a/source/uCEFMediaSinkDeviceInfoCallback.pas b/source/uCEFMediaSinkDeviceInfoCallback.pas
index f91e5cfb..90293a07 100644
--- a/source/uCEFMediaSinkDeviceInfoCallback.pas
+++ b/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;
diff --git a/source/uCEFMediaSource.pas b/source/uCEFMediaSource.pas
index dd5c5ffb..862f44a8 100644
--- a/source/uCEFMediaSource.pas
+++ b/source/uCEFMediaSource.pas
@@ -27,7 +27,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function TCefMediaSourceRef.GetId: ustring;
 begin
diff --git a/source/uCEFMenuButtonComponent.pas b/source/uCEFMenuButtonComponent.pas
index 5582267e..e8ee58d6 100644
--- a/source/uCEFMenuButtonComponent.pas
+++ b/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}
diff --git a/source/uCEFMenuButtonDelegate.pas b/source/uCEFMenuButtonDelegate.pas
index 13614e42..59c24d26 100644
--- a/source/uCEFMenuButtonDelegate.pas
+++ b/source/uCEFMenuButtonDelegate.pas
@@ -94,7 +94,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFMenuButton, uCEFMenuButtonPressedLock;
+  uCEFMiscFunctions, uCEFMenuButton, uCEFMenuButtonPressedLock;
 
 
 // **************************************************************
diff --git a/source/uCEFMenuButtonPressedLock.pas b/source/uCEFMenuButtonPressedLock.pas
index 66b3c672..09b830d6 100644
--- a/source/uCEFMenuButtonPressedLock.pas
+++ b/source/uCEFMenuButtonPressedLock.pas
@@ -17,7 +17,7 @@ uses
   {$ELSE}
   Classes, SysUtils,
   {$ENDIF}
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
+  uCEFBaseRefCounted, uCEFInterfaces;
 
 type
   /// <summary>
diff --git a/source/uCEFMenuModelDelegate.pas b/source/uCEFMenuModelDelegate.pas
index f1e27c87..7d547fed 100644
--- a/source/uCEFMenuModelDelegate.pas
+++ b/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;
diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas
index 6b70e44b..32565012 100644
--- a/source/uCEFMiscFunctions.pas
+++ b/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}
diff --git a/source/uCEFOAuth2Helper.pas b/source/uCEFOAuth2Helper.pas
index 476d0d22..7f4139ed 100644
--- a/source/uCEFOAuth2Helper.pas
+++ b/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;
 
diff --git a/source/uCEFOSRIMEHandler.pas b/source/uCEFOSRIMEHandler.pas
index f0165b19..9578ab77 100644
--- a/source/uCEFOSRIMEHandler.pas
+++ b/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
diff --git a/source/uCEFOsrBrowserWindow.pas b/source/uCEFOsrBrowserWindow.pas
index 0e4fe863..7b45e736 100644
--- a/source/uCEFOsrBrowserWindow.pas
+++ b/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
diff --git a/source/uCEFOverlayController.pas b/source/uCEFOverlayController.pas
index b3968954..717fd9e2 100644
--- a/source/uCEFOverlayController.pas
+++ b/source/uCEFOverlayController.pas
@@ -157,7 +157,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFView, uCEFWindow;
+  uCEFMiscFunctions, uCEFView, uCEFWindow;
 
 function TCefOverlayControllerRef.IsValid: boolean;
 begin
diff --git a/source/uCEFPDFPrintCallback.pas b/source/uCEFPDFPrintCallback.pas
index 10b4b90a..d33968c7 100644
--- a/source/uCEFPDFPrintCallback.pas
+++ b/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;
diff --git a/source/uCEFPanelComponent.pas b/source/uCEFPanelComponent.pas
index 6b259e16..116a153e 100644
--- a/source/uCEFPanelComponent.pas
+++ b/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
diff --git a/source/uCEFPanelDelegate.pas b/source/uCEFPanelDelegate.pas
index 966a508e..c1737896 100644
--- a/source/uCEFPanelDelegate.pas
+++ b/source/uCEFPanelDelegate.pas
@@ -72,7 +72,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions;
+  uCEFMiscFunctions;
 
 // **************************************************************
 // ******************** TCefPanelDelegateRef ********************
diff --git a/source/uCEFPermissionHandler.pas b/source/uCEFPermissionHandler.pas
index faf79cff..9f4d78ab 100644
--- a/source/uCEFPermissionHandler.pas
+++ b/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;
diff --git a/source/uCEFPermissionPromptCallback.pas b/source/uCEFPermissionPromptCallback.pas
index 9e357cb5..edde33fe 100644
--- a/source/uCEFPermissionPromptCallback.pas
+++ b/source/uCEFPermissionPromptCallback.pas
@@ -25,9 +25,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefPermissionPromptCallbackRef.cont(result: TCefPermissionRequestResult);
 begin
   PCefPermissionPromptCallback(FData)^.cont(PCefPermissionPromptCallback(FData), result);
diff --git a/source/uCEFPreferenceObserver.pas b/source/uCEFPreferenceObserver.pas
index b0b32f5e..92339cb4 100644
--- a/source/uCEFPreferenceObserver.pas
+++ b/source/uCEFPreferenceObserver.pas
@@ -78,7 +78,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser;
+  uCEFMiscFunctions;
 
 
 // TCefPreferenceObserverOwn
diff --git a/source/uCEFPrintDialogCallback.pas b/source/uCEFPrintDialogCallback.pas
index faf05691..2a27b9ef 100644
--- a/source/uCEFPrintDialogCallback.pas
+++ b/source/uCEFPrintDialogCallback.pas
@@ -27,7 +27,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure TCefPrintDialogCallbackRef.cancel;
 begin
diff --git a/source/uCEFPrintHandler.pas b/source/uCEFPrintHandler.pas
index babb3f9d..3932789d 100644
--- a/source/uCEFPrintHandler.pas
+++ b/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;
 
 
diff --git a/source/uCEFPrintJobCallback.pas b/source/uCEFPrintJobCallback.pas
index 405b9c9b..8e349a94 100644
--- a/source/uCEFPrintJobCallback.pas
+++ b/source/uCEFPrintJobCallback.pas
@@ -25,9 +25,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefPrintJobCallbackRef.cont;
 begin
   PCefPrintJobCallback(FData)^.cont(PCefPrintJobCallback(FData));
diff --git a/source/uCEFRegistration.pas b/source/uCEFRegistration.pas
index 7636a5f4..6c725755 100644
--- a/source/uCEFRegistration.pas
+++ b/source/uCEFRegistration.pas
@@ -12,7 +12,7 @@ unit uCEFRegistration;
 interface
 
 uses
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
+  uCEFBaseRefCounted, uCEFInterfaces;
 
 type
   TCefRegistrationRef = class(TCefBaseRefCountedRef, ICefRegistration)
diff --git a/source/uCEFRenderHandler.pas b/source/uCEFRenderHandler.pas
index 6f2e0077..c621980f 100644
--- a/source/uCEFRenderHandler.pas
+++ b/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;
diff --git a/source/uCEFRenderProcessHandler.pas b/source/uCEFRenderProcessHandler.pas
index 9bb85b30..e3c5641d 100644
--- a/source/uCEFRenderProcessHandler.pas
+++ b/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
diff --git a/source/uCEFRequestContext.pas b/source/uCEFRequestContext.pas
index cd969e72..64aa04a4 100644
--- a/source/uCEFRequestContext.pas
+++ b/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
diff --git a/source/uCEFRequestContextHandler.pas b/source/uCEFRequestContextHandler.pas
index e9a99ab2..69cf84ec 100644
--- a/source/uCEFRequestContextHandler.pas
+++ b/source/uCEFRequestContextHandler.pas
@@ -58,8 +58,8 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest,
-  uCEFRequestContext, uCEFResourceRequestHandler;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFRequest, uCEFRequestContext,
+  uCEFResourceRequestHandler;
 
 // TCefRequestContextHandlerOwn
 
diff --git a/source/uCEFRequestHandler.pas b/source/uCEFRequestHandler.pas
index 166f6ef4..7d57721c 100644
--- a/source/uCEFRequestHandler.pas
+++ b/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;
diff --git a/source/uCEFResolveCallback.pas b/source/uCEFResolveCallback.pas
index cdebe5f5..ba4f1de5 100644
--- a/source/uCEFResolveCallback.pas
+++ b/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;
diff --git a/source/uCEFResourceBundleHandler.pas b/source/uCEFResourceBundleHandler.pas
index 50c9be6c..41ca09b6 100644
--- a/source/uCEFResourceBundleHandler.pas
+++ b/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.
\ No newline at end of file
+end.
diff --git a/source/uCEFResourceHandler.pas b/source/uCEFResourceHandler.pas
index ea2d18e3..e781c099 100644
--- a/source/uCEFResourceHandler.pas
+++ b/source/uCEFResourceHandler.pas
@@ -48,7 +48,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFCallback, uCEFRequest, uCEFResponse,
+  uCEFMiscFunctions, uCEFCallback, uCEFRequest, uCEFResponse,
   uCEFResourceSkipCallback, uCEFResourceReadCallback;
 
 
diff --git a/source/uCEFResourceReadCallback.pas b/source/uCEFResourceReadCallback.pas
index ab22fd07..67383ce4 100644
--- a/source/uCEFResourceReadCallback.pas
+++ b/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);
diff --git a/source/uCEFResourceRequestHandler.pas b/source/uCEFResourceRequestHandler.pas
index e601ddcb..a7a2abbd 100644
--- a/source/uCEFResourceRequestHandler.pas
+++ b/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;
 
 
diff --git a/source/uCEFResourceSkipCallback.pas b/source/uCEFResourceSkipCallback.pas
index 760fa46e..2a7e2f5f 100644
--- a/source/uCEFResourceSkipCallback.pas
+++ b/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);
diff --git a/source/uCEFResponseFilter.pas b/source/uCEFResponseFilter.pas
index ca65305d..c5b7dc93 100644
--- a/source/uCEFResponseFilter.pas
+++ b/source/uCEFResponseFilter.pas
@@ -178,7 +178,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 // TCefResponseFilterOwn
 
diff --git a/source/uCEFRunContextMenuCallback.pas b/source/uCEFRunContextMenuCallback.pas
index cf19c25f..96049c80 100644
--- a/source/uCEFRunContextMenuCallback.pas
+++ b/source/uCEFRunContextMenuCallback.pas
@@ -25,9 +25,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefRunContextMenuCallbackRef.Cancel;
 begin
   PCefRunContextMenuCallback(FData)^.cancel(PCefRunContextMenuCallback(FData));
diff --git a/source/uCEFRunFileDialogCallback.pas b/source/uCEFRunFileDialogCallback.pas
index 08bdbde0..2cd5d75c 100644
--- a/source/uCEFRunFileDialogCallback.pas
+++ b/source/uCEFRunFileDialogCallback.pas
@@ -41,7 +41,7 @@ type
 implementation
 
 uses
-  uCEFTypes, uCEFMiscFunctions, uCEFLibFunctions, uCEFStringList;
+  uCEFTypes, uCEFMiscFunctions, uCEFStringList;
 
 procedure cef_run_file_dialog_callback_on_file_dialog_dismissed(self       : PCefRunFileDialogCallback;
                                                                 file_paths : TCefStringList); stdcall;
diff --git a/source/uCEFRunQuickMenuCallback.pas b/source/uCEFRunQuickMenuCallback.pas
index f552c660..1c9d121c 100644
--- a/source/uCEFRunQuickMenuCallback.pas
+++ b/source/uCEFRunQuickMenuCallback.pas
@@ -25,9 +25,6 @@ type
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFLibFunctions;
-
 procedure TCefRunQuickMenuCallbackRef.Cont(command_id: Integer; event_flags: TCefEventFlags);
 begin
   PCefRunQuickMenuCallback(FData)^.cont(PCefRunQuickMenuCallback(FData), command_id, event_flags);
diff --git a/source/uCEFSSLStatus.pas b/source/uCEFSSLStatus.pas
index 45d57b7f..b73af484 100644
--- a/source/uCEFSSLStatus.pas
+++ b/source/uCEFSSLStatus.pas
@@ -35,7 +35,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBinaryValue, uCEFX509Certificate;
+  uCEFX509Certificate;
 
 function TCefSSLStatusRef.IsSecureConnection: boolean;
 begin
diff --git a/source/uCEFSchemeHandlerFactory.pas b/source/uCEFSchemeHandlerFactory.pas
index dffabbf3..efdb46e4 100644
--- a/source/uCEFSchemeHandlerFactory.pas
+++ b/source/uCEFSchemeHandlerFactory.pas
@@ -47,7 +47,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser, uCEFFrame, uCEFRequest;
+  uCEFMiscFunctions, uCEFBrowser, uCEFFrame, uCEFRequest;
 
 function cef_scheme_handler_factory_create(      self        : PCefSchemeHandlerFactory;
                                                  browser     : PCefBrowser;
diff --git a/source/uCEFScrollViewComponent.pas b/source/uCEFScrollViewComponent.pas
index bb502049..90ee378d 100644
--- a/source/uCEFScrollViewComponent.pas
+++ b/source/uCEFScrollViewComponent.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}
@@ -112,7 +112,7 @@ procedure Register;
 implementation
 
 uses
-  uCEFScrollView, uCEFMiscFunctions, uCEFViewDelegate;
+  uCEFScrollView, uCEFViewDelegate;
 
 procedure TCEFScrollViewComponent.CreateScrollView;
 begin
diff --git a/source/uCEFSelectClientCertificateCallback.pas b/source/uCEFSelectClientCertificateCallback.pas
index efb8b1de..afb8dc72 100644
--- a/source/uCEFSelectClientCertificateCallback.pas
+++ b/source/uCEFSelectClientCertificateCallback.pas
@@ -26,7 +26,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFX509Certificate;
+  uCEFMiscFunctions;
 
 // TCefSelectClientCertificateCallbackRef
 
diff --git a/source/uCEFSentinel.pas b/source/uCEFSentinel.pas
index b5afb0f5..deda9771 100644
--- a/source/uCEFSentinel.pas
+++ b/source/uCEFSentinel.pas
@@ -23,7 +23,7 @@ uses
     Messages,
     {$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFConstants;
+  uCEFConstants;
 
 const
   CEFSENTINEL_DEFAULT_DELAYPERPROCMS = 200;
@@ -123,7 +123,7 @@ procedure Register;
 implementation
 
 uses
-  uCEFLibFunctions, uCEFApplicationCore, uCEFMiscFunctions;
+  uCEFApplicationCore;
 
  // Attribution :
  // TCEFSentinel icon made by Everaldo Coelho
diff --git a/source/uCEFServerComponent.pas b/source/uCEFServerComponent.pas
index c35080a5..b1c0869d 100644
--- a/source/uCEFServerComponent.pas
+++ b/source/uCEFServerComponent.pas
@@ -13,17 +13,16 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows, WinApi.Messages, WinApi.ActiveX,{$ENDIF}
     System.Classes, System.Math,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows, ActiveX,{$ENDIF} Classes, Math,
+    Classes, Math,
     {$IFDEF FPC}
-    LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
+    LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ELSE}
     Messages,
     {$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFConstants, uCEFServer, uCEFServerEvents, uCEFServerHandler;
+  uCEFTypes, uCEFInterfaces, uCEFServerEvents, uCEFServerHandler, uCEFConstants;
 
 const
   DEFAULT_CEFSERVER_ADDRESS  = '127.0.0.1';
diff --git a/source/uCEFServerHandler.pas b/source/uCEFServerHandler.pas
index 5f83e74d..117725bc 100644
--- a/source/uCEFServerHandler.pas
+++ b/source/uCEFServerHandler.pas
@@ -56,7 +56,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFServer, uCEFRequest, uCEFCallback;
+  uCEFMiscFunctions, uCEFServer, uCEFRequest, uCEFCallback;
 
 // **************************************************************
 // ******************** TCEFServerHandlerOwn ********************
diff --git a/source/uCEFSetCookieCallback.pas b/source/uCEFSetCookieCallback.pas
index ce45e831..d184d493 100644
--- a/source/uCEFSetCookieCallback.pas
+++ b/source/uCEFSetCookieCallback.pas
@@ -53,7 +53,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure cef_set_cookie_callback_on_complete(self    : PCefSetCookieCallback;
                                               success : Integer); stdcall;
diff --git a/source/uCEFSettingObserver.pas b/source/uCEFSettingObserver.pas
index 562375a1..110152a3 100644
--- a/source/uCEFSettingObserver.pas
+++ b/source/uCEFSettingObserver.pas
@@ -41,7 +41,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBrowser;
+  uCEFMiscFunctions;
 
 
 // TCefSettingObserverOwn
diff --git a/source/uCEFSslInfo.pas b/source/uCEFSslInfo.pas
index d0327aa0..31acb136 100644
--- a/source/uCEFSslInfo.pas
+++ b/source/uCEFSslInfo.pas
@@ -32,7 +32,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBinaryValue, uCEFX509Certificate;
+  uCEFX509Certificate;
 
 
 function TCefSslInfoRef.GetCertStatus: TCefCertStatus;
diff --git a/source/uCEFStringList.pas b/source/uCEFStringList.pas
index b23683bd..da5f3ab4 100644
--- a/source/uCEFStringList.pas
+++ b/source/uCEFStringList.pas
@@ -17,7 +17,7 @@ uses
   {$ELSE}
   Classes,
   {$ENDIF}
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
+  uCEFInterfaces, uCEFTypes;
 
 type
   /// <summary>
diff --git a/source/uCEFStringMap.pas b/source/uCEFStringMap.pas
index cd2c9349..86f97975 100644
--- a/source/uCEFStringMap.pas
+++ b/source/uCEFStringMap.pas
@@ -12,7 +12,7 @@ unit uCEFStringMap;
 interface
 
 uses
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
+  uCEFInterfaces, uCEFTypes;
 
 type
   /// <summary>
diff --git a/source/uCEFStringMultimap.pas b/source/uCEFStringMultimap.pas
index 6fa801ad..8f8e187e 100644
--- a/source/uCEFStringMultimap.pas
+++ b/source/uCEFStringMultimap.pas
@@ -12,7 +12,7 @@ unit uCEFStringMultimap;
 interface
 
 uses
-  uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
+  uCEFInterfaces, uCEFTypes;
 
 type
   /// <summary>
diff --git a/source/uCEFStringVisitor.pas b/source/uCEFStringVisitor.pas
index bf228945..add8e68d 100644
--- a/source/uCEFStringVisitor.pas
+++ b/source/uCEFStringVisitor.pas
@@ -52,7 +52,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure cef_string_visitor_visit(      self : PCefStringVisitor;
                                    const str  : PCefString); stdcall;
diff --git a/source/uCEFTask.pas b/source/uCEFTask.pas
index a417a8e1..61841834 100644
--- a/source/uCEFTask.pas
+++ b/source/uCEFTask.pas
@@ -219,7 +219,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFCookieManager, uCEFUrlRequest, uCEFApplicationCore;
+  uCEFMiscFunctions, uCEFApplicationCore;
 
 
 // TCefTaskOwn
diff --git a/source/uCEFTextfieldComponent.pas b/source/uCEFTextfieldComponent.pas
index dd45ef40..a3c8cd0f 100644
--- a/source/uCEFTextfieldComponent.pas
+++ b/source/uCEFTextfieldComponent.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, uCEFViewsFrameworkEvents, uCEFViewComponent, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows or pfidOSX or pfidLinux)]{$ENDIF}{$ENDIF}
@@ -232,7 +232,7 @@ procedure Register;
 implementation
 
 uses
-  uCEFTextfieldDelegate, uCEFMiscFunctions, uCEFTask, uCEFTextfield;
+  uCEFTextfieldDelegate, uCEFTextfield;
 
 procedure TCEFTextfieldComponent.Initialize;
 begin
diff --git a/source/uCEFTextfieldDelegate.pas b/source/uCEFTextfieldDelegate.pas
index d76aa318..8a7296e1 100644
--- a/source/uCEFTextfieldDelegate.pas
+++ b/source/uCEFTextfieldDelegate.pas
@@ -96,7 +96,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFTextfield;
+  uCEFMiscFunctions, uCEFTextfield;
 
 
 // **************************************************************
diff --git a/source/uCEFTimerWorkScheduler.pas b/source/uCEFTimerWorkScheduler.pas
index 27856d7e..28e8c78f 100644
--- a/source/uCEFTimerWorkScheduler.pas
+++ b/source/uCEFTimerWorkScheduler.pas
@@ -15,21 +15,21 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    System.Classes, System.SyncObjs, {$IFDEF MSWINDOWS}WinApi.Windows, WinApi.Messages,{$ENDIF}
+    System.Classes, {$IFDEF MSWINDOWS}WinApi.Windows, WinApi.Messages,{$ENDIF}
     {$IFDEF FMX}
     FMX.Types, uCEFMacOSCustomCocoaTimer,
     {$ELSE}
     Vcl.ExtCtrls,
     {$ENDIF}
   {$ELSE}
-    Classes, SyncObjs, {$IFDEF MSWINDOWS}Windows,{$ENDIF} ExtCtrls,
+    Classes, {$IFDEF MSWINDOWS}Windows,{$ENDIF} ExtCtrls,
     {$IFDEF FPC}
-    LMessages, Forms,
+    Forms,
     {$ELSE}
     Messages,
     {$ENDIF}
   {$ENDIF}
-  {$IFDEF USEEVENTPIPE}uCEFLinuxEventPipe,{$ENDIF} uCEFTypes, uCEFConstants,
+  {$IFDEF USEEVENTPIPE}uCEFLinuxEventPipe,{$ENDIF} uCEFConstants,
   uCEFApplicationCore;
 
 type
@@ -102,11 +102,11 @@ implementation
 
 uses
   {$IFDEF DELPHI16_UP}
-  System.SysUtils, System.Math, {$IFDEF MACOS}System.RTTI, FMX.Forms, FMX.Platform,{$ENDIF}
+  System.SysUtils, System.Math {$IFDEF MACOS}, System.RTTI, FMX.Forms, FMX.Platform{$ENDIF}
   {$ELSE}
-  SysUtils, Math,
+  SysUtils, Math
   {$ENDIF}
-  uCEFMiscFunctions;
+  {$IFDEF MSWINDOWS}, uCEFTypes{$ENDIF};
 
 procedure DestroyGlobalCEFTimerWorkScheduler;
 begin
diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas
index e5ef7fdf..3965c26e 100644
--- a/source/uCEFTypes.pas
+++ b/source/uCEFTypes.pas
@@ -16,14 +16,13 @@ uses
     {$IFDEF MSWINDOWS}
       WinApi.Windows,
     {$ELSE}
-      System.Types, {$IFDEF LINUX}uCEFLinuxTypes,{$ENDIF}
+      System.Types, {$IFDEF LINUX}uCEFLinuxTypes, uCEFConstants,{$ENDIF}
     {$ENDIF}
-    System.Math,
+    System.Math;
   {$ELSE}
-    {$IFDEF FPC}{$IFDEF LINUX}xlib, ctypes,{$ENDIF}{$ENDIF}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Math,
+    {$IFDEF LINUXFPC}ctypes, uCEFLinuxTypes, uCEFConstants,{$ENDIF}
+    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Math;
   {$ENDIF}
-  uCEFConstants;
 
 type
   PCefStringWide = ^TCefStringWide;
diff --git a/source/uCEFUrlRequestClientComponent.pas b/source/uCEFUrlRequestClientComponent.pas
index dce4d499..b737c0f3 100644
--- a/source/uCEFUrlRequestClientComponent.pas
+++ b/source/uCEFUrlRequestClientComponent.pas
@@ -13,17 +13,16 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows, WinApi.Messages, WinApi.ActiveX,{$ENDIF}
-    System.Classes, System.Math,
+    System.Classes,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows, ActiveX,{$ENDIF} Classes, Math,
+    Classes,
     {$IFDEF FPC}
-    LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
+    LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
     {$ELSE}
     Messages,
     {$ENDIF}
   {$ENDIF}
-  uCEFTypes, uCEFInterfaces, uCEFConstants, uCEFUrlRequestClientEvents, uCEFUrlrequestClient, uCEFUrlRequest;
+  uCEFTypes, uCEFInterfaces, uCEFUrlRequestClientEvents, uCEFUrlrequestClient, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows or pfidOSX or pfidLinux)]{$ENDIF}{$ENDIF}
@@ -178,7 +177,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFRequest, uCEFTask, uCEFMiscFunctions, uCEFApplicationCore;
+  uCEFTask, uCEFMiscFunctions, uCEFApplicationCore;
 
 
 constructor TCEFUrlRequestClientComponent.Create(AOwner: TComponent);
diff --git a/source/uCEFUrlrequestClient.pas b/source/uCEFUrlrequestClient.pas
index a61e7e17..39c3b79a 100644
--- a/source/uCEFUrlrequestClient.pas
+++ b/source/uCEFUrlrequestClient.pas
@@ -66,7 +66,7 @@ uses
   {$ELSE}
   SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFUrlRequest, uCEFAuthCallback;
+  uCEFMiscFunctions, uCEFUrlRequest, uCEFAuthCallback;
 
 
 // TCefUrlrequestClientOwn
diff --git a/source/uCEFView.pas b/source/uCEFView.pas
index b87668ae..75996ca5 100644
--- a/source/uCEFView.pas
+++ b/source/uCEFView.pas
@@ -329,7 +329,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFBrowserView, uCEFButton, uCEFPanel,
+  uCEFMiscFunctions, uCEFBrowserView, uCEFButton, uCEFPanel,
   uCEFScrollView, uCEFTextfield, uCEFViewDelegate, uCEFWindow;
 
 function TCefViewRef.AsBrowserView : ICefBrowserView;
diff --git a/source/uCEFViewComponent.pas b/source/uCEFViewComponent.pas
index 9299c2b3..69cb845e 100644
--- a/source/uCEFViewComponent.pas
+++ b/source/uCEFViewComponent.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}
@@ -454,7 +454,7 @@ type
 implementation
 
 uses
-  uCEFViewDelegate, uCEFMiscFunctions, uCEFTask, uCEFApplicationCore;
+  uCEFMiscFunctions, uCEFTask, uCEFApplicationCore;
 
 constructor TCEFViewComponent.Create(AOwner: TComponent);
 begin
diff --git a/source/uCEFViewDelegate.pas b/source/uCEFViewDelegate.pas
index df012a78..c2e6ecdf 100644
--- a/source/uCEFViewDelegate.pas
+++ b/source/uCEFViewDelegate.pas
@@ -162,7 +162,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFView;
+  uCEFMiscFunctions, uCEFView;
 
 
 // **************************************************************
diff --git a/source/uCEFWaitableEvent.pas b/source/uCEFWaitableEvent.pas
index 624d788b..d1bb6567 100644
--- a/source/uCEFWaitableEvent.pas
+++ b/source/uCEFWaitableEvent.pas
@@ -31,7 +31,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFLibFunctions;
 
 procedure TCefWaitableEventRef.Reset;
 begin
diff --git a/source/uCEFWinControl.pas b/source/uCEFWinControl.pas
index e3103b8f..1e98d7fd 100644
--- a/source/uCEFWinControl.pas
+++ b/source/uCEFWinControl.pas
@@ -16,18 +16,15 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows, {$ENDIF} System.Classes, Vcl.Controls, Vcl.Graphics,
+    {$IFDEF MSWINDOWS}WinApi.Windows, {$ENDIF} System.Classes, Vcl.Controls, Vcl.Graphics;
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, Forms, Controls, Graphics,
-    {$IF DEFINED(LCLQT) OR DEFINED(LCLQT5) OR DEFINED(LCLQT6) OR DEFINED(LCLGTK3)}ExtCtrls,{$IFEND}
+    {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, Forms, Controls, Graphics
     {$IFDEF FPC}
-    LCLProc, LCLType, LCLIntf, LResources, InterfaceBase,
+      {$IF DEFINED(LCLQT) OR DEFINED(LCLQT5) OR DEFINED(LCLQT6) OR DEFINED(LCLGTK3)}, ExtCtrls{$IFEND}
+      , LCLProc, LCLType, LCLIntf, LResources, InterfaceBase {$IFDEF MACOSX}, CocoaAll{$ENDIF}
     {$ENDIF}
+    ;
   {$ENDIF}
-  {$IFDEF FPC}{$IFDEF MACOSX}
-  CocoaAll,
-  {$ENDIF}{$ENDIF}
-  uCEFTypes, uCEFInterfaces;
 
 type
   /// <summary>
@@ -106,11 +103,9 @@ type
 
 implementation
 
-uses
-  {$IFDEF LCLQT}qtwidgets, qt4,{$ENDIF}
-  {$IFDEF LCLQT5}qtwidgets, qt5,{$ENDIF}
-  {$IFDEF LCLQT6}qtwidgets, qt6,{$ENDIF}
-  uCEFMiscFunctions, uCEFClient, uCEFConstants;
+{$IFDEF LCLQT}uses qtwidgets, qt4;{$ENDIF}
+{$IFDEF LCLQT5}uses qtwidgets, qt5;{$ENDIF}
+{$IFDEF LCLQT6}uses qtwidgets, qt6;{$ENDIF}
 
 function TCEFWinControl.GetChildWindowHandle : {$IFNDEF MSWINDOWS}{$IFDEF FPC}LclType.{$ENDIF}{$ENDIF}THandle;
 begin
diff --git a/source/uCEFWindowComponent.pas b/source/uCEFWindowComponent.pas
index 8f4644d1..d84aad51 100644
--- a/source/uCEFWindowComponent.pas
+++ b/source/uCEFWindowComponent.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, uCEFPanelComponent;
+  uCEFTypes, uCEFInterfaces, uCEFViewsFrameworkEvents, uCEFPanelComponent, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows or pfidOSX or pfidLinux)]{$ENDIF}{$ENDIF}
@@ -556,7 +556,7 @@ procedure Register;
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFWindowDelegate, uCEFWindow, uCEFTask;
+  uCEFMiscFunctions, uCEFWindowDelegate, uCEFWindow;
 
 procedure TCEFWindowComponent.Initialize;
 begin
diff --git a/source/uCEFWindowDelegate.pas b/source/uCEFWindowDelegate.pas
index 0c34caf8..f102c175 100644
--- a/source/uCEFWindowDelegate.pas
+++ b/source/uCEFWindowDelegate.pas
@@ -288,7 +288,7 @@ type
 implementation
 
 uses
-  uCEFLibFunctions, uCEFMiscFunctions, uCEFWindow, uCEFConstants;
+  uCEFMiscFunctions, uCEFWindow, uCEFConstants;
 
 
 // **************************************************************
diff --git a/source/uCEFWindowInfoWrapper.pas b/source/uCEFWindowInfoWrapper.pas
index 49b7d404..6627de9a 100644
--- a/source/uCEFWindowInfoWrapper.pas
+++ b/source/uCEFWindowInfoWrapper.pas
@@ -233,15 +233,13 @@ type
 implementation
 
 uses
-  {$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, Gtk3Procs, LazGObject2,{$ENDIF}
+  {$IFDEF LINUXFPC}
+    {$IFDEF LCLGTK2}gtk2, gtk2proc, gtk2int, Gtk2Def, gdk2x, Gtk2Extra,{$ENDIF}
+    {$IFDEF LCLGTK3}LazGtk3, Gtk3Widgets, Gtk3Procs, LazGObject2, uCEFLinuxFunctions,{$ENDIF}
     {$IFDEF LCLQT}qtwidgets, qt4,{$ENDIF}
     {$IFDEF LCLQT5}qtwidgets, qt5,{$ENDIF}
     {$IFDEF LCLQT6}qtwidgets, qt6,{$ENDIF}
-    uCEFLinuxFunctions,
-  {$ENDIF}{$ENDIF}
+  {$ENDIF}
   uCEFMiscFunctions;
 
 constructor TCEFWindowInfoWrapper.Create;
diff --git a/source/uCEFWindowParent.pas b/source/uCEFWindowParent.pas
index 0c578359..e8110688 100644
--- a/source/uCEFWindowParent.pas
+++ b/source/uCEFWindowParent.pas
@@ -17,12 +17,12 @@ uses
   {$ELSE}
     {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes, Forms, Controls, Graphics,
     {$IFDEF FPC}
-    LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase,
+    LCLProc, LCLType, LCLIntf, LResources, {$IFDEF MSWINDOWS}LMessages,{$ENDIF} InterfaceBase,
     {$ELSE}
     Messages,
     {$ENDIF}
   {$ENDIF}
-  uCEFWinControl, uCEFTypes, uCEFInterfaces, uCEFConstants;
+  uCEFWinControl, uCEFConstants;
 
 type
   {$IFNDEF FPC}{$IFDEF DELPHI16_UP}[ComponentPlatformsAttribute(pfidWindows)]{$ENDIF}{$ENDIF}
@@ -39,9 +39,6 @@ procedure Register;
 
 implementation
 
-uses
-  uCEFMiscFunctions, uCEFClient;
-
 {$IFDEF MSWINDOWS}
 procedure TCEFWindowParent.WndProc(var aMessage: TMessage);
 var
diff --git a/source/uCEFWorkScheduler.pas b/source/uCEFWorkScheduler.pas
index 4715e7aa..567638f3 100644
--- a/source/uCEFWorkScheduler.pas
+++ b/source/uCEFWorkScheduler.pas
@@ -17,7 +17,7 @@ uses
   {$ELSE}
     {$IFDEF MSWINDOWS}Windows,{$ENDIF} Classes,
     {$IFDEF FPC}
-    LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase, {$IFNDEF MSWINDOWS}forms,{$ENDIF}
+    LCLProc, LCLType, LCLIntf, LResources, InterfaceBase, {$IFNDEF MSWINDOWS}forms,{$ENDIF}
     {$ELSE}
     Messages,
     {$ENDIF}
@@ -146,11 +146,11 @@ implementation
 
 uses
   {$IFDEF DELPHI16_UP}
-  System.SysUtils, System.Math,
+  System.SysUtils,
   {$ELSE}
-  SysUtils, Math,
+  SysUtils,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFApplicationCore, uCEFTypes;
+  uCEFMiscFunctions, uCEFApplicationCore {$IFDEF MSWINDOWS}, uCEFTypes{$ENDIF};
 
 procedure DestroyGlobalCEFWorkScheduler;
 begin
diff --git a/source/uCEFWorkSchedulerThread.pas b/source/uCEFWorkSchedulerThread.pas
index 7fc64504..4394c11f 100644
--- a/source/uCEFWorkSchedulerThread.pas
+++ b/source/uCEFWorkSchedulerThread.pas
@@ -51,7 +51,6 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions,
   {$IFDEF DELPHI16_UP}
   System.SysUtils, System.Math;
   {$ELSE}
diff --git a/source/uCEFWriteHandler.pas b/source/uCEFWriteHandler.pas
index 004d38f3..b3a1005d 100644
--- a/source/uCEFWriteHandler.pas
+++ b/source/uCEFWriteHandler.pas
@@ -61,12 +61,7 @@ type
 implementation
 
 uses
-  {$IFDEF DELPHI16_UP}
-  System.Math,
-  {$ELSE}
-  Math,
-  {$ENDIF}
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 
 // *******************************************
diff --git a/source/uCEFX509CertPrincipal.pas b/source/uCEFX509CertPrincipal.pas
index c70b29c5..86f63cd1 100644
--- a/source/uCEFX509CertPrincipal.pas
+++ b/source/uCEFX509CertPrincipal.pas
@@ -38,9 +38,9 @@ implementation
 
 uses
   {$IFDEF DELPHI16_UP}
-    {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.SysUtils,
+    System.SysUtils,
   {$ELSE}
-    {$IFDEF MSWINDOWS}Windows,{$ENDIF} SysUtils,
+    SysUtils,
   {$ENDIF}
   uCEFMiscFunctions, uCEFStringList;
 
diff --git a/source/uCEFX509Certificate.pas b/source/uCEFX509Certificate.pas
index c9d69e7d..f1b1c0f5 100644
--- a/source/uCEFX509Certificate.pas
+++ b/source/uCEFX509Certificate.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;
 
@@ -42,7 +42,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFBinaryValue, uCEFX509CertPrincipal;
+  uCEFMiscFunctions, uCEFBinaryValue, uCEFX509CertPrincipal;
 
 function TCEFX509CertificateRef.GetSubject: ICefX509CertPrincipal;
 begin
diff --git a/source/uCEFv8Accessor.pas b/source/uCEFv8Accessor.pas
index d6b0fac3..da3cc60e 100644
--- a/source/uCEFv8Accessor.pas
+++ b/source/uCEFv8Accessor.pas
@@ -39,7 +39,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFv8Value;
+  uCEFMiscFunctions, uCEFv8Value;
 
 function cef_v8_accessor_get(      self      : PCefV8Accessor;
                              const name      : PCefString;
diff --git a/source/uCEFv8ArrayBufferReleaseCallback.pas b/source/uCEFv8ArrayBufferReleaseCallback.pas
index 39c31c71..eeea69e7 100644
--- a/source/uCEFv8ArrayBufferReleaseCallback.pas
+++ b/source/uCEFv8ArrayBufferReleaseCallback.pas
@@ -44,7 +44,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 procedure cef_v8array_buffer_release_callback_release_buffer(self   : PCefv8ArrayBufferReleaseCallback;
                                                              buffer : Pointer); stdcall;
diff --git a/source/uCEFv8Exception.pas b/source/uCEFv8Exception.pas
index 1d2df7ed..d6807100 100644
--- a/source/uCEFv8Exception.pas
+++ b/source/uCEFv8Exception.pas
@@ -33,7 +33,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 
 function TCefV8ExceptionRef.GetEndColumn: Integer;
diff --git a/source/uCEFv8Handler.pas b/source/uCEFv8Handler.pas
index d5ed0018..766cceab 100644
--- a/source/uCEFv8Handler.pas
+++ b/source/uCEFv8Handler.pas
@@ -13,10 +13,9 @@ interface
 
 uses
   {$IFDEF DELPHI16_UP}
-  {$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF} System.Rtti, System.TypInfo, System.Variants,
-  System.SysUtils, System.Classes, System.Math, System.SyncObjs,
+  System.Rtti, System.TypInfo, System.Variants, System.SysUtils, System.Classes,
   {$ELSE}
-  {$IFDEF DELPHI14_UP}Rtti,{$ENDIF} TypInfo, Variants, SysUtils, Classes, Math, SyncObjs, {$IFDEF MSWINDOWS}Windows,{$ENDIF}
+  {$IFDEF DELPHI14_UP}Rtti,{$ENDIF} TypInfo, Variants, SysUtils, Classes,
   {$ENDIF}
   uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
 
@@ -77,7 +76,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFv8Value, uCEFConstants;
+  {$IFDEF DELPHI14_UP}uCEFConstants,{$ENDIF} uCEFMiscFunctions, uCEFv8Value;
 
 function cef_v8_handler_execute(      self           : PCefv8Handler;
                                 const name           : PCefString;
diff --git a/source/uCEFv8Interceptor.pas b/source/uCEFv8Interceptor.pas
index 8132732f..0082e502 100644
--- a/source/uCEFv8Interceptor.pas
+++ b/source/uCEFv8Interceptor.pas
@@ -48,7 +48,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFv8Value;
+  uCEFMiscFunctions, uCEFv8Value;
 
 function cef_v8_interceptor_get_byname(      self      : PCefV8Interceptor;
                                        const name      : PCefString;
diff --git a/source/uCEFv8StackFrame.pas b/source/uCEFv8StackFrame.pas
index e90a5498..42c0626b 100644
--- a/source/uCEFv8StackFrame.pas
+++ b/source/uCEFv8StackFrame.pas
@@ -32,7 +32,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions;
+  uCEFMiscFunctions;
 
 function TCefV8StackFrameRef.GetColumn: Integer;
 begin
diff --git a/source/uCEFv8StackTrace.pas b/source/uCEFv8StackTrace.pas
index e5c20dcc..2de4b1cd 100644
--- a/source/uCEFv8StackTrace.pas
+++ b/source/uCEFv8StackTrace.pas
@@ -28,7 +28,7 @@ type
 implementation
 
 uses
-  uCEFMiscFunctions, uCEFLibFunctions, uCEFv8StackFrame;
+  uCEFLibFunctions, uCEFv8StackFrame;
 
 class function TCefV8StackTraceRef.Current(frameLimit: Integer): ICefV8StackTrace;
 begin
diff --git a/source/uceflazaruscocoa.pas b/source/uceflazaruscocoa.pas
index 974555c4..cbe8e29a 100644
--- a/source/uceflazaruscocoa.pas
+++ b/source/uceflazaruscocoa.pas
@@ -1,6 +1,5 @@
 unit uCEFLazarusCocoa;
 
-
 {$mode objfpc}{$H+}
 {$I cef.inc}
 
@@ -10,13 +9,11 @@ unit uCEFLazarusCocoa;
 
 interface
 
-uses
 {$IFDEF DARWIN}  // $IFDEF MACOSX
+uses
   CocoaAll, CocoaInt, Cocoa_Extra,
-{$ENDIF}
   Classes, SysUtils, ctypes;
 
-{$IFDEF DARWIN}  // $IFDEF MACOSX
 type
   CrAppProtocol = objcprotocol
     function isHandlingSendEvent: LCLObjCBoolean; message 'isHandlingSendEvent';
diff --git a/source/uceflinuxosrimehandler.pas b/source/uceflinuxosrimehandler.pas
index 7a3a88d2..74258b92 100644
--- a/source/uceflinuxosrimehandler.pas
+++ b/source/uceflinuxosrimehandler.pas
@@ -49,9 +49,11 @@ implementation
 // https://chromium.googlesource.com/chromium/src/+/refs/heads/main/ui/gtk/input_method_context_impl_gtk.cc
 
 uses
-  {$IF DEFINED(LCLGTK2) or DEFINED(LCLGTK3)}pango,{$ENDIF}
-  {$IFDEF FPC}LCLType, LCLIntf, LMessages,{$ENDIF}
-  {$IFDEF LCLGTK3}uCEFBufferPanel,{$ENDIF}
+  {$IFDEF FPC}
+    {$IF DEFINED(LCLGTK2) or DEFINED(LCLGTK3)}pango, LMessages,{$ENDIF}
+    LCLType, LCLIntf,
+    {$IFDEF LCLGTK3}uCEFBufferPanel,{$ENDIF}
+  {$ENDIF}
   SysUtils, uCEFMiscFunctions;
 
 {$IFDEF LCLGTK3}
diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json
index ea51b2a4..232d82ef 100644
--- a/update_CEF4Delphi.json
+++ b/update_CEF4Delphi.json
@@ -2,7 +2,7 @@
   "UpdateLazPackages" : [
     {
       "ForceNotify" : true,
-      "InternalVersion" : 839,
+      "InternalVersion" : 840,
       "Name" : "cef4delphi_lazarus.lpk",
       "Version" : "143.0.13"
     }