diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
index 8bbaaa3d..24af62d7 100644
--- a/umap/static/umap/js/umap.controls.js
+++ b/umap/static/umap/js/umap.controls.js
@@ -1003,8 +1003,7 @@ L.U.ContextMenu = L.Map.ContextMenu.extend({
 
 });
 
-L.U.IframeExporter = L.Class.extend({
-    includes: [L.Mixin.Events],
+L.U.IframeExporter = L.Evented.extend({
 
     options: {
         includeFullScreenLink: true,
diff --git a/umap/static/umap/js/umap.features.js b/umap/static/umap/js/umap.features.js
index 2d234af5..ee05d069 100644
--- a/umap/static/umap/js/umap.features.js
+++ b/umap/static/umap/js/umap.features.js
@@ -463,7 +463,7 @@ L.U.FeatureMixin = {
 
 L.U.Marker = L.Marker.extend({
     parentClass: L.Marker,
-    includes: [L.U.FeatureMixin, L.Mixin.Events],
+    includes: [L.U.FeatureMixin],
 
     preInit: function () {
         this.setIcon(this.getIcon());
@@ -822,7 +822,7 @@ L.U.PathMixin = {
 
 L.U.Polyline = L.Polyline.extend({
     parentClass: L.Polyline,
-    includes: [L.U.FeatureMixin, L.U.PathMixin, L.Mixin.Events],
+    includes: [L.U.FeatureMixin, L.U.PathMixin],
 
     staticOptions: {
         stroke: true,
@@ -959,7 +959,7 @@ L.U.Polyline = L.Polyline.extend({
 
 L.U.Polygon = L.Polygon.extend({
     parentClass: L.Polygon,
-    includes: [L.U.FeatureMixin, L.U.PathMixin, L.Mixin.Events],
+    includes: [L.U.FeatureMixin, L.U.PathMixin],
 
     isSameClass: function (other) {
         return other instanceof L.U.Polygon;
diff --git a/umap/static/umap/js/umap.layer.js b/umap/static/umap/js/umap.layer.js
index 0b82233c..c59bff04 100644
--- a/umap/static/umap/js/umap.layer.js
+++ b/umap/static/umap/js/umap.layer.js
@@ -146,9 +146,7 @@ L.U.Layer.Heat = L.HeatLayer.extend({
 
 });
 
-L.U.DataLayer = L.Class.extend({
-
-    includes: [L.Mixin.Events],
+L.U.DataLayer = L.Evented.extend({
 
     options: {
         displayOnLoad: true,