diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
index b0f9332a89..ddd88a75a5 100644
--- a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
+++ b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
@@ -32,6 +32,7 @@
 #include <common_ogl/cogl_att_list.h>
 #include <cstdlib>
 #include <limits.h>
+#include <bitmaps.h>
 
 #include <wx/valnum.h>
 #include <wx/tglbtn.h>
diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
index 212f951bdf..aeffc580c6 100644
--- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp
+++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
@@ -40,6 +40,7 @@
 #include "status_text_reporter.h"
 #include <gl_context_mgr.h>
 #include <profile.h>        // To use GetRunningMicroSecs or an other profiling utility
+#include <bitmaps.h>
 
 /**
  *  Trace mask used to enable or disable the trace output of this class.
diff --git a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp
index 257795748a..1feadf004d 100644
--- a/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp
+++ b/3d-viewer/3d_viewer/dialogs/dialog_3D_view_option.cpp
@@ -25,6 +25,7 @@
 #include "dialog_3D_view_option_base.h"
 #include <3d_viewer/eda_3d_viewer.h>
 #include <3d_canvas/cinfo3d_visu.h>
+#include <bitmaps.h>
 
 class DIALOG_3D_VIEW_OPTIONS : public DIALOG_3D_VIEW_OPTIONS_BASE
 {
diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
index c3b42f471f..e1d85fbf3b 100644
--- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp
+++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
@@ -37,6 +37,7 @@
 #include  "../common_ogl/cogl_att_list.h"
 #include <hotkeys_basic.h>
 #include <wx/toolbar.h>
+#include <bitmaps.h>
 
 /**
  *  Trace mask used to enable or disable the trace output of this class.
diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp
index f4c6ffeda9..af25c93c2c 100644
--- a/cvpcb/cvpcb_mainframe.cpp
+++ b/cvpcb/cvpcb_mainframe.cpp
@@ -41,6 +41,7 @@
 #include <wildcards_and_files_ext.h>
 #include <fp_lib_table.h>
 #include <netlist_reader.h>
+#include <bitmaps.h>
 
 #include <cvpcb_mainframe.h>
 #include <cvpcb.h>
diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index 1cc80728a4..a492b64080 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -34,6 +34,7 @@
 #include <schframe.h>
 #include <menus_helpers.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <eeschema_id.h>
 #include <general.h>
diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp
index 5ea48defc7..d4b92d37f2 100644
--- a/eeschema/dialogs/dialog_annotate.cpp
+++ b/eeschema/dialogs/dialog_annotate.cpp
@@ -31,6 +31,7 @@
 #include <fctsys.h>
 #include <schframe.h>
 #include <class_drawpanel.h>
+#include <bitmaps.h>
 
 #include <invoke_sch_dialog.h>
 #include <dialog_annotate_base.h>
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index dc1f9c068c..bf7770f6ca 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -38,6 +38,7 @@
 #include <invoke_sch_dialog.h>
 #include <project.h>
 #include <kiface_i.h>
+#include <bitmaps.h>
 
 #include <netlist.h>
 #include <class_netlist_object.h>
diff --git a/eeschema/dialogs/dialog_lib_edit_pin.cpp b/eeschema/dialogs/dialog_lib_edit_pin.cpp
index 3da3c90efe..d408045e71 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin.cpp
@@ -26,6 +26,7 @@
 #include <macros.h>
 #include <gr_basic.h>
 #include <base_units.h>
+#include <bitmaps.h>
 
 #include <libeditframe.h>
 #include <class_libentry.h>
diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp
index 2d9a84c85e..bc871c420e 100644
--- a/eeschema/hierarch.cpp
+++ b/eeschema/hierarch.cpp
@@ -32,6 +32,7 @@
 #include <confirm.h>
 #include <id.h>
 #include <schframe.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <sch_sheet.h>
diff --git a/eeschema/lib_arc.cpp b/eeschema/lib_arc.cpp
index 68f52ef44e..70ece548af 100644
--- a/eeschema/lib_arc.cpp
+++ b/eeschema/lib_arc.cpp
@@ -36,6 +36,7 @@
 #include <richio.h>
 #include <base_units.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <lib_arc.h>
@@ -580,6 +581,12 @@ wxString LIB_ARC::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF LIB_ARC::GetMenuImage() const
+{
+    return add_arc_xpm;
+}
+
+
 void LIB_ARC::BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aPosition )
 {
     wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0,
diff --git a/eeschema/lib_arc.h b/eeschema/lib_arc.h
index a59fb03f93..e67accbd63 100644
--- a/eeschema/lib_arc.h
+++ b/eeschema/lib_arc.h
@@ -155,7 +155,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_arc_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp
index bcf6a4045c..59371cf5bb 100644
--- a/eeschema/lib_circle.cpp
+++ b/eeschema/lib_circle.cpp
@@ -37,6 +37,7 @@
 #include <richio.h>
 #include <base_units.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <lib_circle.h>
@@ -297,6 +298,12 @@ wxString LIB_CIRCLE::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF LIB_CIRCLE::GetMenuImage() const
+{
+    return add_circle_xpm;
+}
+
+
 void LIB_CIRCLE::BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aPosition )
 {
     wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0,
diff --git a/eeschema/lib_circle.h b/eeschema/lib_circle.h
index 0dab47e3ee..7f14f563f7 100644
--- a/eeschema/lib_circle.h
+++ b/eeschema/lib_circle.h
@@ -104,7 +104,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_circle_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index a443203efe..676fce090f 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -38,6 +38,7 @@
 #include <trigo.h>
 #include <base_units.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <class_libentry.h>
@@ -800,3 +801,9 @@ void LIB_FIELD::GetMsgPanelInfo( MSG_PANEL_ITEMS& aList )
     // Display field text:
     aList.push_back( MSG_PANEL_ITEM( _( "Value" ), GetShownText(), BROWN ) );
 }
+
+
+BITMAP_DEF LIB_FIELD::GetMenuImage() const
+{
+    return move_field_xpm;
+}
diff --git a/eeschema/lib_field.h b/eeschema/lib_field.h
index 0715e984ce..5a7ba8f33b 100644
--- a/eeschema/lib_field.h
+++ b/eeschema/lib_field.h
@@ -237,7 +237,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  move_field_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp
index b568956570..3392e72278 100644
--- a/eeschema/lib_polyline.cpp
+++ b/eeschema/lib_polyline.cpp
@@ -36,6 +36,7 @@
 #include <richio.h>
 #include <base_units.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <lib_polyline.h>
@@ -420,6 +421,12 @@ wxString LIB_POLYLINE::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF LIB_POLYLINE::GetMenuImage() const
+{
+    return add_polygon_xpm;
+}
+
+
 void LIB_POLYLINE::BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aPosition )
 {
     wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0,
diff --git a/eeschema/lib_polyline.h b/eeschema/lib_polyline.h
index 5b137a0592..96f70c6644 100644
--- a/eeschema/lib_polyline.h
+++ b/eeschema/lib_polyline.h
@@ -113,7 +113,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_polygon_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp
index 74a19876d6..7f17d05de3 100644
--- a/eeschema/lib_rectangle.cpp
+++ b/eeschema/lib_rectangle.cpp
@@ -36,6 +36,7 @@
 #include <richio.h>
 #include <base_units.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <lib_rectangle.h>
@@ -337,6 +338,12 @@ wxString LIB_RECTANGLE::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF LIB_RECTANGLE::GetMenuImage() const
+{
+    return add_rectangle_xpm;
+}
+
+
 void LIB_RECTANGLE::BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aPosition )
 {
     wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0,
diff --git a/eeschema/lib_rectangle.h b/eeschema/lib_rectangle.h
index 8e549d25c7..b7ecd2b155 100644
--- a/eeschema/lib_rectangle.h
+++ b/eeschema/lib_rectangle.h
@@ -108,7 +108,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_rectangle_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index a60c2bbce8..d2e8b00f93 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -36,6 +36,7 @@
 #include <richio.h>
 #include <base_units.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <lib_draw_item.h>
 #include <general.h>
@@ -509,6 +510,12 @@ wxString LIB_TEXT::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF LIB_TEXT::GetMenuImage() const
+{
+    return add_text_xpm;
+}
+
+
 void LIB_TEXT::BeginEdit( STATUS_FLAGS aEditMode, const wxPoint aPosition )
 {
     wxCHECK_RET( ( aEditMode & ( IS_NEW | IS_MOVED ) ) != 0,
diff --git a/eeschema/lib_text.h b/eeschema/lib_text.h
index dd389ea16f..f48bc08e94 100644
--- a/eeschema/lib_text.h
+++ b/eeschema/lib_text.h
@@ -129,7 +129,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_text_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/eeschema/sch_bitmap.cpp b/eeschema/sch_bitmap.cpp
index 44e0a52c01..fb71b9ddef 100644
--- a/eeschema/sch_bitmap.cpp
+++ b/eeschema/sch_bitmap.cpp
@@ -30,6 +30,8 @@
 #include <class_drawpanel.h>
 #include <trigo.h>
 #include <macros.h>
+#include <bitmaps.h>
+
 #include <sch_bitmap.h>
 
 #include <wx/mstream.h>
@@ -309,3 +311,9 @@ void SCH_BITMAP::Plot( PLOTTER* aPlotter )
 {
     m_image->PlotImage( aPlotter, m_pos, GetLayerColor( GetLayer() ), GetPenSize() );
 }
+
+
+BITMAP_DEF SCH_BITMAP::GetMenuImage() const
+{
+    return image_xpm;
+}
diff --git a/eeschema/sch_bitmap.h b/eeschema/sch_bitmap.h
index e92b9dc0a5..542e03f0eb 100644
--- a/eeschema/sch_bitmap.h
+++ b/eeschema/sch_bitmap.h
@@ -130,7 +130,7 @@ public:
 
     wxString GetSelectMenuText() const override { return wxString( _( "Image" ) ); }
 
-    BITMAP_DEF GetMenuImage() const override { return image_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     wxPoint GetPosition() const override { return m_pos; }
 
diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index 07749cced8..5acc9f5df7 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -35,6 +35,7 @@
 #include <common.h>
 #include <richio.h>
 #include <plot_common.h>
+#include <bitmaps.h>
 
 #include <eeschema_config.h>
 #include <general.h>
@@ -340,6 +341,11 @@ wxString SCH_BUS_BUS_ENTRY::GetSelectMenuText() const
     return wxString( _( "Bus to Bus Entry" ) );
 }
 
+BITMAP_DEF SCH_BUS_ENTRY_BASE::GetMenuImage() const
+{
+    return add_entry_xpm;
+}
+
 
 bool SCH_BUS_ENTRY_BASE::HitTest( const wxPoint& aPosition, int aAccuracy ) const
 {
diff --git a/eeschema/sch_bus_entry.h b/eeschema/sch_bus_entry.h
index 678762c78c..c638443bcf 100644
--- a/eeschema/sch_bus_entry.h
+++ b/eeschema/sch_bus_entry.h
@@ -113,7 +113,7 @@ public:
 
     void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_entry_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     wxPoint GetPosition() const override { return m_pos; }
 
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 3a4a55ba80..9a91450cde 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -36,6 +36,7 @@
 #include <schframe.h>
 #include <plot_common.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <class_library.h>
@@ -1576,6 +1577,12 @@ void SCH_COMPONENT::GetMsgPanelInfo( MSG_PANEL_ITEMS& aList )
 }
 
 
+BITMAP_DEF SCH_COMPONENT::GetMenuImage() const
+{
+    return add_component_xpm;
+}
+
+
 void SCH_COMPONENT::MirrorY( int aYaxis_position )
 {
     int dx = m_Pos.x;
diff --git a/eeschema/sch_component.h b/eeschema/sch_component.h
index 9d94bbac39..cbec577df5 100644
--- a/eeschema/sch_component.h
+++ b/eeschema/sch_component.h
@@ -530,7 +530,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_component_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems,
                          SCH_SHEET_PATH*      aSheetPath ) override;
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index 32d2fc4cea..9cfe13f4a9 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -43,6 +43,7 @@
 #include <macros.h>
 #include <schframe.h>
 #include <plot_common.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <class_library.h>
diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp
index a0b7efc542..4bee5f0ff5 100644
--- a/eeschema/sch_junction.cpp
+++ b/eeschema/sch_junction.cpp
@@ -34,6 +34,7 @@
 #include <common.h>
 #include <richio.h>
 #include <plot_common.h>
+#include <bitmaps.h>
 
 #include <sch_junction.h>
 #include <class_netlist_object.h>
@@ -233,3 +234,8 @@ void SCH_JUNCTION::Plot( PLOTTER* aPlotter )
     aPlotter->SetColor( GetLayerColor( GetLayer() ) );
     aPlotter->Circle( m_pos, GetSymbolSize(), FILLED_SHAPE );
 }
+
+BITMAP_DEF SCH_JUNCTION::GetMenuImage() const
+{
+    return add_junction_xpm;
+}
diff --git a/eeschema/sch_junction.h b/eeschema/sch_junction.h
index 6fbb1f8e2d..9216a929fd 100644
--- a/eeschema/sch_junction.h
+++ b/eeschema/sch_junction.h
@@ -85,7 +85,7 @@ public:
 
     wxString GetSelectMenuText() const override { return wxString( _( "Junction" ) ); }
 
-    BITMAP_DEF GetMenuImage() const override { return  add_junction_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
 
diff --git a/eeschema/sch_marker.cpp b/eeschema/sch_marker.cpp
index 334d277d2d..d42f1f504e 100644
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@@ -32,6 +32,7 @@
 #include <class_drawpanel.h>
 #include <trigo.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <sch_marker.h>
@@ -144,6 +145,12 @@ void SCH_MARKER::GetMsgPanelInfo( MSG_PANEL_ITEMS& aList )
 }
 
 
+BITMAP_DEF SCH_MARKER::GetMenuImage() const
+{
+    return erc_xpm;
+}
+
+
 void SCH_MARKER::Rotate( wxPoint aPosition )
 {
     RotatePoint( &m_Pos, aPosition, 900 );
diff --git a/eeschema/sch_marker.h b/eeschema/sch_marker.h
index 08da741902..15e58beffd 100644
--- a/eeschema/sch_marker.h
+++ b/eeschema/sch_marker.h
@@ -99,7 +99,7 @@ public:
 
     wxString GetSelectMenuText() const override { return wxString( _( "ERC Marker" ) ); }
 
-    BITMAP_DEF GetMenuImage() const override { return  erc_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     wxPoint GetPosition() const override { return m_Pos; }
 
diff --git a/eeschema/sch_no_connect.cpp b/eeschema/sch_no_connect.cpp
index dd1e978123..623edf4578 100644
--- a/eeschema/sch_no_connect.cpp
+++ b/eeschema/sch_no_connect.cpp
@@ -33,6 +33,7 @@
 #include <class_drawpanel.h>
 #include <common.h>
 #include <plot_common.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <sch_no_connect.h>
@@ -250,3 +251,9 @@ void SCH_NO_CONNECT::Plot( PLOTTER* aPlotter )
     aPlotter->FinishTo( wxPoint( pX - delta, pY + delta ) );
 }
 
+
+BITMAP_DEF SCH_NO_CONNECT::GetMenuImage() const
+{
+    return noconn_xpm;
+}
+
diff --git a/eeschema/sch_no_connect.h b/eeschema/sch_no_connect.h
index ca83720b0a..5360f073c7 100644
--- a/eeschema/sch_no_connect.h
+++ b/eeschema/sch_no_connect.h
@@ -87,7 +87,7 @@ public:
 
     wxString GetSelectMenuText() const override { return wxString( _( "No Connect" ) ); }
 
-    BITMAP_DEF GetMenuImage() const override { return noconn_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
 
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index dc3ece8c9e..0ccedbfcd7 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -1077,6 +1077,12 @@ wxString SCH_SHEET::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF SCH_SHEET::GetMenuImage() const
+{
+    return add_hierarchical_subsheet_xpm;
+}
+
+
 bool SCH_SHEET::HitTest( const wxPoint& aPosition, int aAccuracy ) const
 {
     EDA_RECT rect = GetBoundingBox();
diff --git a/eeschema/sch_sheet.h b/eeschema/sch_sheet.h
index ab7159cfd9..454de54d08 100644
--- a/eeschema/sch_sheet.h
+++ b/eeschema/sch_sheet.h
@@ -196,7 +196,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_hierar_pin_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     void SetPosition( const wxPoint& aPosition ) override { ConstrainOnEdge( aPosition ); }
 
@@ -572,7 +572,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return add_hierarchical_subsheet_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems,
                          SCH_SHEET_PATH*      aSheetPath ) override;
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index f29c390371..9dcdfb1b92 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -35,6 +35,7 @@
 #include <trigo.h>
 #include <richio.h>
 #include <schframe.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <sch_sheet.h>
@@ -505,6 +506,11 @@ wxString SCH_SHEET_PIN::GetSelectMenuText() const
     return tmp;
 }
 
+BITMAP_DEF SCH_SHEET_PIN::GetMenuImage() const
+{
+    return add_hierar_pin_xpm;
+}
+
 
 bool SCH_SHEET_PIN::HitTest( const wxPoint& aPoint, int aAccuracy ) const
 {
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 8e572f597c..a9d8982eb8 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -38,6 +38,7 @@
 #include <plot_common.h>
 #include <msgpanel.h>
 #include <gal/stroke_font.h>
+#include <bitmaps.h>
 
 #include <protos.h>
 #include <sch_text.h>
@@ -618,6 +619,12 @@ wxString SCH_TEXT::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF SCH_TEXT::GetMenuImage() const
+{
+    return add_text_xpm;
+}
+
+
 void SCH_TEXT::GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems,
                                SCH_SHEET_PATH*      aSheetPath )
 {
@@ -1010,6 +1017,12 @@ wxString SCH_LABEL::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF SCH_LABEL::GetMenuImage() const
+{
+    return add_line_label_xpm;
+}
+
+
 SCH_GLOBALLABEL::SCH_GLOBALLABEL( const wxPoint& pos, const wxString& text ) :
     SCH_TEXT( pos, text, SCH_GLOBAL_LABEL_T )
 {
@@ -1467,6 +1480,12 @@ wxString SCH_GLOBALLABEL::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF SCH_GLOBALLABEL::GetMenuImage() const
+{
+    return add_glabel_xpm;
+}
+
+
 
 SCH_HIERLABEL::SCH_HIERLABEL( const wxPoint& pos, const wxString& text, KICAD_T aType ) :
     SCH_TEXT( pos, text, aType )
@@ -1817,3 +1836,9 @@ wxString SCH_HIERLABEL::GetSelectMenuText() const
     msg.Printf( _( "Hierarchical Label %s" ), GetChars( ShortenedShownText() ) );
     return msg;
 }
+
+
+BITMAP_DEF SCH_HIERLABEL::GetMenuImage() const
+{
+    return add_hierarchical_label_xpm;
+}
diff --git a/eeschema/sch_text.h b/eeschema/sch_text.h
index 24b1aaa74a..e0da769d15 100644
--- a/eeschema/sch_text.h
+++ b/eeschema/sch_text.h
@@ -192,7 +192,7 @@ public:
 
     virtual wxString GetSelectMenuText() const override;
 
-    virtual BITMAP_DEF GetMenuImage() const override { return  add_text_xpm; }
+    virtual BITMAP_DEF GetMenuImage() const override;
 
     virtual void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems,
                                  SCH_SHEET_PATH*      aSheetPath ) override;
@@ -253,7 +253,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_line_label_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     bool IsReplaceable() const override { return true; }
 
@@ -303,7 +303,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_glabel_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
@@ -353,7 +353,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_hierarchical_label_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp
index acbe4b7778..49977f4d65 100644
--- a/eeschema/tool_lib.cpp
+++ b/eeschema/tool_lib.cpp
@@ -34,6 +34,7 @@
 #include <general.h>
 #include <libeditframe.h>
 #include <dialog_helpers.h>
+#include <bitmaps.h>
 
 #include <help_common_strings.h>
 
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index eccc40ef60..6060e36386 100644
--- a/eeschema/tool_sch.cpp
+++ b/eeschema/tool_sch.cpp
@@ -31,6 +31,7 @@
 #include <class_drawpanel.h>
 #include <schframe.h>
 #include <kiface_i.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <hotkeys.h>
diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index 5c2cc3a0ce..31dac55ede 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -34,6 +34,7 @@
 #include <class_drawpanel.h>
 #include <schframe.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <general.h>
 #include <viewlib_frame.h>
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index c94dd1f938..ff537cff92 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -37,6 +37,7 @@
 #include <colors_selection.h>
 #include <class_gbr_layer_box_selector.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp
index 1913a75e4f..23802f9671 100644
--- a/gerbview/toolbars_gerber.cpp
+++ b/gerbview/toolbars_gerber.cpp
@@ -41,6 +41,7 @@
 #include <class_gbr_layer_box_selector.h>
 #include <class_DCodeSelectionbox.h>
 #include <dialog_helpers.h>
+#include <bitmaps.h>
 
 #include <wx/wupdlock.h>
 
diff --git a/include/base_struct.h b/include/base_struct.h
index 61205b0bd8..bb12ed7689 100644
--- a/include/base_struct.h
+++ b/include/base_struct.h
@@ -35,7 +35,7 @@
 #include <core/typeinfo.h>
 
 #include <colors.h>
-#include <bitmaps.h>
+#include <bitmap_types.h>
 #include <richio.h>
 #include <view/view_item.h>
 #include <class_eda_rect.h>
diff --git a/include/bitmap_types.h b/include/bitmap_types.h
new file mode 100644
index 0000000000..81f5fd36d0
--- /dev/null
+++ b/include/bitmap_types.h
@@ -0,0 +1,72 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2007-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2017 KiCad Developers, see CHANGELOG.TXT for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+
+#ifndef BITMAP_TYPES_H_
+#define BITMAP_TYPES_H_
+
+//FIXME: cannot include only this file in wxWidgets 2.9.3
+// test if it works under stable release
+// #include <wx/bitmap.h>   // only to define wxBitmap
+class wxBitmap;     // only to define wxBitmap
+
+#include <config.h>
+
+
+/// PNG memory record (file in memory).
+struct BITMAP_OPAQUE
+{
+    const unsigned char* png;
+    int         byteCount;
+    const char* name;       // for debug, or future lazy dynamic linking
+};
+
+// declared as single element _array_, so its name assigns to pointer
+#define EXTERN_BITMAP(x) extern const BITMAP_OPAQUE x[1];
+
+
+/// a BITMAP_DEF is really a const pointer to an opaque
+/// structure.  So you should never need to use 'const' with it.
+typedef const BITMAP_OPAQUE *BITMAP_DEF;
+
+
+/**
+ * Function KiBitmap
+ * constructs a wxBitmap from a memory record, held in a
+ * BITMAP_DEF.
+ */
+wxBitmap KiBitmap( BITMAP_DEF aBitmap );
+
+
+/**
+ * Function KiBitmapNew
+ * allocates a wxBitmap on heap from a memory record, held in a
+ * BITMAP_DEF.
+ *
+ * @return wxBitmap* - caller owns it.
+ */
+wxBitmap* KiBitmapNew( BITMAP_DEF aBitmap );
+
+
+#endif  // BITMAP_TYPES_H_
diff --git a/include/bitmaps.h b/include/bitmaps.h
index f33dd3ce3c..8f63a84496 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -26,47 +26,7 @@
 #ifndef BITMAPS_H_
 #define BITMAPS_H_
 
