Removed unnecessary include files and conditionals in Lazarus demos

2025-12-13 21:45:55 +02:00 · 2025-10-06 16:32:46 +02:00
parent 774e1d8c58
commit 8ec7c17025
125 changed files with 116 additions and 158 deletions
--- a/demos/Lazarus_Linux_GTK2/MiniBrowser/uMiniBrowser.pas
+++ b/demos/Lazarus_Linux_GTK2/MiniBrowser/uMiniBrowser.pas
@@ -2,7 +2,7 @@

 {$mode objfpc}{$H+}

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK2/MobileBrowser/uMobileBrowser.pas
+++ b/demos/Lazarus_Linux_GTK2/MobileBrowser/uMobileBrowser.pas
@@ -1,6 +1,6 @@
 unit uMobileBrowser;

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK2/PopupBrowser2/uChildForm.pas
+++ b/demos/Lazarus_Linux_GTK2/PopupBrowser2/uChildForm.pas
@@ -2,7 +2,7 @@ unit uChildForm;

 {$mode objfpc}{$H+}

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK2/PopupBrowser2/uMainForm.pas
+++ b/demos/Lazarus_Linux_GTK2/PopupBrowser2/uMainForm.pas
@@ -2,7 +2,7 @@ unit uMainForm;

 {$mode objfpc}{$H+}

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK2/SimpleBrowser/SimpleBrowser.lpr
+++ b/demos/Lazarus_Linux_GTK2/SimpleBrowser/SimpleBrowser.lpr
@@ -2,7 +2,7 @@ program SimpleBrowser;

 {$mode objfpc}{$H+}         

-{$I ../../../source/cef.inc}
+

 uses
  {$IFDEF UNIX}{$IFDEF UseCThreads}
--- a/demos/Lazarus_Linux_GTK2/SimpleBrowser/usimplebrowser.pas
+++ b/demos/Lazarus_Linux_GTK2/SimpleBrowser/usimplebrowser.pas
@@ -2,7 +2,7 @@ unit uSimpleBrowser;

 {$mode objfpc}{$H+}   

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK2/TabbedBrowser2/TabbedBrowser2.lpr
+++ b/demos/Lazarus_Linux_GTK2/TabbedBrowser2/TabbedBrowser2.lpr
@@ -2,7 +2,7 @@ program TabbedBrowser2;

 {$mode objfpc}{$H+}

-{$I ../../../source/cef.inc}
+

 uses
  {$IFDEF UNIX}{$IFDEF UseCThreads}
--- a/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uBrowserFrame.pas
+++ b/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uBrowserFrame.pas
@@ -2,7 +2,7 @@

 {$mode objfpc}{$H+}

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uBrowserTab.pas
+++ b/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uBrowserTab.pas
@@ -2,7 +2,7 @@

 {$mode objfpc}{$H+}

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uMainForm.pas
+++ b/demos/Lazarus_Linux_GTK2/TabbedBrowser2/uMainForm.pas
@@ -2,7 +2,7 @@ unit uMainForm;

 {$mode objfpc}{$H+}

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK2/TinyBrowser/TinyBrowser.lpr
+++ b/demos/Lazarus_Linux_GTK2/TinyBrowser/TinyBrowser.lpr
@@ -2,7 +2,7 @@ program TinyBrowser;

 {$MODE Delphi}

-{$I ../../../source/cef.inc}
+

 uses
  {$IFDEF UNIX}{$IFDEF UseCThreads}
--- a/demos/Lazarus_Linux_GTK2/TinyBrowser/uTinyBrowser.pas
+++ b/demos/Lazarus_Linux_GTK2/TinyBrowser/uTinyBrowser.pas
@@ -2,7 +2,7 @@ unit uTinyBrowser;

 {$MODE Delphi}

-{$I ../../../source/cef.inc}
+

 interface

--- a/demos/Lazarus_Linux_GTK3/TinyBrowser/TinyBrowser.lpr
+++ b/demos/Lazarus_Linux_GTK3/TinyBrowser/TinyBrowser.lpr
@@ -2,8 +2,6 @@ program TinyBrowser;

 {$MODE Delphi}

-{$I ../../../source/cef.inc}
-
 uses
  {$IFDEF UNIX}{$IFDEF UseCThreads}
  cthreads,
--- a/demos/Lazarus_Linux_GTK3/TinyBrowser/uTinyBrowser.pas
+++ b/demos/Lazarus_Linux_GTK3/TinyBrowser/uTinyBrowser.pas
@@ -2,8 +2,6 @@ unit uTinyBrowser;

 {$MODE Delphi}

