diff --git a/source/uCEFAccessibilityHandler.pas b/source/uCEFAccessibilityHandler.pas
index 834558c0..dcfe0d58 100644
--- a/source/uCEFAccessibilityHandler.pas
+++ b/source/uCEFAccessibilityHandler.pas
@@ -41,10 +41,8 @@ unit uCEFAccessibilityHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFApp.pas b/source/uCEFApp.pas
index 4b5de26c..50f549c5 100644
--- a/source/uCEFApp.pas
+++ b/source/uCEFApp.pas
@@ -41,10 +41,8 @@ unit uCEFApp;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFApplication.pas b/source/uCEFApplication.pas
index 9ef5b250..ca8ac951 100644
--- a/source/uCEFApplication.pas
+++ b/source/uCEFApplication.pas
@@ -41,10 +41,8 @@ unit uCEFApplication;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFAuthCallback.pas b/source/uCEFAuthCallback.pas
index f589aff0..076084ca 100644
--- a/source/uCEFAuthCallback.pas
+++ b/source/uCEFAuthCallback.pas
@@ -41,10 +41,8 @@ unit uCEFAuthCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFBaseRefCounted.pas b/source/uCEFBaseRefCounted.pas
index 1cc7f2f7..8c1aac2c 100644
--- a/source/uCEFBaseRefCounted.pas
+++ b/source/uCEFBaseRefCounted.pas
@@ -41,10 +41,8 @@ unit uCEFBaseRefCounted;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFBaseScopedWrapper.pas b/source/uCEFBaseScopedWrapper.pas
index 21ccb3ff..1a3d4468 100644
--- a/source/uCEFBaseScopedWrapper.pas
+++ b/source/uCEFBaseScopedWrapper.pas
@@ -41,10 +41,8 @@ unit uCEFBaseScopedWrapper;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFBeforeDownloadCallback.pas b/source/uCEFBeforeDownloadCallback.pas
index ba427fe5..b22626ae 100644
--- a/source/uCEFBeforeDownloadCallback.pas
+++ b/source/uCEFBeforeDownloadCallback.pas
@@ -41,10 +41,8 @@ unit uCEFBeforeDownloadCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFBinaryValue.pas b/source/uCEFBinaryValue.pas
index 76a7fddf..5fe5c4b8 100644
--- a/source/uCEFBinaryValue.pas
+++ b/source/uCEFBinaryValue.pas
@@ -41,10 +41,8 @@ unit uCEFBinaryValue;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFBrowser.pas b/source/uCEFBrowser.pas
index b2599e19..88306b25 100644
--- a/source/uCEFBrowser.pas
+++ b/source/uCEFBrowser.pas
@@ -41,10 +41,8 @@ unit uCEFBrowser;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFBrowserProcessHandler.pas b/source/uCEFBrowserProcessHandler.pas
index 3079bddd..693bef39 100644
--- a/source/uCEFBrowserProcessHandler.pas
+++ b/source/uCEFBrowserProcessHandler.pas
@@ -41,10 +41,8 @@ unit uCEFBrowserProcessHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFCallback.pas b/source/uCEFCallback.pas
index 4e59eb3c..7e533de0 100644
--- a/source/uCEFCallback.pas
+++ b/source/uCEFCallback.pas
@@ -41,10 +41,8 @@ unit uCEFCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFChromium.pas b/source/uCEFChromium.pas
index 619dfa03..95392421 100644
--- a/source/uCEFChromium.pas
+++ b/source/uCEFChromium.pas
@@ -41,10 +41,8 @@ unit uCEFChromium;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFChromiumEvents.pas b/source/uCEFChromiumEvents.pas
index 9fe9caec..f863422b 100644
--- a/source/uCEFChromiumEvents.pas
+++ b/source/uCEFChromiumEvents.pas
@@ -41,10 +41,8 @@ unit uCEFChromiumEvents;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFChromiumFontOptions.pas b/source/uCEFChromiumFontOptions.pas
index 867d4c25..2454fedf 100644
--- a/source/uCEFChromiumFontOptions.pas
+++ b/source/uCEFChromiumFontOptions.pas
@@ -41,10 +41,8 @@ unit uCEFChromiumFontOptions;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFChromiumOptions.pas b/source/uCEFChromiumOptions.pas
index 0c1b11f5..43da52a6 100644
--- a/source/uCEFChromiumOptions.pas
+++ b/source/uCEFChromiumOptions.pas
@@ -41,10 +41,8 @@ unit uCEFChromiumOptions;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFChromiumWindow.pas b/source/uCEFChromiumWindow.pas
index b539b9e8..8e3a4573 100644
--- a/source/uCEFChromiumWindow.pas
+++ b/source/uCEFChromiumWindow.pas
@@ -41,10 +41,8 @@ unit uCEFChromiumWindow;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFClient.pas b/source/uCEFClient.pas
index ee61243c..58e6bd59 100644
--- a/source/uCEFClient.pas
+++ b/source/uCEFClient.pas
@@ -41,10 +41,8 @@ unit uCEFClient;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFCommandLine.pas b/source/uCEFCommandLine.pas
index d4ad2275..19fb7bdc 100644
--- a/source/uCEFCommandLine.pas
+++ b/source/uCEFCommandLine.pas
@@ -41,10 +41,8 @@ unit uCEFCommandLine;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFCompletionCallback.pas b/source/uCEFCompletionCallback.pas
index d7545b8c..8f25b748 100644
--- a/source/uCEFCompletionCallback.pas
+++ b/source/uCEFCompletionCallback.pas
@@ -41,10 +41,8 @@ unit uCEFCompletionCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFConstants.pas b/source/uCEFConstants.pas
index 54656602..ee52e86b 100644
--- a/source/uCEFConstants.pas
+++ b/source/uCEFConstants.pas
@@ -41,10 +41,8 @@ unit uCEFConstants;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFContextMenuHandler.pas b/source/uCEFContextMenuHandler.pas
index 63319ec6..8a910b53 100644
--- a/source/uCEFContextMenuHandler.pas
+++ b/source/uCEFContextMenuHandler.pas
@@ -41,10 +41,8 @@ unit uCEFContextMenuHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFContextMenuParams.pas b/source/uCEFContextMenuParams.pas
index 091269e2..f034c4c6 100644
--- a/source/uCEFContextMenuParams.pas
+++ b/source/uCEFContextMenuParams.pas
@@ -41,10 +41,8 @@ unit uCEFContextMenuParams;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFCookieManager.pas b/source/uCEFCookieManager.pas
index 26f253eb..4779f6db 100644
--- a/source/uCEFCookieManager.pas
+++ b/source/uCEFCookieManager.pas
@@ -41,10 +41,8 @@ unit uCEFCookieManager;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFCookieVisitor.pas b/source/uCEFCookieVisitor.pas
index 5b7e1d33..7bcc972b 100644
--- a/source/uCEFCookieVisitor.pas
+++ b/source/uCEFCookieVisitor.pas
@@ -41,10 +41,8 @@ unit uCEFCookieVisitor;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFCustomStreamReader.pas b/source/uCEFCustomStreamReader.pas
index 18c70108..cf65ddce 100644
--- a/source/uCEFCustomStreamReader.pas
+++ b/source/uCEFCustomStreamReader.pas
@@ -41,10 +41,8 @@ unit uCEFCustomStreamReader;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDeleteCookiesCallback.pas b/source/uCEFDeleteCookiesCallback.pas
index f5a46c53..7d740958 100644
--- a/source/uCEFDeleteCookiesCallback.pas
+++ b/source/uCEFDeleteCookiesCallback.pas
@@ -41,10 +41,8 @@ unit uCEFDeleteCookiesCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDialogHandler.pas b/source/uCEFDialogHandler.pas
index bc29d159..457d6b02 100644
--- a/source/uCEFDialogHandler.pas
+++ b/source/uCEFDialogHandler.pas
@@ -41,10 +41,8 @@ unit uCEFDialogHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDictionaryValue.pas b/source/uCEFDictionaryValue.pas
index 3d37a170..8697ee09 100644
--- a/source/uCEFDictionaryValue.pas
+++ b/source/uCEFDictionaryValue.pas
@@ -41,10 +41,8 @@ unit uCEFDictionaryValue;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDisplayHandler.pas b/source/uCEFDisplayHandler.pas
index ccf4e752..6cf5558c 100644
--- a/source/uCEFDisplayHandler.pas
+++ b/source/uCEFDisplayHandler.pas
@@ -41,10 +41,8 @@ unit uCEFDisplayHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDomDocument.pas b/source/uCEFDomDocument.pas
index 32291aa9..e171d125 100644
--- a/source/uCEFDomDocument.pas
+++ b/source/uCEFDomDocument.pas
@@ -41,10 +41,8 @@ unit uCEFDomDocument;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDomNode.pas b/source/uCEFDomNode.pas
index 1984f866..839ba3ea 100644
--- a/source/uCEFDomNode.pas
+++ b/source/uCEFDomNode.pas
@@ -41,10 +41,8 @@ unit uCEFDomNode;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDomVisitor.pas b/source/uCEFDomVisitor.pas
index cf22bc12..6929d82c 100644
--- a/source/uCEFDomVisitor.pas
+++ b/source/uCEFDomVisitor.pas
@@ -41,10 +41,8 @@ unit uCEFDomVisitor;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDownLoadItem.pas b/source/uCEFDownLoadItem.pas
index a2475f15..bf06264f 100644
--- a/source/uCEFDownLoadItem.pas
+++ b/source/uCEFDownLoadItem.pas
@@ -41,10 +41,8 @@ unit uCEFDownLoadItem;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDownloadHandler.pas b/source/uCEFDownloadHandler.pas
index 4179fa03..4947c599 100644
--- a/source/uCEFDownloadHandler.pas
+++ b/source/uCEFDownloadHandler.pas
@@ -41,10 +41,8 @@ unit uCEFDownloadHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDownloadImageCallBack.pas b/source/uCEFDownloadImageCallBack.pas
index 4c27f85e..d4f5be2d 100644
--- a/source/uCEFDownloadImageCallBack.pas
+++ b/source/uCEFDownloadImageCallBack.pas
@@ -41,10 +41,8 @@ unit uCEFDownloadImageCallBack;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDownloadItemCallback.pas b/source/uCEFDownloadItemCallback.pas
index 7ac4f978..857461ee 100644
--- a/source/uCEFDownloadItemCallback.pas
+++ b/source/uCEFDownloadItemCallback.pas
@@ -41,10 +41,8 @@ unit uCEFDownloadItemCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDragData.pas b/source/uCEFDragData.pas
index 75c98a85..449d0ee9 100644
--- a/source/uCEFDragData.pas
+++ b/source/uCEFDragData.pas
@@ -41,10 +41,8 @@ unit uCEFDragData;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFDragHandler.pas b/source/uCEFDragHandler.pas
index 35d18a49..2d593f16 100644
--- a/source/uCEFDragHandler.pas
+++ b/source/uCEFDragHandler.pas
@@ -41,10 +41,8 @@ unit uCEFDragHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFEndTracingCallback.pas b/source/uCEFEndTracingCallback.pas
index e32657e2..543b626b 100644
--- a/source/uCEFEndTracingCallback.pas
+++ b/source/uCEFEndTracingCallback.pas
@@ -41,10 +41,8 @@ unit uCEFEndTracingCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFExtension.pas b/source/uCEFExtension.pas
index 275efb0f..07a2eb6f 100644
--- a/source/uCEFExtension.pas
+++ b/source/uCEFExtension.pas
@@ -41,10 +41,8 @@ unit uCEFExtension;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFExtensionHandler.pas b/source/uCEFExtensionHandler.pas
index 3c163b1e..b7040533 100644
--- a/source/uCEFExtensionHandler.pas
+++ b/source/uCEFExtensionHandler.pas
@@ -41,10 +41,8 @@ unit uCEFExtensionHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFFileDialogCallback.pas b/source/uCEFFileDialogCallback.pas
index 4325728b..4b377942 100644
--- a/source/uCEFFileDialogCallback.pas
+++ b/source/uCEFFileDialogCallback.pas
@@ -41,10 +41,8 @@ unit uCEFFileDialogCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFFindHandler.pas b/source/uCEFFindHandler.pas
index d8cd0f5a..96c27407 100644
--- a/source/uCEFFindHandler.pas
+++ b/source/uCEFFindHandler.pas
@@ -41,10 +41,8 @@ unit uCEFFindHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFFocusHandler.pas b/source/uCEFFocusHandler.pas
index c30aa6d9..9c709450 100644
--- a/source/uCEFFocusHandler.pas
+++ b/source/uCEFFocusHandler.pas
@@ -41,10 +41,8 @@ unit uCEFFocusHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFFrame.pas b/source/uCEFFrame.pas
index 77e5838d..62421837 100644
--- a/source/uCEFFrame.pas
+++ b/source/uCEFFrame.pas
@@ -41,10 +41,8 @@ unit uCEFFrame;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFGetExtensionResourceCallback.pas b/source/uCEFGetExtensionResourceCallback.pas
index 09059077..21bd0a3c 100644
--- a/source/uCEFGetExtensionResourceCallback.pas
+++ b/source/uCEFGetExtensionResourceCallback.pas
@@ -41,10 +41,8 @@ unit uCEFGetExtensionResourceCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFImage.pas b/source/uCEFImage.pas
index 0f7d72f4..33051b24 100644
--- a/source/uCEFImage.pas
+++ b/source/uCEFImage.pas
@@ -41,10 +41,8 @@ unit uCEFImage;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas
index f3da5974..51cc1643 100644
--- a/source/uCEFInterfaces.pas
+++ b/source/uCEFInterfaces.pas
@@ -41,10 +41,8 @@ unit uCEFInterfaces;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFJsDialogCallback.pas b/source/uCEFJsDialogCallback.pas
index 3b2fbb5c..737ebcd8 100644
--- a/source/uCEFJsDialogCallback.pas
+++ b/source/uCEFJsDialogCallback.pas
@@ -41,10 +41,8 @@ unit uCEFJsDialogCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFJsDialogHandler.pas b/source/uCEFJsDialogHandler.pas
index 2a8d2496..3fc0d6b0 100644
--- a/source/uCEFJsDialogHandler.pas
+++ b/source/uCEFJsDialogHandler.pas
@@ -41,10 +41,8 @@ unit uCEFJsDialogHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFKeyboardHandler.pas b/source/uCEFKeyboardHandler.pas
index 69fe339b..b23f57e3 100644
--- a/source/uCEFKeyboardHandler.pas
+++ b/source/uCEFKeyboardHandler.pas
@@ -41,10 +41,8 @@ unit uCEFKeyboardHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFLibFunctions.pas b/source/uCEFLibFunctions.pas
index 66923837..f16586b6 100644
--- a/source/uCEFLibFunctions.pas
+++ b/source/uCEFLibFunctions.pas
@@ -41,10 +41,8 @@ unit uCEFLibFunctions;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFLifeSpanHandler.pas b/source/uCEFLifeSpanHandler.pas
index 441d4c28..c5a79883 100644
--- a/source/uCEFLifeSpanHandler.pas
+++ b/source/uCEFLifeSpanHandler.pas
@@ -41,10 +41,8 @@ unit uCEFLifeSpanHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFLinkedWindowParent.pas b/source/uCEFLinkedWindowParent.pas
index a7aab03e..0bfd22cc 100644
--- a/source/uCEFLinkedWindowParent.pas
+++ b/source/uCEFLinkedWindowParent.pas
@@ -41,10 +41,8 @@ unit uCEFLinkedWindowParent;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFListValue.pas b/source/uCEFListValue.pas
index 39781c67..e4bfc3d2 100644
--- a/source/uCEFListValue.pas
+++ b/source/uCEFListValue.pas
@@ -41,10 +41,8 @@ unit uCEFListValue;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFLoadHandler.pas b/source/uCEFLoadHandler.pas
index 09af462b..0dd3b63c 100644
--- a/source/uCEFLoadHandler.pas
+++ b/source/uCEFLoadHandler.pas
@@ -41,10 +41,8 @@ unit uCEFLoadHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFMenuModel.pas b/source/uCEFMenuModel.pas
index 90655408..a2aab5cc 100644
--- a/source/uCEFMenuModel.pas
+++ b/source/uCEFMenuModel.pas
@@ -41,10 +41,8 @@ unit uCEFMenuModel;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFMenuModelDelegate.pas b/source/uCEFMenuModelDelegate.pas
index b21bf29f..5d2c1aef 100644
--- a/source/uCEFMenuModelDelegate.pas
+++ b/source/uCEFMenuModelDelegate.pas
@@ -41,10 +41,8 @@ unit uCEFMenuModelDelegate;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas
index 814f8d12..0f7de516 100644
--- a/source/uCEFMiscFunctions.pas
+++ b/source/uCEFMiscFunctions.pas
@@ -41,10 +41,8 @@ unit uCEFMiscFunctions;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFNavigationEntry.pas b/source/uCEFNavigationEntry.pas
index 1efe39ac..8ee6dcda 100644
--- a/source/uCEFNavigationEntry.pas
+++ b/source/uCEFNavigationEntry.pas
@@ -41,10 +41,8 @@ unit uCEFNavigationEntry;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFNavigationEntryVisitor.pas b/source/uCEFNavigationEntryVisitor.pas
index 9317b459..489dc0aa 100644
--- a/source/uCEFNavigationEntryVisitor.pas
+++ b/source/uCEFNavigationEntryVisitor.pas
@@ -41,10 +41,8 @@ unit uCEFNavigationEntryVisitor;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFPDFPrintCallback.pas b/source/uCEFPDFPrintCallback.pas
index f48a7842..0839a2e5 100644
--- a/source/uCEFPDFPrintCallback.pas
+++ b/source/uCEFPDFPrintCallback.pas
@@ -41,10 +41,8 @@ unit uCEFPDFPrintCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFPDFPrintOptions.pas b/source/uCEFPDFPrintOptions.pas
index 200dd938..449c4f8c 100644
--- a/source/uCEFPDFPrintOptions.pas
+++ b/source/uCEFPDFPrintOptions.pas
@@ -41,10 +41,8 @@ unit uCEFPDFPrintOptions;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFPostData.pas b/source/uCEFPostData.pas
index bdca8127..6ce1dd01 100644
--- a/source/uCEFPostData.pas
+++ b/source/uCEFPostData.pas
@@ -41,10 +41,8 @@ unit uCEFPostData;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFPostDataElement.pas b/source/uCEFPostDataElement.pas
index c4bf18c7..e63f60dc 100644
--- a/source/uCEFPostDataElement.pas
+++ b/source/uCEFPostDataElement.pas
@@ -41,10 +41,8 @@ unit uCEFPostDataElement;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFPrintSettings.pas b/source/uCEFPrintSettings.pas
index 8df5de0c..af74ed26 100644
--- a/source/uCEFPrintSettings.pas
+++ b/source/uCEFPrintSettings.pas
@@ -41,10 +41,8 @@ unit uCEFPrintSettings;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFProcessMessage.pas b/source/uCEFProcessMessage.pas
index 5b6bb0d2..6e161d06 100644
--- a/source/uCEFProcessMessage.pas
+++ b/source/uCEFProcessMessage.pas
@@ -41,10 +41,8 @@ unit uCEFProcessMessage;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRegisterCDMCallback.pas b/source/uCEFRegisterCDMCallback.pas
index 0f1011d1..f478df7b 100644
--- a/source/uCEFRegisterCDMCallback.pas
+++ b/source/uCEFRegisterCDMCallback.pas
@@ -41,10 +41,8 @@ unit uCEFRegisterCDMCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRenderHandler.pas b/source/uCEFRenderHandler.pas
index 46e40521..89dca0b3 100644
--- a/source/uCEFRenderHandler.pas
+++ b/source/uCEFRenderHandler.pas
@@ -41,10 +41,8 @@ unit uCEFRenderHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRenderProcessHandler.pas b/source/uCEFRenderProcessHandler.pas
index bb875cc7..9b46f6cc 100644
--- a/source/uCEFRenderProcessHandler.pas
+++ b/source/uCEFRenderProcessHandler.pas
@@ -41,10 +41,8 @@ unit uCEFRenderProcessHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRequest.pas b/source/uCEFRequest.pas
index ae05318a..2dde3242 100644
--- a/source/uCEFRequest.pas
+++ b/source/uCEFRequest.pas
@@ -41,10 +41,8 @@ unit uCEFRequest;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRequestCallback.pas b/source/uCEFRequestCallback.pas
index e9c843a3..e369c838 100644
--- a/source/uCEFRequestCallback.pas
+++ b/source/uCEFRequestCallback.pas
@@ -41,10 +41,8 @@ unit uCEFRequestCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRequestContext.pas b/source/uCEFRequestContext.pas
index f3e21fdf..f5253dd5 100644
--- a/source/uCEFRequestContext.pas
+++ b/source/uCEFRequestContext.pas
@@ -41,10 +41,8 @@ unit uCEFRequestContext;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRequestContextHandler.pas b/source/uCEFRequestContextHandler.pas
index 49c596ff..f20a4c86 100644
--- a/source/uCEFRequestContextHandler.pas
+++ b/source/uCEFRequestContextHandler.pas
@@ -41,10 +41,8 @@ unit uCEFRequestContextHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRequestHandler.pas b/source/uCEFRequestHandler.pas
index 3d416402..9062e486 100644
--- a/source/uCEFRequestHandler.pas
+++ b/source/uCEFRequestHandler.pas
@@ -41,10 +41,8 @@ unit uCEFRequestHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFResolveCallback.pas b/source/uCEFResolveCallback.pas
index d0c76e57..1d61e7c9 100644
--- a/source/uCEFResolveCallback.pas
+++ b/source/uCEFResolveCallback.pas
@@ -41,10 +41,8 @@ unit uCEFResolveCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFResourceBundle.pas b/source/uCEFResourceBundle.pas
index d9662223..fa4b56e1 100644
--- a/source/uCEFResourceBundle.pas
+++ b/source/uCEFResourceBundle.pas
@@ -41,10 +41,8 @@ unit uCEFResourceBundle;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFResourceBundleHandler.pas b/source/uCEFResourceBundleHandler.pas
index c1a5401b..f9c74a2e 100644
--- a/source/uCEFResourceBundleHandler.pas
+++ b/source/uCEFResourceBundleHandler.pas
@@ -41,10 +41,8 @@ unit uCEFResourceBundleHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFResourceHandler.pas b/source/uCEFResourceHandler.pas
index 8a36ade9..557a4b7e 100644
--- a/source/uCEFResourceHandler.pas
+++ b/source/uCEFResourceHandler.pas
@@ -41,10 +41,8 @@ unit uCEFResourceHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFResponse.pas b/source/uCEFResponse.pas
index 64764268..e4e6c0ec 100644
--- a/source/uCEFResponse.pas
+++ b/source/uCEFResponse.pas
@@ -41,10 +41,8 @@ unit uCEFResponse;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFResponseFilter.pas b/source/uCEFResponseFilter.pas
index acff1217..e30f740c 100644
--- a/source/uCEFResponseFilter.pas
+++ b/source/uCEFResponseFilter.pas
@@ -41,10 +41,8 @@ unit uCEFResponseFilter;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRunContextMenuCallback.pas b/source/uCEFRunContextMenuCallback.pas
index c20341dc..35546b17 100644
--- a/source/uCEFRunContextMenuCallback.pas
+++ b/source/uCEFRunContextMenuCallback.pas
@@ -41,10 +41,8 @@ unit uCEFRunContextMenuCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFRunFileDialogCallback.pas b/source/uCEFRunFileDialogCallback.pas
index 241553c6..03d4ab48 100644
--- a/source/uCEFRunFileDialogCallback.pas
+++ b/source/uCEFRunFileDialogCallback.pas
@@ -41,10 +41,8 @@ unit uCEFRunFileDialogCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFSSLStatus.pas b/source/uCEFSSLStatus.pas
index 74f5a551..f8c05852 100644
--- a/source/uCEFSSLStatus.pas
+++ b/source/uCEFSSLStatus.pas
@@ -41,10 +41,8 @@ unit uCEFSSLStatus;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFSchemeHandlerFactory.pas b/source/uCEFSchemeHandlerFactory.pas
index e5b108fc..584cb27b 100644
--- a/source/uCEFSchemeHandlerFactory.pas
+++ b/source/uCEFSchemeHandlerFactory.pas
@@ -41,10 +41,8 @@ unit uCEFSchemeHandlerFactory;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFSchemeRegistrar.pas b/source/uCEFSchemeRegistrar.pas
index 185c5771..47220252 100644
--- a/source/uCEFSchemeRegistrar.pas
+++ b/source/uCEFSchemeRegistrar.pas
@@ -41,10 +41,8 @@ unit uCEFSchemeRegistrar;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFSelectClientCertificateCallback.pas b/source/uCEFSelectClientCertificateCallback.pas
index 965f1bad..009f61cb 100644
--- a/source/uCEFSelectClientCertificateCallback.pas
+++ b/source/uCEFSelectClientCertificateCallback.pas
@@ -41,10 +41,8 @@ unit uCEFSelectClientCertificateCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFServer.pas b/source/uCEFServer.pas
index 8e244630..f789c5c2 100644
--- a/source/uCEFServer.pas
+++ b/source/uCEFServer.pas
@@ -41,10 +41,8 @@ unit uCEFServer;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFServerComponent.pas b/source/uCEFServerComponent.pas
index 013ea4b6..57162edd 100644
--- a/source/uCEFServerComponent.pas
+++ b/source/uCEFServerComponent.pas
@@ -41,10 +41,8 @@ unit uCEFServerComponent;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFServerEvents.pas b/source/uCEFServerEvents.pas
index 8af17726..85569bc3 100644
--- a/source/uCEFServerEvents.pas
+++ b/source/uCEFServerEvents.pas
@@ -41,10 +41,8 @@ unit uCEFServerEvents;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFServerHandler.pas b/source/uCEFServerHandler.pas
index e4528664..d07bd892 100644
--- a/source/uCEFServerHandler.pas
+++ b/source/uCEFServerHandler.pas
@@ -41,10 +41,8 @@ unit uCEFServerHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFSetCookieCallback.pas b/source/uCEFSetCookieCallback.pas
index d3c8a4a9..ca8cd553 100644
--- a/source/uCEFSetCookieCallback.pas
+++ b/source/uCEFSetCookieCallback.pas
@@ -41,10 +41,8 @@ unit uCEFSetCookieCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFSslInfo.pas b/source/uCEFSslInfo.pas
index b0cf0019..2cad1646 100644
--- a/source/uCEFSslInfo.pas
+++ b/source/uCEFSslInfo.pas
@@ -41,10 +41,8 @@ unit uCEFSslInfo;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFStreamReader.pas b/source/uCEFStreamReader.pas
index 52b887f1..5503197f 100644
--- a/source/uCEFStreamReader.pas
+++ b/source/uCEFStreamReader.pas
@@ -41,10 +41,8 @@ unit uCEFStreamReader;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFStreamWriter.pas b/source/uCEFStreamWriter.pas
index 54ca59b5..a4ebccfd 100644
--- a/source/uCEFStreamWriter.pas
+++ b/source/uCEFStreamWriter.pas
@@ -41,10 +41,8 @@ unit uCEFStreamWriter;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFStringList.pas b/source/uCEFStringList.pas
index 80060003..6756958b 100644
--- a/source/uCEFStringList.pas
+++ b/source/uCEFStringList.pas
@@ -41,10 +41,8 @@ unit uCEFStringList;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFStringMap.pas b/source/uCEFStringMap.pas
index 0e2b01cd..d3cd3c10 100644
--- a/source/uCEFStringMap.pas
+++ b/source/uCEFStringMap.pas
@@ -41,10 +41,8 @@ unit uCEFStringMap;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFStringMultimap.pas b/source/uCEFStringMultimap.pas
index 08f20711..84efd41a 100644
--- a/source/uCEFStringMultimap.pas
+++ b/source/uCEFStringMultimap.pas
@@ -41,10 +41,8 @@ unit uCEFStringMultimap;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFStringVisitor.pas b/source/uCEFStringVisitor.pas
index 0d04c935..c1889471 100644
--- a/source/uCEFStringVisitor.pas
+++ b/source/uCEFStringVisitor.pas
@@ -41,10 +41,8 @@ unit uCEFStringVisitor;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFTask.pas b/source/uCEFTask.pas
index fd7a130c..6c1ae254 100644
--- a/source/uCEFTask.pas
+++ b/source/uCEFTask.pas
@@ -41,10 +41,8 @@ unit uCEFTask;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFTaskRunner.pas b/source/uCEFTaskRunner.pas
index 83aaecbb..785e3238 100644
--- a/source/uCEFTaskRunner.pas
+++ b/source/uCEFTaskRunner.pas
@@ -41,10 +41,8 @@ unit uCEFTaskRunner;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFThread.pas b/source/uCEFThread.pas
index c8434f4d..e0c9c96b 100644
--- a/source/uCEFThread.pas
+++ b/source/uCEFThread.pas
@@ -41,10 +41,8 @@ unit uCEFThread;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas
index 591b775e..dac7d78a 100644
--- a/source/uCEFTypes.pas
+++ b/source/uCEFTypes.pas
@@ -41,10 +41,8 @@ unit uCEFTypes;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFUrlRequest.pas b/source/uCEFUrlRequest.pas
index f0a35af8..cd2dc658 100644
--- a/source/uCEFUrlRequest.pas
+++ b/source/uCEFUrlRequest.pas
@@ -41,10 +41,8 @@ unit uCEFUrlRequest;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFUrlRequestClientComponent.pas b/source/uCEFUrlRequestClientComponent.pas
index 31eb7bd5..f52e9bd4 100644
--- a/source/uCEFUrlRequestClientComponent.pas
+++ b/source/uCEFUrlRequestClientComponent.pas
@@ -41,10 +41,8 @@ unit uCEFUrlRequestClientComponent;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFUrlRequestClientEvents.pas b/source/uCEFUrlRequestClientEvents.pas
index 05b31c80..15b6d449 100644
--- a/source/uCEFUrlRequestClientEvents.pas
+++ b/source/uCEFUrlRequestClientEvents.pas
@@ -41,10 +41,8 @@ unit uCEFUrlRequestClientEvents;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFUrlrequestClient.pas b/source/uCEFUrlrequestClient.pas
index 9b23901b..58fa5c3b 100644
--- a/source/uCEFUrlrequestClient.pas
+++ b/source/uCEFUrlrequestClient.pas
@@ -41,10 +41,8 @@ unit uCEFUrlrequestClient;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFV8Exception.pas b/source/uCEFV8Exception.pas
index bbb374dc..c2632a1b 100644
--- a/source/uCEFV8Exception.pas
+++ b/source/uCEFV8Exception.pas
@@ -41,10 +41,8 @@ unit uCEFV8Exception;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFValue.pas b/source/uCEFValue.pas
index 5856996e..1b9a05d4 100644
--- a/source/uCEFValue.pas
+++ b/source/uCEFValue.pas
@@ -41,10 +41,8 @@ unit uCEFValue;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFWaitableEvent.pas b/source/uCEFWaitableEvent.pas
index 7f9c6e1b..1cc11ede 100644
--- a/source/uCEFWaitableEvent.pas
+++ b/source/uCEFWaitableEvent.pas
@@ -41,10 +41,8 @@ unit uCEFWaitableEvent;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFWebPluginInfo.pas b/source/uCEFWebPluginInfo.pas
index 709c1d64..2878b56d 100644
--- a/source/uCEFWebPluginInfo.pas
+++ b/source/uCEFWebPluginInfo.pas
@@ -41,10 +41,8 @@ unit uCEFWebPluginInfo;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFWebPluginInfoVisitor.pas b/source/uCEFWebPluginInfoVisitor.pas
index 65d9be73..a773a334 100644
--- a/source/uCEFWebPluginInfoVisitor.pas
+++ b/source/uCEFWebPluginInfoVisitor.pas
@@ -41,10 +41,8 @@ unit uCEFWebPluginInfoVisitor;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFWebPluginUnstableCallback.pas b/source/uCEFWebPluginUnstableCallback.pas
index 6eb99857..f805940f 100644
--- a/source/uCEFWebPluginUnstableCallback.pas
+++ b/source/uCEFWebPluginUnstableCallback.pas
@@ -41,10 +41,8 @@ unit uCEFWebPluginUnstableCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFWinControl.pas b/source/uCEFWinControl.pas
index 2468b98b..0c985649 100644
--- a/source/uCEFWinControl.pas
+++ b/source/uCEFWinControl.pas
@@ -41,10 +41,8 @@ unit uCEFWinControl;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFWindowParent.pas b/source/uCEFWindowParent.pas
index fc4a478a..0a0394ee 100644
--- a/source/uCEFWindowParent.pas
+++ b/source/uCEFWindowParent.pas
@@ -41,10 +41,8 @@ unit uCEFWindowParent;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFWorkScheduler.pas b/source/uCEFWorkScheduler.pas
index d145da90..976d596e 100644
--- a/source/uCEFWorkScheduler.pas
+++ b/source/uCEFWorkScheduler.pas
@@ -41,10 +41,8 @@ unit uCEFWorkScheduler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
@@ -132,7 +130,7 @@ uses
   {$ELSE}
   SysUtils, Math,
   {$ENDIF}