-//FIXME: cannot include only this file in wxWidgets 2.9.3
-// test if it works under stable release
-// #include <wx/bitmap.h>   // only to define wxBitmap
-class wxBitmap;     // only to define wxBitmap
-
-#include <config.h>
-
-
-/// PNG memory record (file in memory).
-struct BITMAP_OPAQUE
-{
-    const unsigned char* png;
-    int         byteCount;
-    const char* name;       // for debug, or future lazy dynamic linking
-};
-
-// declared as single element _array_, so its name assigns to pointer
-#define EXTERN_BITMAP(x) extern const BITMAP_OPAQUE x[1];
-
-
-/// a BITMAP_DEF is really a const pointer to an opaque
-/// structure.  So you should never need to use 'const' with it.
-typedef const BITMAP_OPAQUE *BITMAP_DEF;
-
-
-/**
- * Function KiBitmap
- * constructs a wxBitmap from a memory record, held in a
- * BITMAP_DEF.
- */
-wxBitmap KiBitmap( BITMAP_DEF aBitmap );
-
-
-/**
- * Function KiBitmapNew
- * allocates a wxBitmap on heap from a memory record, held in a
- * BITMAP_DEF.
- *
- * @return wxBitmap* - caller owns it.
- */
-wxBitmap* KiBitmapNew( BITMAP_DEF aBitmap );
+#include <bitmap_types.h>
 
 
 // may eventually generate this file automatically.
diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp
index fdf5ecdf59..8901ff8f52 100644
--- a/kicad/mainframe.cpp
+++ b/kicad/mainframe.cpp
@@ -35,6 +35,7 @@
 #include <kiway.h>
 #include <kiway_player.h>
 #include <wildcards_and_files_ext.h>
+#include <bitmaps.h>
 
 #include "pgm_kicad.h"
 #include "tree_project_frame.h"
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index 58d83b5ce6..0586029aca 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/pagelayout_editor/pl_editor_frame.cpp
@@ -34,6 +34,7 @@
 #include <macros.h>
 #include <base_units.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <pl_editor_frame.h>
 #include <pl_editor_id.h>
diff --git a/pcbnew/class_dimension.cpp b/pcbnew/class_dimension.cpp
index 0efa9faaf3..f2ef40f387 100644
--- a/pcbnew/class_dimension.cpp
+++ b/pcbnew/class_dimension.cpp
@@ -37,6 +37,7 @@
 #include <colors_selection.h>
 #include <kicad_string.h>
 #include <richio.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_pcb_text.h>
@@ -484,6 +485,12 @@ wxString DIMENSION::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF DIMENSION::GetMenuImage() const
+{
+    return add_dimension_xpm;
+}
+
+
 const BOX2I DIMENSION::ViewBBox() const
 {
     BOX2I dimBBox = BOX2I( VECTOR2I( GetBoundingBox().GetPosition() ),
diff --git a/pcbnew/class_dimension.h b/pcbnew/class_dimension.h
index 2ad91ee41f..d6012fef89 100644
--- a/pcbnew/class_dimension.h
+++ b/pcbnew/class_dimension.h
@@ -224,7 +224,7 @@ public:
 
     wxString    GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return add_dimension_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM*   Clone() const override;
 
diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index 50ddf984ab..cb7292db82 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -39,6 +39,7 @@
 #include <colors_selection.h>
 #include <trigo.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <pcbnew.h>
 
@@ -584,6 +585,12 @@ wxString DRAWSEGMENT::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF DRAWSEGMENT::GetMenuImage() const
+{
+    return add_dashed_line_xpm;
+}
+
+
 EDA_ITEM* DRAWSEGMENT::Clone() const
 {
     return new DRAWSEGMENT( *this );
diff --git a/pcbnew/class_drawsegment.h b/pcbnew/class_drawsegment.h
index 989bb891fd..37a856cccd 100644
--- a/pcbnew/class_drawsegment.h
+++ b/pcbnew/class_drawsegment.h
@@ -237,7 +237,7 @@ public:
 
     virtual wxString GetSelectMenuText() const override;
 
-    virtual BITMAP_DEF GetMenuImage() const override { return  add_dashed_line_xpm; }
+    virtual BITMAP_DEF GetMenuImage() const override;
 
     virtual EDA_ITEM* Clone() const override;
 
diff --git a/pcbnew/class_edge_mod.cpp b/pcbnew/class_edge_mod.cpp
index e49f7d7d15..c8b71428a8 100644
--- a/pcbnew/class_edge_mod.cpp
+++ b/pcbnew/class_edge_mod.cpp
@@ -44,6 +44,7 @@
 #include <wxBasePcbFrame.h>
 #include <msgpanel.h>
 #include <base_units.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_module.h>
@@ -258,6 +259,12 @@ wxString EDGE_MODULE::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF EDGE_MODULE::GetMenuImage() const
+{
+    return show_mod_edge_xpm;
+}
+
+
 EDA_ITEM* EDGE_MODULE::Clone() const
 {
     return new EDGE_MODULE( *this );
diff --git a/pcbnew/class_edge_mod.h b/pcbnew/class_edge_mod.h
index d3b9d2089a..571b692403 100644
--- a/pcbnew/class_edge_mod.h
+++ b/pcbnew/class_edge_mod.h
@@ -122,7 +122,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  show_mod_edge_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/pcbnew/class_marker_pcb.cpp b/pcbnew/class_marker_pcb.cpp
index f625d8177f..f80a2ee0b9 100644
--- a/pcbnew/class_marker_pcb.cpp
+++ b/pcbnew/class_marker_pcb.cpp
@@ -34,6 +34,7 @@
 #include <wxstruct.h>
 #include <trigo.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <pcbnew.h>
 #include <class_marker_pcb.h>
@@ -137,6 +138,12 @@ wxString MARKER_PCB::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF MARKER_PCB::GetMenuImage() const
+{
+    return drc_xpm;
+}
+
+
 void MARKER_PCB::ViewGetLayers( int aLayers[], int& aCount ) const
 {
     aCount = 1;
diff --git a/pcbnew/class_marker_pcb.h b/pcbnew/class_marker_pcb.h
index 4c395d9656..bc868f058e 100644
--- a/pcbnew/class_marker_pcb.h
+++ b/pcbnew/class_marker_pcb.h
@@ -109,7 +109,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  drc_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     const BOX2I ViewBBox() const override
     {
diff --git a/pcbnew/class_mire.cpp b/pcbnew/class_mire.cpp
index e447134b6c..afe97b2085 100644
--- a/pcbnew/class_mire.cpp
+++ b/pcbnew/class_mire.cpp
@@ -38,6 +38,7 @@
 #include <trigo.h>
 #include <macros.h>
 #include <richio.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_mire.h>
@@ -195,6 +196,11 @@ wxString PCB_TARGET::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF PCB_TARGET::GetMenuImage() const
+{
+    return  add_mires_xpm;
+}
+
 EDA_ITEM* PCB_TARGET::Clone() const
 {
     return new PCB_TARGET( *this );
diff --git a/pcbnew/class_mire.h b/pcbnew/class_mire.h
index 8396ad8d57..5d419965e5 100644
--- a/pcbnew/class_mire.h
+++ b/pcbnew/class_mire.h
@@ -100,7 +100,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_mires_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 40020fd8de..07b992385b 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -43,6 +43,7 @@
 #include <filter_reader.h>
 #include <macros.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_edge_mod.h>
@@ -801,6 +802,12 @@ wxString MODULE::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF MODULE::GetMenuImage() const
+{
+    return module_xpm;
+}
+
+
 EDA_ITEM* MODULE::Clone() const
 {
     return new MODULE( *this );
diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h
index 63a549a863..e64448109e 100644
--- a/pcbnew/class_module.h
+++ b/pcbnew/class_module.h
@@ -549,7 +549,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  module_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 962ee44ce5..7b50e45157 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -35,6 +35,7 @@
 #include <macros.h>
 #include <msgpanel.h>
 #include <base_units.h>
+#include <bitmaps.h>
 
 #include <pcbnew.h>
 
@@ -912,6 +913,12 @@ wxString D_PAD::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF D_PAD::GetMenuImage() const
+{
+    return pad_xpm;
+}
+
+
 EDA_ITEM* D_PAD::Clone() const
 {
     return new D_PAD( *this );
diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h
index d8c26a8f8d..6619d31343 100644
--- a/pcbnew/class_pad.h
+++ b/pcbnew/class_pad.h
@@ -514,7 +514,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return pad_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     /**
      * Function ShowPadShape
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index 82e6ea93b6..d2ed8ff010 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -42,6 +42,7 @@
 #include <wxBasePcbFrame.h>
 #include <msgpanel.h>
 #include <base_units.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_pcb_text.h>
@@ -186,6 +187,12 @@ wxString TEXTE_PCB::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF TEXTE_PCB::GetMenuImage() const
+{
+    return add_text_xpm;
+}
+
+
 EDA_ITEM* TEXTE_PCB::Clone() const
 {
     return new TEXTE_PCB( *this );
diff --git a/pcbnew/class_pcb_text.h b/pcbnew/class_pcb_text.h
index 677e42a27c..3a2e0e54d7 100644
--- a/pcbnew/class_pcb_text.h
+++ b/pcbnew/class_pcb_text.h
@@ -133,7 +133,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_text_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     // Virtual function
     const EDA_RECT GetBoundingBox() const override;
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index 3703d7cfab..2925fce647 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -41,6 +41,7 @@
 #include <wxBasePcbFrame.h>
 #include <msgpanel.h>
 #include <base_units.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_module.h>
@@ -405,6 +406,12 @@ wxString TEXTE_MODULE::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF TEXTE_MODULE::GetMenuImage() const
+{
+    return footprint_text_xpm;
+}
+
+
 EDA_ITEM* TEXTE_MODULE::Clone() const
 {
     return new TEXTE_MODULE( *this );
diff --git a/pcbnew/class_text_mod.h b/pcbnew/class_text_mod.h
index 535f2730be..df07ac8a25 100644
--- a/pcbnew/class_text_mod.h
+++ b/pcbnew/class_text_mod.h
@@ -193,7 +193,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  footprint_text_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index 27a622fc0e..92dc2d626e 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -45,7 +45,7 @@
 #include <pcbnew.h>
 #include <base_units.h>
 #include <msgpanel.h>
-
+#include <bitmaps.h>
 
 /**
  * Function ShowClearance
@@ -149,6 +149,12 @@ wxString SEGZONE::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF SEGZONE::GetMenuImage() const
+{
+    return add_zone_xpm;
+}
+
+
 VIA::VIA( BOARD_ITEM* aParent ) :
     TRACK( aParent, PCB_VIA_T )
 {
@@ -211,6 +217,12 @@ wxString VIA::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF VIA::GetMenuImage() const
+{
+    return via_sketch_xpm;
+}
+
+
 int TRACK::GetClearance( BOARD_CONNECTED_ITEM* aItem ) const
 {
     // Currently tracks have no specific clearance parameter on a per track or per
@@ -1581,6 +1593,12 @@ wxString TRACK::GetSelectMenuText() const
 }
 
 
+BITMAP_DEF TRACK:: GetMenuImage() const
+{
+    return showtrack_xpm;
+}
+
+
 #if defined(DEBUG)
 
 wxString TRACK::ShowState( int stateBits )
diff --git a/pcbnew/class_track.h b/pcbnew/class_track.h
index e18517942a..6e2ff54c23 100644
--- a/pcbnew/class_track.h
+++ b/pcbnew/class_track.h
@@ -294,7 +294,7 @@ public:
 
     virtual wxString GetSelectMenuText() const override;
 
-    virtual BITMAP_DEF GetMenuImage() const override { return  showtrack_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     virtual EDA_ITEM* Clone() const override;
 
@@ -366,7 +366,7 @@ public:
     void Draw( EDA_DRAW_PANEL* panel, wxDC* DC,
                GR_DRAWMODE aDrawMode, const wxPoint& aOffset = ZeroOffset ) override;
 
-    BITMAP_DEF GetMenuImage() const override { return  add_zone_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
@@ -426,7 +426,7 @@ public:
 
     wxString GetSelectMenuText() const override;
 
-    BITMAP_DEF GetMenuImage() const override { return  via_sketch_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
     EDA_ITEM* Clone() const override;
 
diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index 0ac7966a05..99795a81f4 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -39,6 +39,7 @@
 #include <macros.h>
 #include <wxBasePcbFrame.h>
 #include <msgpanel.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_zone.h>
@@ -851,3 +852,9 @@ wxString ZONE_CONTAINER::GetSelectMenuText() const
 
     return msg;
 }
+
+
+BITMAP_DEF ZONE_CONTAINER::GetMenuImage() const
+{
+    return add_zone_xpm;
+}
diff --git a/pcbnew/class_zone.h b/pcbnew/class_zone.h
index ab488a1966..d4e08d2886 100644
--- a/pcbnew/class_zone.h
+++ b/pcbnew/class_zone.h
@@ -515,11 +515,11 @@ public:
         m_FillSegmList.insert( m_FillSegmList.end(), aSegments.begin(), aSegments.end() );
     }
 
-    virtual wxString GetSelectMenuText() const override;
+    wxString GetSelectMenuText() const override;
 
-    virtual BITMAP_DEF GetMenuImage() const override { return  add_zone_xpm; }
+    BITMAP_DEF GetMenuImage() const override;
 
-    virtual EDA_ITEM* Clone() const override;
+    EDA_ITEM* Clone() const override;
 
     /**
      * Accessors to parameters used in Keepout zones:
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
index 90f912c80e..7bb78c6454 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
@@ -42,6 +42,7 @@
 #include <base_units.h>
 #include <project.h>
 #include <board_commit.h>
+#include <bitmaps.h>
 
 #include <class_module.h>
 #include <class_text_mod.h>
diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
index 04727822f3..5b55cb9a53 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
@@ -44,6 +44,7 @@
 #include <validators.h>
 #include <kicad_string.h>
 #include <board_commit.h>
+#include <bitmaps.h>
 
 #include <class_module.h>
 #include <class_text_mod.h>
diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp b/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp
index b7d238e804..1c490a2fc3 100644
--- a/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp
+++ b/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp
@@ -25,6 +25,7 @@
 
 #include "dialog_pns_length_tuning_settings.h"
 #include <router/pns_meander_placer.h>
+#include <bitmaps.h>
 
 DIALOG_PNS_LENGTH_TUNING_SETTINGS::DIALOG_PNS_LENGTH_TUNING_SETTINGS( wxWindow* aParent,
                         PNS::MEANDER_SETTINGS& aSettings, PNS::ROUTER_MODE aMode )
diff --git a/pcbnew/dialogs/wizard_add_fplib.cpp b/pcbnew/dialogs/wizard_add_fplib.cpp
index d909759f76..b9c7cb46c6 100644
--- a/pcbnew/dialogs/wizard_add_fplib.cpp
+++ b/pcbnew/dialogs/wizard_add_fplib.cpp
@@ -43,6 +43,7 @@
 #include <wizard_add_fplib.h>
 #include <fp_lib_table.h>
 #include <confirm.h>
+#include <bitmaps.h>
 
 #include <class_module.h>
 
diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index 351ccabd0f..0c025c1d5c 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -36,6 +36,7 @@
 #include <3d_viewer/eda_3d_viewer.h>
 #include <msgpanel.h>
 #include <macros.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp
index 243d28c1dc..4eade3e9bd 100644
--- a/pcbnew/menubar_modedit.cpp
+++ b/pcbnew/menubar_modedit.cpp
@@ -34,6 +34,7 @@
 #include <pgm_base.h>
 #include <wxPcbStruct.h>
 
+
 #include "help_common_strings.h"
 #include "hotkeys.h"
 #include "module_editor_frame.h"
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index 0b39a6e720..d05786f295 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -42,6 +42,7 @@
 #include <3d_viewer/eda_3d_viewer.h>
 #include <msgpanel.h>
 #include <fp_lib_table.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/modview_frame.cpp b/pcbnew/modview_frame.cpp
index 93e43e1a43..6774d319ff 100644
--- a/pcbnew/modview_frame.cpp
+++ b/pcbnew/modview_frame.cpp
@@ -39,6 +39,7 @@
 #include <fp_lib_table.h>
 #include <lib_id.h>
 #include <confirm.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp
index f0027fc445..afb7c4989d 100644
--- a/pcbnew/onrightclick.cpp
+++ b/pcbnew/onrightclick.cpp
@@ -33,6 +33,7 @@
 #include <class_drawpanel.h>
 #include <macros.h>
 #include <base_units.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index 11cef6dd44..fb82216b3f 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -41,6 +41,7 @@
 #include <3d_viewer/eda_3d_viewer.h>
 #include <msgpanel.h>
 #include <fp_lib_table.h>
+#include <bitmaps.h>
 
 #include <pcbnew.h>
 #include <pcbnew_id.h>
diff --git a/pcbnew/router/pns_tool_base.cpp b/pcbnew/router/pns_tool_base.cpp
index ad4417810e..548431c342 100644
--- a/pcbnew/router/pns_tool_base.cpp
+++ b/pcbnew/router/pns_tool_base.cpp
@@ -38,6 +38,7 @@ using namespace std::placeholders;
 #include <dialogs/dialog_pns_length_tuning_settings.h>
 #include <dialogs/dialog_track_via_size.h>
 #include <base_units.h>
+#include <bitmaps.h>
 
 #include <tool/context_menu.h>
 #include <tools/common_actions.h>
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 4793637d0c..365653aaad 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -41,6 +41,7 @@ using namespace std::placeholders;
 #include <base_units.h>
 #include <hotkeys.h>
 #include <confirm.h>
+#include <bitmaps.h>
 
 #include <tool/context_menu.h>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp
index d545044c7a..a7953ae9f4 100644
--- a/pcbnew/tool_modedit.cpp
+++ b/pcbnew/tool_modedit.cpp
@@ -37,6 +37,7 @@
 #include <dialog_helpers.h>
 #include <pcbnew_id.h>
 #include <hotkeys.h>
+#include <bitmaps.h>
 
 
 void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar()
diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp
index 513129872b..102ac535f8 100644
--- a/pcbnew/tool_pcb.cpp
+++ b/pcbnew/tool_pcb.cpp
@@ -38,6 +38,7 @@
 #include <wxPcbStruct.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
+#include <bitmaps.h>
 
 #include <class_board.h>
 
diff --git a/pcbnew/tools/grid_menu.cpp b/pcbnew/tools/grid_menu.cpp
index 0f851e6f5b..4b8b77b4a9 100644
--- a/pcbnew/tools/grid_menu.cpp
+++ b/pcbnew/tools/grid_menu.cpp
@@ -28,6 +28,7 @@
 #include <draw_frame.h>
 #include <class_base_screen.h>
 #include <tools/common_actions.h>
+#include <bitmaps.h>
 
 #include <functional>
 using namespace std::placeholders;
diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp
index 19e9417b05..a885f55c23 100644
--- a/pcbnew/tools/pad_tool.cpp
+++ b/pcbnew/tools/pad_tool.cpp
@@ -29,6 +29,7 @@
 #include <view/view_controls.h>
 #include <view/view.h>
 #include <tool/tool_manager.h>
+#include <bitmaps.h>
 
 #include <class_board_item.h>
 #include <class_module.h>
diff --git a/pcbnew/tools/pcb_editor_control.cpp b/pcbnew/tools/pcb_editor_control.cpp
index 788d77411c..cf580c641c 100644
--- a/pcbnew/tools/pcb_editor_control.cpp
+++ b/pcbnew/tools/pcb_editor_control.cpp
@@ -46,6 +46,7 @@
 #include <zones_functions_for_undo_redo.h>
 #include <board_commit.h>
 #include <confirm.h>
+#include <bitmaps.h>
 
 #include <view/view_group.h>
 #include <view/view_controls.h>
diff --git a/pcbnew/tools/size_menu.cpp b/pcbnew/tools/size_menu.cpp
index f2e319ee5a..2b5a836ef1 100644
--- a/pcbnew/tools/size_menu.cpp
+++ b/pcbnew/tools/size_menu.cpp
@@ -23,6 +23,8 @@
 
 #include <class_board.h>
 #include <pcbnew_id.h>
+#include <bitmaps.h>
+
 
 TRACK_VIA_SIZE_MENU::TRACK_VIA_SIZE_MENU( bool aTrackSizes, bool aViaSizes ) :
     m_tracks( aTrackSizes ), m_vias( aViaSizes )
diff --git a/pcbnew/tools/zoom_menu.cpp b/pcbnew/tools/zoom_menu.cpp
index 8f3e614f94..ae74642120 100644
--- a/pcbnew/tools/zoom_menu.cpp
+++ b/pcbnew/tools/zoom_menu.cpp
@@ -27,6 +27,7 @@
 #include <draw_frame.h>
 #include <class_base_screen.h>
 #include <tools/common_actions.h>
+#include <bitmaps.h>
 
 #include <functional>
 using namespace std::placeholders;