-{$I ../../../source/cef.inc}
-
 interface

 uses
--- a/demos/Lazarus_Mac/ExternalPumpBrowser/ExternalPumpBrowser.lpr
+++ b/demos/Lazarus_Mac/ExternalPumpBrowser/ExternalPumpBrowser.lpr
@@ -13,7 +13,6 @@
 program ExternalPumpBrowser;

 {$mode objfpc}{$H+}
-{$I ../../../source/cef.inc}

 uses
  {$IFDEF UNIX}{$IFDEF UseCThreads}
--- a/demos/Lazarus_Mac/ExternalPumpBrowser/uExternalPumpBrowser.pas
+++ b/demos/Lazarus_Mac/ExternalPumpBrowser/uExternalPumpBrowser.pas
@@ -1,7 +1,6 @@
 unit uExternalPumpBrowser;

 {$mode objfpc}{$H+}
-{$I ../../../source/cef.inc}

 interface

--- a/demos/Lazarus_Windows/ConsoleBrowser2/ConsoleBrowser2_sp.lpr
+++ b/demos/Lazarus_Windows/ConsoleBrowser2/ConsoleBrowser2_sp.lpr
@@ -2,7 +2,7 @@ program ConsoleBrowser2_sp;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  uCEFApplicationCore;
--- a/demos/Lazarus_Windows/ConsoleBrowser2/uCEFBrowserThread.pas
+++ b/demos/Lazarus_Windows/ConsoleBrowser2/uCEFBrowserThread.pas
@@ -2,16 +2,10 @@ unit uCEFBrowserThread;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
-
 interface

 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics, System.SyncObjs, System.Math,
-  {$ELSE}
  Windows, Messages, SysUtils, Classes, Graphics, SyncObjs, Math,
-  {$ENDIF}
  uCEFChromium, uCEFTypes, uCEFInterfaces, uCEFConstants, uCEFBufferPanel, uCEFChromiumCore, uCEFMiscFunctions;

 type
--- a/demos/Lazarus_Windows/ConsoleBrowser2/uEncapsulatedBrowser.pas
+++ b/demos/Lazarus_Windows/ConsoleBrowser2/uEncapsulatedBrowser.pas
@@ -2,16 +2,10 @@

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
-
 interface

 uses
-  {$IFDEF DELPHI16_UP}
-  System.SyncObjs, System.SysUtils,
-  {$ELSE}
  SyncObjs, SysUtils,
-  {$ENDIF}
  uCEFTypes, uCEFBrowserThread;

 type
--- a/demos/Lazarus_Windows/CookieVisitor/CookieVisitor.lpr
+++ b/demos/Lazarus_Windows/CookieVisitor/CookieVisitor.lpr
@@ -1,6 +1,6 @@
 program CookieVisitor;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/CookieVisitor/uCookieVisitor.pas
+++ b/demos/Lazarus_Windows/CookieVisitor/uCookieVisitor.pas
@@ -1,6 +1,6 @@
 unit uCookieVisitor;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/CookieVisitor/uSimpleTextViewer.pas
+++ b/demos/Lazarus_Windows/CookieVisitor/uSimpleTextViewer.pas
@@ -3,14 +3,8 @@ unit uSimpleTextViewer;
 interface

 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls;
-  {$ELSE}
  Windows, Messages, SysUtils, Variants, Classes, Graphics,
  Controls, Forms, Dialogs, StdCtrls;
-  {$ENDIF}
-

 type
  TSimpleTextViewerFrm = class(TForm)
--- a/demos/Lazarus_Windows/CustomResourceBrowser/CRBrowser.lpr
+++ b/demos/Lazarus_Windows/CustomResourceBrowser/CRBrowser.lpr
@@ -1,6 +1,6 @@
 program CRBrowser;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/CustomResourceBrowser/uCustomResourceHandler.pas
+++ b/demos/Lazarus_Windows/CustomResourceBrowser/uCustomResourceHandler.pas
@@ -1,6 +1,6 @@
 unit uCustomResourceHandler;

-{$I ..\..\..\source\cef.inc}
+

 interface
 uses
--- a/demos/Lazarus_Windows/CustomResourceBrowser/uMainForm.pas
+++ b/demos/Lazarus_Windows/CustomResourceBrowser/uMainForm.pas
@@ -1,6 +1,6 @@
 unit uMainForm;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/DOMVisitor/DOMVisitor.lpr
+++ b/demos/Lazarus_Windows/DOMVisitor/DOMVisitor.lpr
@@ -1,6 +1,6 @@
 program DOMVisitor;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/DOMVisitor/uDOMVisitor.pas
