diff --git a/.gitattributes b/.gitattributes
index 2472587b73..b289a25d64 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5513,7 +5513,6 @@ lcl/interfaces/customdrawn/android/asset_manager.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/android/bitmap.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/android/configuration.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/android/egl.pas svneol=native#text/pascal
-lcl/interfaces/customdrawn/android/eglplatform.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/android/gles.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/android/input.pas svneol=native#text/pascal
 lcl/interfaces/customdrawn/android/jni.pas svneol=native#text/pascal
diff --git a/lcl/interfaces/customdrawn/android/eglplatform.pas b/lcl/interfaces/customdrawn/android/eglplatform.pas
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk
index a53abca05f..41f5fd1ef7 100644
--- a/lcl/interfaces/lcl.lpk
+++ b/lcl/interfaces/lcl.lpk
@@ -114,7 +114,7 @@ end;"/>
     <License Value="modified LGPL-2
 "/>
     <Version Major="1" Release="1"/>
-    <Files Count="392">
+    <Files Count="391">
       <Item1>
         <Filename Value="carbon/agl.pp"/>
         <AddToUsesPkgSection Value="False"/>
@@ -1820,127 +1820,122 @@ end;"/>
         <UnitName Value="egl"/>
       </Item366>
       <Item367>
-        <Filename Value="customdrawn/android/eglplatform.pas"/>
-        <AddToUsesPkgSection Value="False"/>
-        <UnitName Value="eglplatform"/>
-      </Item367>
-      <Item368>
         <Filename Value="customdrawn/android/gles.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="gles"/>
-      </Item368>
-      <Item369>
+      </Item367>
+      <Item368>
         <Filename Value="customdrawn/android/input.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="input"/>
-      </Item369>
-      <Item370>
+      </Item368>
+      <Item369>
         <Filename Value="customdrawn/android/jni.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="jni"/>
-      </Item370>
-      <Item371>
+      </Item369>
+      <Item370>
         <Filename Value="customdrawn/android/keycodes.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="keycodes"/>
-      </Item371>
-      <Item372>
+      </Item370>
+      <Item371>
         <Filename Value="customdrawn/android/log.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="log"/>
-      </Item372>
-      <Item373>
+      </Item371>
+      <Item372>
         <Filename Value="customdrawn/android/looper.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="looper"/>
-      </Item373>
-      <Item374>
+      </Item372>
+      <Item373>
         <Filename Value="customdrawn/android/native_activity.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="native_activity"/>
-      </Item374>
-      <Item375>
+      </Item373>
+      <Item374>
         <Filename Value="customdrawn/android/native_window.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="native_window"/>
-      </Item375>
-      <Item376>
+      </Item374>
+      <Item375>
         <Filename Value="customdrawn/android/rect.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="rect"/>
-      </Item376>
-      <Item377>
+      </Item375>
+      <Item376>
         <Filename Value="customdrawn/customdrawnwsarrow.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="CustomDrawnWSArrow"/>
-      </Item377>
-      <Item378>
+      </Item376>
+      <Item377>
         <Filename Value="customdrawn/android/bitmap.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="bitmap"/>
-      </Item378>
-      <Item379>
+      </Item377>
+      <Item378>
         <Filename Value="customdrawn/customdrawnwsstdctrls.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="CustomDrawnWSStdCtrls"/>
-      </Item379>
-      <Item380>
+      </Item378>
+      <Item379>
         <Filename Value="customdrawn/customdrawnwscomctrls.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="CustomDrawnWSComCtrls"/>
-      </Item380>
-      <Item381>
+      </Item379>
+      <Item380>
         <Filename Value="customdrawn/customdrawnwsextctrls.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="CustomDrawnWSExtCtrls"/>
-      </Item381>
-      <Item382>
+      </Item380>
+      <Item381>
         <Filename Value="customdrawn/customdrawnprivate.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="customdrawnprivate"/>
+      </Item381>
+      <Item382>
+        <Filename Value="customdrawn/customdrawnlclintf_android.inc"/>
+        <Type Value="Include"/>
       </Item382>
       <Item383>
-        <Filename Value="customdrawn/customdrawnlclintf_android.inc"/>
+        <Filename Value="customdrawn/customdrawnlclintf_cocoa.inc"/>
         <Type Value="Include"/>
       </Item383>
       <Item384>
-        <Filename Value="customdrawn/customdrawnlclintf_cocoa.inc"/>
+        <Filename Value="customdrawn/customdrawnlclintf_win.inc"/>
         <Type Value="Include"/>
       </Item384>
       <Item385>
-        <Filename Value="customdrawn/customdrawnlclintf_win.inc"/>
+        <Filename Value="customdrawn/customdrawnlclintf_x11.inc"/>
         <Type Value="Include"/>
       </Item385>
       <Item386>
-        <Filename Value="customdrawn/customdrawnlclintf_x11.inc"/>
+        <Filename Value="customdrawn/customdrawntrayicon_android.inc"/>
         <Type Value="Include"/>
       </Item386>
       <Item387>
-        <Filename Value="customdrawn/customdrawntrayicon_android.inc"/>
+        <Filename Value="customdrawn/customdrawntrayicon_cocoa.inc"/>
         <Type Value="Include"/>
       </Item387>
       <Item388>
-        <Filename Value="customdrawn/customdrawntrayicon_cocoa.inc"/>
+        <Filename Value="customdrawn/customdrawntrayicon_win.inc"/>
         <Type Value="Include"/>
       </Item388>
       <Item389>
-        <Filename Value="customdrawn/customdrawntrayicon_win.inc"/>
+        <Filename Value="customdrawn/customdrawntrayicon_x11.inc"/>
         <Type Value="Include"/>
       </Item389>
       <Item390>
-        <Filename Value="customdrawn/customdrawntrayicon_x11.inc"/>
-        <Type Value="Include"/>
-      </Item390>
-      <Item391>
         <Filename Value="cocoa/cocoacaret.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="CocoaCaret"/>
-      </Item391>
-      <Item392>
+      </Item390>
+      <Item391>
         <Filename Value="customdrawn/customdrawnwslazdeviceapis.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="CustomDrawnWSLazDeviceAPIS"/>
-      </Item392>
+      </Item391>
     </Files>
     <LazDoc Paths="../../docs/xml/lcl"/>
     <i18n>