diff --git a/include/tool/picker_tool.h b/include/tool/picker_tool.h
index 70032748b4..262e4ea19c 100644
--- a/include/tool/picker_tool.h
+++ b/include/tool/picker_tool.h
@@ -57,6 +57,8 @@ public:
         reset();
     }
 
+    virtual ~PICKER_TOOL_BASE() = default;
+
     inline void SetCursor( KICURSOR aCursor ) { m_cursor = aCursor; }
 
     inline void SetSnapping( bool aSnap ) { m_snap = aSnap; }
diff --git a/pagelayout_editor/pl_editor_layout.h b/pagelayout_editor/pl_editor_layout.h
index 6c9b1661e7..0efabccc81 100644
--- a/pagelayout_editor/pl_editor_layout.h
+++ b/pagelayout_editor/pl_editor_layout.h
@@ -84,7 +84,7 @@ public:
 
     void SetBoundingBox( const EDA_RECT& aBox ) { m_boundingBox = aBox; }
 
-    virtual void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList );
+    void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList );
 
 #if defined(DEBUG)
     void    Show( int nestLevel, std::ostream& os ) const;
diff --git a/pcbnew/plugins/common/plugin_common_layer_mapping.h b/pcbnew/plugins/common/plugin_common_layer_mapping.h
index 0de6fa70e3..255751e492 100644
--- a/pcbnew/plugins/common/plugin_common_layer_mapping.h
+++ b/pcbnew/plugins/common/plugin_common_layer_mapping.h
@@ -23,6 +23,7 @@
 #define PLUGIN_COMMON_LAYER_MAPPING_H
 
 #include <functional>
+#include <map>
 
 #include <io_mgr.h>
 #include <layers_id_colors_and_visibility.h> // PCB_LAYER_ID
@@ -73,8 +74,10 @@ public:
     {
         m_layer_mapping_handler = aLayerMappingHandler;
     }
+
+    virtual ~LAYER_REMAPPABLE_PLUGIN() = default;
 protected:
     LAYER_MAPPING_HANDLER m_layer_mapping_handler; ///< Callback to get layer mapping
 };
 
-#endif // PLUGIN_COMMON_LAYER_MAPPING_H
\ No newline at end of file
+#endif // PLUGIN_COMMON_LAYER_MAPPING_H