diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi
index 46a87bc5..63dd1055 100644
--- a/lazproj/coedit.lpi
+++ b/lazproj/coedit.lpi
@@ -9,6 +9,9 @@
       <Title Value="coedit"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <XPManifest>
+        <DpiAware Value="True"/>
+      </XPManifest>
       <Icon Value="0"/>
     </General>
     <i18n>
@@ -67,7 +70,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="..\src;$(LazarusDir)\components\anchordocking"/>
+            <OtherUnitFiles Value="..\src"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -132,7 +135,7 @@
         <PackageName Value="LCL"/>
       </Item6>
     </RequiredPackages>
-    <Units Count="38">
+    <Units Count="36">
       <Unit0>
         <Filename Value="coedit.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -152,7 +155,6 @@
       <Unit3>
         <Filename Value="..\src\ce_d2syn.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_d2syn"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\src\ce_dcd.pas"/>
@@ -170,7 +172,6 @@
       <Unit7>
         <Filename Value="..\src\ce_dmdwrap.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_dmdwrap"/>
       </Unit7>
       <Unit8>
         <Filename Value="..\src\ce_dockoptions.pas"/>
@@ -182,11 +183,11 @@
         <ComponentName Value="CEEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_editor"/>
       </Unit9>
       <Unit10>
         <Filename Value="..\src\ce_editoroptions.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="ce_editoroptions"/>
       </Unit10>
       <Unit11>
         <Filename Value="..\src\ce_inspectors.pas"/>
@@ -195,12 +196,10 @@
       <Unit12>
         <Filename Value="..\src\ce_interfaces.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_interfaces"/>
       </Unit12>
       <Unit13>
         <Filename Value="..\src\ce_libman.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_libman"/>
       </Unit13>
       <Unit14>
         <Filename Value="..\src\ce_libmaneditor.pas"/>
@@ -208,7 +207,6 @@
         <ComponentName Value="CELibManEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_libmaneditor"/>
       </Unit14>
       <Unit15>
         <Filename Value="..\src\ce_main.pas"/>
@@ -216,7 +214,6 @@
         <ComponentName Value="CEMainForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_main"/>
       </Unit15>
       <Unit16>
         <Filename Value="..\src\ce_messages.pas"/>
@@ -224,7 +221,6 @@
         <ComponentName Value="CEMessagesWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_messages"/>
       </Unit16>
       <Unit17>
         <Filename Value="..\src\ce_miniexplorer.pas"/>
@@ -242,112 +238,97 @@
         <IsPartOfProject Value="True"/>
       </Unit19>
       <Unit20>
-        <Filename Value="..\src\ce_options.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit20>
-      <Unit21>
         <Filename Value="..\src\ce_optionseditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEOptionEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_optionseditor"/>
-      </Unit21>
-      <Unit22>
+      </Unit20>
+      <Unit21>
         <Filename Value="..\src\ce_procinput.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEProcInputWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit22>
-      <Unit23>
+      </Unit21>
+      <Unit22>
         <Filename Value="..\src\ce_projconf.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEProjectConfigurationWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit23>
-      <Unit24>
+      </Unit22>
+      <Unit23>
         <Filename Value="..\src\ce_project.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit24>
-      <Unit25>
+      </Unit23>
+      <Unit24>
         <Filename Value="..\src\ce_projinspect.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEProjectInspectWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit25>
-      <Unit26>
+      </Unit24>
+      <Unit25>
         <Filename Value="..\src\ce_search.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CESearchWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit26>
-      <Unit27>
+      </Unit25>
+      <Unit26>
         <Filename Value="..\src\ce_shortcutseditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEShortcutEditor"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-      </Unit27>
-      <Unit28>
+      </Unit26>
+      <Unit27>
         <Filename Value="..\src\ce_staticmacro.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit28>
-      <Unit29>
+      </Unit27>
+      <Unit28>
         <Filename Value="..\src\ce_symlist.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CESymbolListWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_symlist"/>
-      </Unit29>
-      <Unit30>
+      </Unit28>
+      <Unit29>
         <Filename Value="..\src\ce_symstring.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit30>
-      <Unit31>
+      </Unit29>
+      <Unit30>
         <Filename Value="..\src\ce_synmemo.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_synmemo"/>
-      </Unit31>
-      <Unit32>
+      </Unit30>
+      <Unit31>
         <Filename Value="..\src\ce_todolist.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CETodoListWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="ce_todolist"/>
-      </Unit32>
-      <Unit33>
+      </Unit31>
+      <Unit32>
         <Filename Value="..\src\ce_tools.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit33>
-      <Unit34>
+      </Unit32>
+      <Unit33>
         <Filename Value="..\src\ce_toolseditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CEToolsEditorWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-      </Unit34>
-      <Unit35>
+      </Unit33>
+      <Unit34>
         <Filename Value="..\src\ce_txtsyn.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_txtsyn"/>
-      </Unit35>
-      <Unit36>
-        <Filename Value="..\src\ce_widget.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="CEWidget"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-      </Unit36>
-      <Unit37>
+      </Unit34>
+      <Unit35>
         <Filename Value="..\src\ce_writablecomponent.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit37>
+      </Unit35>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/lazproj/coedit.lpr b/lazproj/coedit.lpr
index ba88f634..ab17d654 100644
--- a/lazproj/coedit.lpr
+++ b/lazproj/coedit.lpr
@@ -6,9 +6,9 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Interfaces, Forms, lazcontrols, runtimetypeinfocontrols, ce_observer,
-  ce_libman, ce_tools, ce_dcd, ce_main, ce_writableComponent,
-  ce_symstring, ce_staticmacro, ce_inspectors, LResources, ce_editoroptions,
+  Interfaces, Forms, lazcontrols, runtimetypeinfocontrols, LResources,
+  ce_observer, ce_libman, ce_tools, ce_dcd, ce_main, ce_writableComponent,
+  ce_symstring, ce_staticmacro, ce_inspectors, ce_editoroptions,
   ce_dockoptions, ce_shortcutseditor, ce_mru;
 
 {$R *.res}