diff --git a/components/lazmapviewer/lazmapviewer_all.lpg b/components/lazmapviewer/lazmapviewer_all.lpg
index f4737cea2..17970021d 100644
--- a/components/lazmapviewer/lazmapviewer_all.lpg
+++ b/components/lazmapviewer/lazmapviewer_all.lpg
@@ -51,6 +51,11 @@
           <Mode Name="Default"/>
         </BuildModes>
       </Target>
+      <Target FileName="examples\plugin_demos\areaselection_demo\areaselection_demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
       <Target FileName="examples\plugin_demos\dragmarker_demo\dragmarker_demo.lpi">
         <BuildModes>
           <Mode Name="Default"/>
@@ -78,6 +83,21 @@
           <Mode Name="Default"/>
         </BuildModes>
       </Target>
+      <Target FileName="examples\plugin_demos\markerclick_demo\MarkerClick_Demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="examples\plugin_demos\markereditor_demo\MarkerEditor_Demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
+      <Target FileName="examples\plugin_demos\markerhint_demo\MarkerHint_Demo.lpi">
+        <BuildModes>
+          <Mode Name="Default"/>
+        </BuildModes>
+      </Target>
       <Target FileName="examples\plugin_demos\mousepaintorder_demo\MousePaintOrder_Demo.lpi">
         <BuildModes>
           <Mode Name="Default"/>
diff --git a/components/lazmapviewer/lazmapviewerpkg.lpk b/components/lazmapviewer/lazmapviewerpkg.lpk
index 9598fd090..c0a8d270a 100644
--- a/components/lazmapviewer/lazmapviewerpkg.lpk
+++ b/components/lazmapviewer/lazmapviewerpkg.lpk
@@ -8,7 +8,7 @@
       <Version Value="11"/>
       <SearchPaths>
         <IncludeFiles Value="source"/>
-        <OtherUnitFiles Value="source;source/addons/plugins;source/addons/plugins/spreadmarkers;source/addons/plugins/grids;source/addons/plugins/scale;source/addons/plugins/greatcircle;source/addons/plugins/areaselection;source/addons/plugins/markers"/>
+        <OtherUnitFiles Value="source;source/addons/plugins;source/addons/plugins/grids;source/addons/plugins/scale;source/addons/plugins/greatcircle;source/addons/plugins/areaselection;source/addons/plugins/markers"/>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Other>
@@ -138,36 +138,37 @@ FPC 3.2.0 or newer required."/>
         <UnitName Value="mvPlugins"/>
       </Item28>
       <Item29>
-        <Filename Value="source/addons/plugins/spreadmarkers/mvspreadmarker_plugin.pas"/>
-        <UnitName Value="mvspreadmarker_plugin"/>
-      </Item29>
-      <Item30>
-        <Filename Value="source/addons/plugins/spreadmarkers/uinactivityalarmtimer.pas"/>
-        <UnitName Value="uInactivityAlarmTimer"/>
-      </Item30>
-      <Item31>
         <Filename Value="source/addons/plugins/grids/mvmapgridplugin.pas"/>
         <UnitName Value="mvMapGridPlugin"/>
-      </Item31>
-      <Item32>
+      </Item29>
+      <Item30>
         <Filename Value="source/addons/plugins/scale/mvmapscaleplugin.pas"/>
         <UnitName Value="mvMapScalePlugin"/>
-      </Item32>
-      <Item33>
+      </Item30>
+      <Item31>
         <Filename Value="source/mvengine_mapreg.inc"/>
         <Type Value="Include"/>
-      </Item33>
-      <Item34>
+      </Item31>
+      <Item32>
         <Filename Value="source/addons/plugins/greatcircle/mvgreatcirclepainterplugin.pas"/>
         <UnitName Value="mvGreatCirclePainterPlugin"/>
-      </Item34>
-      <Item35>
+      </Item32>
+      <Item33>
         <Filename Value="source/addons/plugins/areaselection/mvareaselectionplugin.pas"/>
         <UnitName Value="mvAreaSelectionPlugin"/>
-      </Item35>
-      <Item36>
+      </Item33>
+      <Item34>
         <Filename Value="source/addons/plugins/markers/mvmarkerplugins.pas"/>
         <UnitName Value="mvMarkerPlugins"/>
+      </Item34>
+      <Item35>
+        <Filename Value="source/addons/plugins/markers/uinactivityalarmtimer.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+        <UnitName Value="uInactivityAlarmTimer"/>
+      </Item35>
+      <Item36>
+        <Filename Value="source/addons/plugins/markers/mvspreadmarker_plugin.pas"/>
+        <UnitName Value="mvspreadmarker_plugin"/>
       </Item36>
     </Files>
     <CompatibilityMode Value="True"/>
diff --git a/components/lazmapviewer/lazmapviewerpkg.pas b/components/lazmapviewer/lazmapviewerpkg.pas
index 0fe68098e..723b3fbdf 100644
--- a/components/lazmapviewer/lazmapviewerpkg.pas
+++ b/components/lazmapviewer/lazmapviewerpkg.pas
@@ -14,9 +14,9 @@ uses
   mvDLEWin, mvMapViewerPropEdits, mvLayersPropEditForm, mvGeoMath, 
   mvMapViewerPathEditForm, mvMapViewerPathEditDsgForm, mvDLECache, 
   mvPluginEditors, mvClassRegistration, mvPluginCommon, mvPlugins, 
-  mvspreadmarker_plugin, uInactivityAlarmTimer, mvMapGridPlugin, 
-  mvMapScalePlugin, mvGreatCirclePainterPlugin, mvAreaSelectionPlugin, 
-  mvMarkerPlugins, LazarusPackageIntf;
+  mvMapGridPlugin, mvMapScalePlugin, mvGreatCirclePainterPlugin, 
+  mvAreaSelectionPlugin, mvMarkerPlugins, mvspreadmarker_plugin, 
+  LazarusPackageIntf;
 
 implementation