+++ b/demos/Lazarus_Windows/DOMVisitor/uDOMVisitor.pas
@@ -2,7 +2,7 @@

 unit uDOMVisitor;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/EditorBrowser/EditorBrowser.dpr
+++ b/demos/Lazarus_Windows/EditorBrowser/EditorBrowser.dpr
@@ -2,7 +2,7 @@ program EditorBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/EditorBrowser/uEditorBrowser.pas
+++ b/demos/Lazarus_Windows/EditorBrowser/uEditorBrowser.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/ExternalPumpBrowser/ExternalPumpBrowser.lpr
+++ b/demos/Lazarus_Windows/ExternalPumpBrowser/ExternalPumpBrowser.lpr
@@ -1,6 +1,6 @@
 program ExternalPumpBrowser;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/ExternalPumpBrowser/uExternalPumpBrowser.pas
+++ b/demos/Lazarus_Windows/ExternalPumpBrowser/uExternalPumpBrowser.pas
@@ -1,6 +1,6 @@
 unit uExternalPumpBrowser;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/FullScreenBrowser/FullScreenBrowser.lpr
+++ b/demos/Lazarus_Windows/FullScreenBrowser/FullScreenBrowser.lpr
@@ -2,7 +2,7 @@ program FullScreenBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSDialog/JSDialogBrowser.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSDialog/JSDialogBrowser.lpr
@@ -1,6 +1,6 @@
 program JSDialogBrowser;

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSDialog/uJSDialogBrowser.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSDialog/uJSDialogBrowser.pas
@@ -1,6 +1,6 @@
 unit uJSDialogBrowser;

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSEval/JSEval.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSEval/JSEval.lpr
@@ -2,7 +2,7 @@ program JSEval;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSEval/uJSEval.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSEval/uJSEval.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/JSExecutingFunctions.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/JSExecutingFunctions.lpr
@@ -2,7 +2,7 @@ program JSExecutingFunctions;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uJSExecutingFunctions.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uMyV8Handler.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExecutingFunctions/uMyV8Handler.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExtension/JSExtension.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSExtension/JSExtension.lpr
@@ -2,7 +2,7 @@ program JSExtension;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSExtension/uJSExtension.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExtension/uJSExtension.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExtension/uTestExtensionHandler.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExtension/uTestExtensionHandler.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/JSExtension.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/JSExtension.lpr
@@ -2,7 +2,7 @@ program JSExtension;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms, LCLIntf, LCLType, LMessages, Interfaces,
--- a/demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/uJSExtension.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/uJSExtension.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/uTestExtensionHandler.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionSubProcess/uTestExtensionHandler.pas
@@ -2,16 +2,12 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

 uses
-  {$IFDEF DELPHI16_UP}
-  Winapi.Windows,
-  {$ELSE}
  LCLIntf, LCLType, LMessages,
-  {$ENDIF}
  uCEFRenderProcessHandler, uCEFBrowserProcessHandler, uCEFInterfaces, uCEFProcessMessage,
  uCEFv8Context, uCEFTypes, uCEFv8Handler;