-  uCEFMiscFunctions, uCEFApplication;
+  uCEFMiscFunctions, uCEFApplication, uCEFTypes;
 
 procedure DestroyGlobalCEFWorkScheduler;
 begin
@@ -174,12 +172,16 @@ begin
 
   if not(csDesigning in ComponentState) then
     begin
-      {$IFDEF FPC}
-      TempWndMethod    := @WndProc;
-      FCompHandle      := AllocateHWnd(TempWndMethod);
-      {$ELSE}
-      FCompHandle      := AllocateHWnd(WndProc);
-      {$ENDIF}
+      if (GlobalCEFApp <> nil) and
+         ((GlobalCEFApp.ProcessType = ptBrowser) or GlobalCEFApp.SingleProcess) then
+        begin
+          {$IFDEF FPC}
+          TempWndMethod    := @WndProc;
+          FCompHandle      := AllocateHWnd(TempWndMethod);
+          {$ELSE}
+          FCompHandle      := AllocateHWnd(WndProc);
+          {$ENDIF}
+        end;
 
       CreateThread;
     end;
diff --git a/source/uCEFWorkSchedulerThread.pas b/source/uCEFWorkSchedulerThread.pas
index e9c24cd6..4cc10e60 100644
--- a/source/uCEFWorkSchedulerThread.pas
+++ b/source/uCEFWorkSchedulerThread.pas
@@ -41,10 +41,8 @@ unit uCEFWorkSchedulerThread;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFWriteHandler.pas b/source/uCEFWriteHandler.pas
index 4264d709..f76ff768 100644
--- a/source/uCEFWriteHandler.pas
+++ b/source/uCEFWriteHandler.pas
@@ -41,10 +41,8 @@ unit uCEFWriteHandler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFX509CertPrincipal.pas b/source/uCEFX509CertPrincipal.pas
index aef8b0e3..acd91a6e 100644
--- a/source/uCEFX509CertPrincipal.pas
+++ b/source/uCEFX509CertPrincipal.pas
@@ -41,10 +41,8 @@ unit uCEFX509CertPrincipal;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFX509Certificate.pas b/source/uCEFX509Certificate.pas
index 818aa3ee..de0ea324 100644
--- a/source/uCEFX509Certificate.pas
+++ b/source/uCEFX509Certificate.pas
@@ -41,10 +41,8 @@ unit uCEFX509Certificate;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFXmlReader.pas b/source/uCEFXmlReader.pas
index 795fd65a..0d4f5e0a 100644
--- a/source/uCEFXmlReader.pas
+++ b/source/uCEFXmlReader.pas
@@ -41,10 +41,8 @@ unit uCEFXmlReader;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFZipReader.pas b/source/uCEFZipReader.pas
index ad2b9391..fff7df3a 100644
--- a/source/uCEFZipReader.pas
+++ b/source/uCEFZipReader.pas
@@ -41,10 +41,8 @@ unit uCEFZipReader;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFv8Accessor.pas b/source/uCEFv8Accessor.pas
index 83371dd5..5e3aeae5 100644
--- a/source/uCEFv8Accessor.pas
+++ b/source/uCEFv8Accessor.pas
@@ -41,10 +41,8 @@ unit uCEFv8Accessor;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFv8ArrayBufferReleaseCallback.pas b/source/uCEFv8ArrayBufferReleaseCallback.pas
index f871f80b..6dc04c66 100644
--- a/source/uCEFv8ArrayBufferReleaseCallback.pas
+++ b/source/uCEFv8ArrayBufferReleaseCallback.pas
@@ -41,10 +41,8 @@ unit uCEFv8ArrayBufferReleaseCallback;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFv8Context.pas b/source/uCEFv8Context.pas
index abd5bcc3..24b4618e 100644
--- a/source/uCEFv8Context.pas
+++ b/source/uCEFv8Context.pas
@@ -41,10 +41,8 @@ unit uCEFv8Context;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFv8Handler.pas b/source/uCEFv8Handler.pas
index 11bf0aa5..b28cb511 100644
--- a/source/uCEFv8Handler.pas
+++ b/source/uCEFv8Handler.pas
@@ -41,10 +41,8 @@ unit uCEFv8Handler;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFv8Interceptor.pas b/source/uCEFv8Interceptor.pas
index f6291f31..23bf60b5 100644
--- a/source/uCEFv8Interceptor.pas
+++ b/source/uCEFv8Interceptor.pas
@@ -41,10 +41,8 @@ unit uCEFv8Interceptor;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFv8StackFrame.pas b/source/uCEFv8StackFrame.pas
index cf16df5a..0ae636bb 100644
--- a/source/uCEFv8StackFrame.pas
+++ b/source/uCEFv8StackFrame.pas
@@ -41,10 +41,8 @@ unit uCEFv8StackFrame;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFv8StackTrace.pas b/source/uCEFv8StackTrace.pas
index 521a249c..dfb9b4db 100644
--- a/source/uCEFv8StackTrace.pas
+++ b/source/uCEFv8StackTrace.pas
@@ -41,10 +41,8 @@ unit uCEFv8StackTrace;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uCEFv8Value.pas b/source/uCEFv8Value.pas
index d1beed88..1e5a57d4 100644
--- a/source/uCEFv8Value.pas
+++ b/source/uCEFv8Value.pas
@@ -41,10 +41,8 @@ unit uCEFv8Value;
   {$MODE OBJFPC}{$H+}
 {$ENDIF}
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uFMXChromium.pas b/source/uFMXChromium.pas
index a509bc6b..2679a8f5 100644
--- a/source/uFMXChromium.pas
+++ b/source/uFMXChromium.pas
@@ -37,10 +37,8 @@
 
 unit uFMXChromium;
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uFMXWindowParent.pas b/source/uFMXWindowParent.pas
index b07d28b3..234dd0ad 100644
--- a/source/uFMXWindowParent.pas
+++ b/source/uFMXWindowParent.pas
@@ -37,10 +37,8 @@
 
 unit uFMXWindowParent;
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
diff --git a/source/uFMXWorkScheduler.pas b/source/uFMXWorkScheduler.pas
index 5acc32e8..66113bd6 100644
--- a/source/uFMXWorkScheduler.pas
+++ b/source/uFMXWorkScheduler.pas
@@ -37,10 +37,8 @@
 
 unit uFMXWorkScheduler;
 
-{$IFNDEF CPUX64}
-  {$ALIGN ON}
-  {$MINENUMSIZE 4}
-{$ENDIF}
+{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF}
+{$MINENUMSIZE 4}
 
 {$I cef.inc}
 
@@ -222,8 +220,12 @@ begin
       {$IFDEF DELPHI17_UP}
       TempHandle := ApplicationHWND;
       {$ELSE}
-      TempHandle := FmxHandleToHWND(Application.MainForm.Handle);
+      if (Application <> nil) and (Application.MainForm <> nil) then
+        TempHandle := FmxHandleToHWND(Application.MainForm.Handle)
+       else
+        TempHandle := 0;
       {$ENDIF}
+
       if (TempHandle <> 0) then
         WinApi.Windows.PostMessage(TempHandle, CEF_PUMPHAVEWORK, 0, LPARAM(delay_ms));
       {$ENDIF}