--- a/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/JSExtensionWithFunction.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/JSExtensionWithFunction.lpr
@@ -2,7 +2,7 @@ program JSExtensionWithFunction;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uJSExtensionWithFunction.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uMyV8Handler.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionWithFunction/uMyV8Handler.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/JSExtensionWithObjectParameter.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/JSExtensionWithObjectParameter.lpr
@@ -2,7 +2,7 @@ program JSExtensionWithObjectParameter;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uJSExtensionWithObjectParameter.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uMyV8Handler.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSExtensionWithObjectParameter/uMyV8Handler.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/JSSharedMemoryProcMessage.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/JSSharedMemoryProcMessage.lpr
@@ -2,7 +2,7 @@ program JSSharedMemoryProcMessage;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSSharedMemoryProcMessage/uMainForm.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSSimpleExtension/JSSimpleExtension.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSSimpleExtension/JSSimpleExtension.lpr
@@ -2,7 +2,7 @@ program JSSimpleExtension;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSSimpleExtension/uJSSimpleExtension.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/JSSimpleWindowBinding.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/JSSimpleWindowBinding.lpr
@@ -2,7 +2,7 @@ program JSSimpleWindowBinding;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSSimpleWindowBinding/uJSSimpleWindowBinding.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/JSSimpleWindowBinding.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/JSSimpleWindowBinding.lpr
@@ -2,7 +2,7 @@ program JSSimpleWindowBinding;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/SubProcess.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/SubProcess.lpr
@@ -2,7 +2,7 @@ program SubProcess;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  LCLIntf, LCLType, LMessages, Forms, Interfaces,
--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingSubProcess/uJSSimpleWindowBinding.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/JSWindowBindingWithArrayBuffer.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/JSWindowBindingWithArrayBuffer.lpr
@@ -2,7 +2,7 @@ program JSWindowBindingWithArrayBuffer;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithArrayBuffer/uJSWindowBindingWithArrayBuffer.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/JSWindowBindingWithFunction.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/JSWindowBindingWithFunction.lpr
@@ -2,7 +2,7 @@ program JSWindowBindingWithFunction;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uJSWindowBindingWithFunction.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uMyV8Handler.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithFunction/uMyV8Handler.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/JSWindowBindingWithObject.lpr
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/JSWindowBindingWithObject.lpr
@@ -2,7 +2,7 @@ program JSWindowBindingWithObject;

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uJSWindowBindingWithObject.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uMyV8Accessor.pas
+++ b/demos/Lazarus_Windows/JavaScript/JSWindowBindingWithObject/uMyV8Accessor.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/KioskBrowser/KioskBrowser.lpr
+++ b/demos/Lazarus_Windows/KioskBrowser/KioskBrowser.lpr
@@ -2,8 +2,6 @@ program KioskBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
-
 uses
  Forms, Interfaces,
  uCEFApplication,
@@ -28,9 +26,7 @@ begin
  if GlobalCEFApp.StartMainProcess then
    begin
      Application.Initialize;
-      {$IFDEF DELPHI11_UP}
      Application.MainFormOnTaskbar := True;
-      {$ENDIF}
      Application.CreateForm(TForm1, Form1);
      Application.Run;
    end;
--- a/demos/Lazarus_Windows/KioskBrowser/uKioskBrowser.pas
+++ b/demos/Lazarus_Windows/KioskBrowser/uKioskBrowser.pas
@@ -2,7 +2,7 @@ unit uKioskBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/MediaRouter/MediaRouter.lpr
+++ b/demos/Lazarus_Windows/MediaRouter/MediaRouter.lpr
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Windows,
--- a/demos/Lazarus_Windows/MediaRouter/uMediaRouterFrm.pas
+++ b/demos/Lazarus_Windows/MediaRouter/uMediaRouterFrm.pas
@@ -2,8 +2,6 @@

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
-
 interface

 uses
@@ -113,11 +111,7 @@ implementation
 {$R *.lfm}

 uses
-  {$IFDEF DELPHI16_UP}
-  System.Math,
-  {$ELSE}
  Math,
-  {$ENDIF}
  uCEFMiscFunctions;

 // This demo can use a MediaRouter to communicate with devices on the local
--- a/demos/Lazarus_Windows/MiniBrowser/MiniBrowser.lpr
+++ b/demos/Lazarus_Windows/MiniBrowser/MiniBrowser.lpr
@@ -2,7 +2,7 @@ program MiniBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/MiniBrowser/uMiniBrowser.pas
+++ b/demos/Lazarus_Windows/MiniBrowser/uMiniBrowser.pas
@@ -1,6 +1,6 @@
 unit uMiniBrowser;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/MiniBrowser/uPreferences.pas
+++ b/demos/Lazarus_Windows/MiniBrowser/uPreferences.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/MobileBrowser/MobileBrowser.lpr
+++ b/demos/Lazarus_Windows/MobileBrowser/MobileBrowser.lpr
@@ -2,7 +2,7 @@ program MobileBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/MobileBrowser/uMobileBrowser.pas
+++ b/demos/Lazarus_Windows/MobileBrowser/uMobileBrowser.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/NetworkTrackerBrowser/NetworkTrackerBrowser.lpr
+++ b/demos/Lazarus_Windows/NetworkTrackerBrowser/NetworkTrackerBrowser.lpr
@@ -2,7 +2,7 @@ program NetworkTrackerBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/NetworkTrackerBrowser/uMainForm.pas
+++ b/demos/Lazarus_Windows/NetworkTrackerBrowser/uMainForm.pas
@@ -1,6 +1,6 @@
 unit uMainForm;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/OAuth2Tester/OAuth2Tester.lpr
+++ b/demos/Lazarus_Windows/OAuth2Tester/OAuth2Tester.lpr
@@ -2,7 +2,7 @@ program OAuth2Tester;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/OAuth2Tester/uOAuth2TesterFrm.pas
+++ b/demos/Lazarus_Windows/OAuth2Tester/uOAuth2TesterFrm.pas
@@ -2,7 +2,7 @@

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/OSRExternalPumpBrowser/OSRExternalPumpBrowser.lpr
+++ b/demos/Lazarus_Windows/OSRExternalPumpBrowser/OSRExternalPumpBrowser.lpr
@@ -2,7 +2,7 @@ program OSRExternalPumpBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas
+++ b/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas
@@ -2,7 +2,7 @@ unit uOSRExternalPumpBrowser;

 {$MODE OBJFPC}{$H+}

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/PopupBrowser/PopupBrowser.lpr
+++ b/demos/Lazarus_Windows/PopupBrowser/PopupBrowser.lpr
@@ -1,6 +1,6 @@
 program PopupBrowser;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas
+++ b/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas
@@ -2,7 +2,7 @@ unit uChildForm;

 {$MODE OBJFPC}{$H+}

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/PopupBrowser/uMainForm.pas
+++ b/demos/Lazarus_Windows/PopupBrowser/uMainForm.pas
@@ -1,6 +1,6 @@
 unit uMainForm;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/PopupBrowser2/PopupBrowser2.lpr
+++ b/demos/Lazarus_Windows/PopupBrowser2/PopupBrowser2.lpr
@@ -1,6 +1,6 @@
 program PopupBrowser2;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/PopupBrowser2/uChildForm.pas
+++ b/demos/Lazarus_Windows/PopupBrowser2/uChildForm.pas
@@ -1,6 +1,6 @@
 unit uChildForm;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/PopupBrowser2/uMainForm.pas
+++ b/demos/Lazarus_Windows/PopupBrowser2/uMainForm.pas
@@ -1,6 +1,6 @@
 unit uMainForm;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/PostInspectorBrowser/PostInspectorBrowser.lpr
+++ b/demos/Lazarus_Windows/PostInspectorBrowser/PostInspectorBrowser.lpr
@@ -1,6 +1,6 @@
 program PostInspectorBrowser;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/PostInspectorBrowser/uPostInspectorBrowser.pas
+++ b/demos/Lazarus_Windows/PostInspectorBrowser/uPostInspectorBrowser.pas
@@ -1,6 +1,6 @@
 unit uPostInspectorBrowser;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/ResponseFilterBrowser/ResponseFilterBrowser.lpr
+++ b/demos/Lazarus_Windows/ResponseFilterBrowser/ResponseFilterBrowser.lpr
@@ -2,7 +2,7 @@ program ResponseFilterBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/ResponseFilterBrowser/uResponseFilterBrowser.pas
+++ b/demos/Lazarus_Windows/ResponseFilterBrowser/uResponseFilterBrowser.pas
@@ -2,7 +2,7 @@ unit uResponseFilterBrowser;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/SchemeRegistrationBrowser/SchemeRegistrationBrowser.lpr
+++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser/SchemeRegistrationBrowser.lpr
@@ -1,6 +1,6 @@
 program SchemeRegistrationBrowser;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/SchemeRegistrationBrowser/uHelloScheme.pas
+++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser/uHelloScheme.pas
@@ -1,6 +1,6 @@
 unit uHelloScheme;

-{$I ..\..\..\source\cef.inc}
+

 interface
 uses
--- a/demos/Lazarus_Windows/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas
+++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser/uSchemeRegistrationBrowser.pas
@@ -3,7 +3,7 @@

 unit uSchemeRegistrationBrowser;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/SchemeRegistrationBrowser.lpr
+++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/SchemeRegistrationBrowser.lpr
@@ -1,6 +1,6 @@
 program SchemeRegistrationBrowser;

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/SchemeRegistrationBrowser_sp.lpr
+++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/SchemeRegistrationBrowser_sp.lpr
@@ -2,7 +2,7 @@ program SchemeRegistrationBrowser_sp;

 {$MODE Delphi}

-{$I ..\..\..\source\cef.inc}
+

 uses
  Forms,
--- a/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/uHelloScheme.pas
+++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/uHelloScheme.pas
@@ -1,6 +1,6 @@
 unit uHelloScheme;

-{$I ..\..\..\source\cef.inc}
+

 interface
 uses
--- a/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/uSchemeRegistrationBrowser.pas
+++ b/demos/Lazarus_Windows/SchemeRegistrationBrowser_subprocess/uSchemeRegistrationBrowser.pas
@@ -3,7 +3,7 @@

 unit uSchemeRegistrationBrowser;

-{$I ..\..\..\source\cef.inc}
+

 interface

--- a/Show More
+++ b/Show More