diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
index b7e8b8f652..b0265169ff 100644
--- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp
+++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
@@ -25,6 +25,7 @@
 #include <wx/colordlg.h>
 #include <wx/colour.h>
 #include <wx/filename.h>
+#include <wx/msgdlg.h>
 #include <wx/string.h>
 #include <wx/wupdlock.h>
 #include <wx/clipbrd.h>
diff --git a/cvpcb/auto_associate.cpp b/cvpcb/auto_associate.cpp
index f58f74c964..29ae455424 100644
--- a/cvpcb/auto_associate.cpp
+++ b/cvpcb/auto_associate.cpp
@@ -40,6 +40,7 @@
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>
 #include <project/project_file.h>
+#include <wx/msgdlg.h>
 
 #define QUOTE   '\''
 
diff --git a/include/board_item.h b/include/board_item.h
index e6e446b18d..8b4d13792b 100644
--- a/include/board_item.h
+++ b/include/board_item.h
@@ -33,8 +33,6 @@
 #include <layers_id_colors_and_visibility.h>
 #include <geometry/geometry_utils.h>
 
-#include <wx/msgdlg.h>
-
 class BOARD;
 class BOARD_ITEM_CONTAINER;
 class SHAPE_POLY_SET;
@@ -291,10 +289,7 @@ public:
      * @param aRotCentre the rotation point.
      * @param aAngle the rotation angle in 0.1 degree.
      */
-    virtual void Rotate( const wxPoint& aRotCentre, double aAngle )
-    {
-        wxMessageBox( wxT( "virtual BOARD_ITEM::Rotate used, should not occur" ), GetClass() );
-    }
+    virtual void Rotate( const wxPoint& aRotCentre, double aAngle );
 
     void Rotate( const VECTOR2I& aRotCentre, double aAngle )
     {
@@ -307,10 +302,7 @@ public:
      * @param aCentre the rotation point.
      * @param aFlipLeftRight mirror across Y axis instead of X (the default).
      */
-    virtual void Flip( const wxPoint& aCentre, bool aFlipLeftRight )
-    {
-        wxMessageBox( wxT( "virtual BOARD_ITEM::Flip used, should not occur" ), GetClass() );
-    }
+    virtual void Flip( const wxPoint& aCentre, bool aFlipLeftRight );
 
     void Flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
     {
diff --git a/pcbnew/board_item.cpp b/pcbnew/board_item.cpp
index 3b5a533a8d..93d2f8db3a 100644
--- a/pcbnew/board_item.cpp
+++ b/pcbnew/board_item.cpp
@@ -29,6 +29,8 @@
 #include <i18n_utility.h>
 #include <board.h>
 #include <string>
+#include <wx/msgdlg.h>
+
 
 wxString BOARD_ITEM::ShowShape( PCB_SHAPE_TYPE aShape )
 {
@@ -162,6 +164,18 @@ std::shared_ptr<SHAPE> BOARD_ITEM::GetEffectiveShape( PCB_LAYER_ID aLayer ) cons
 }
 
 
+void BOARD_ITEM::Rotate( const wxPoint& aRotCentre, double aAngle )
+{
+    wxMessageBox( wxT( "virtual BOARD_ITEM::Rotate used, should not occur" ), GetClass() );
+}
+
+
+void BOARD_ITEM::Flip( const wxPoint& aCentre, bool aFlipLeftRight )
+{
+    wxMessageBox( wxT( "virtual BOARD_ITEM::Flip used, should not occur" ), GetClass() );
+}
+
+
 static struct BOARD_ITEM_DESC
 {
     BOARD_ITEM_DESC()
diff --git a/pcbnew/dialogs/dialog_create_array.cpp b/pcbnew/dialogs/dialog_create_array.cpp
index 1f7e71da08..b3802aa799 100644
--- a/pcbnew/dialogs/dialog_create_array.cpp
+++ b/pcbnew/dialogs/dialog_create_array.cpp
@@ -28,6 +28,7 @@
 #include <board.h>
 #include <footprint.h>
 #include <pcb_edit_frame.h>
+#include <wx/msgdlg.h>
 
 #include <boost/algorithm/string/join.hpp>
 
diff --git a/pcbnew/dialogs/dialog_dimension_properties.cpp b/pcbnew/dialogs/dialog_dimension_properties.cpp
index 9e8bb7d9b4..1002882414 100644
--- a/pcbnew/dialogs/dialog_dimension_properties.cpp
+++ b/pcbnew/dialogs/dialog_dimension_properties.cpp
@@ -24,6 +24,7 @@
 #include <pcb_base_edit_frame.h>
 #include <pcb_layer_box_selector.h>
 #include <widgets/unit_binder.h>
+#include <wx/msgdlg.h>
 
 #include "dialog_dimension_properties.h"
 
diff --git a/pcbnew/exporters/export_idf.cpp b/pcbnew/exporters/export_idf.cpp
index 7a1581de1b..630c059bb4 100644
--- a/pcbnew/exporters/export_idf.cpp
+++ b/pcbnew/exporters/export_idf.cpp
@@ -35,6 +35,7 @@
 #include <fp_shape.h>
 #include <idf_parser.h>
 #include <build_version.h>
+#include <wx/msgdlg.h>
 #include "project.h"
 #include "kiway.h"
 #include "3d_cache/3d_cache.h"
diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp
index 35ca388e03..a1cbb013f0 100644
--- a/pcbnew/exporters/export_vrml.cpp
+++ b/pcbnew/exporters/export_vrml.cpp
@@ -29,6 +29,7 @@
 #include <iomanip>
 #include <vector>
 #include <wx/dir.h>
+#include <wx/msgdlg.h>
 
 #include "3d_cache/3d_cache.h"
 #include "3d_cache/3d_info.h"
diff --git a/pcbnew/footprint_wizard_frame_functions.cpp b/pcbnew/footprint_wizard_frame_functions.cpp
index a171cdafd2..8d641aaeb0 100644
--- a/pcbnew/footprint_wizard_frame_functions.cpp
+++ b/pcbnew/footprint_wizard_frame_functions.cpp
@@ -37,6 +37,7 @@
 #include <base_units.h>
 #include <widgets/wx_grid.h>
 #include <wx/listbox.h>
+#include <wx/msgdlg.h>
 
 #include <tool/tool_manager.h>
 
diff --git a/pcbnew/import_gfx/dialog_import_gfx.cpp b/pcbnew/import_gfx/dialog_import_gfx.cpp
index a9cd125c57..4b87a8b08d 100644
--- a/pcbnew/import_gfx/dialog_import_gfx.cpp
+++ b/pcbnew/import_gfx/dialog_import_gfx.cpp
@@ -34,6 +34,7 @@
 #include <map>
 #include "dxf_import_plugin.h"
 #include <wx/filedlg.h>
+#include <wx/msgdlg.h>
 
 #include <memory>
 
diff --git a/pcbnew/netlist_reader/netlist.cpp b/pcbnew/netlist_reader/netlist.cpp
index b55ba865bf..75fcb622aa 100644
--- a/pcbnew/netlist_reader/netlist.cpp
+++ b/pcbnew/netlist_reader/netlist.cpp
@@ -46,6 +46,7 @@ using namespace std::placeholders;
 #include <tools/pcb_actions.h>
 #include <tools/pcb_selection_tool.h>
 #include <project/project_file.h>  // LAST_PATH_TYPE
+#include <wx/msgdlg.h>
 
 
 extern void SpreadFootprints( std::vector<FOOTPRINT*>* aFootprints, wxPoint aSpreadAreaPosition );
diff --git a/pcbnew/python/scripting/pcbnew_action_plugins.cpp b/pcbnew/python/scripting/pcbnew_action_plugins.cpp
index de3b752170..eb1466f918 100644
--- a/pcbnew/python/scripting/pcbnew_action_plugins.cpp
+++ b/pcbnew/python/scripting/pcbnew_action_plugins.cpp
@@ -32,6 +32,7 @@
 #include <pcbnew_settings.h>
 #include <tool/action_menu.h>
 #include <tool/action_toolbar.h>
+#include <wx/msgdlg.h>
 #include "../../scripting/python_scripting.h"
 
 PYTHON_ACTION_PLUGIN::PYTHON_ACTION_PLUGIN( PyObject* aAction )
diff --git a/pcbnew/python/scripting/pcbnew_footprint_wizards.cpp b/pcbnew/python/scripting/pcbnew_footprint_wizards.cpp
index f9e23fbbf6..11f388f150 100644
--- a/pcbnew/python/scripting/pcbnew_footprint_wizards.cpp
+++ b/pcbnew/python/scripting/pcbnew_footprint_wizards.cpp
@@ -30,6 +30,7 @@
 #include "pcbnew_footprint_wizards.h"
 #include <cstdio>
 #include <macros.h>
+#include <wx/msgdlg.h>
 #include "../../scripting/python_scripting.h"
 
 
diff --git a/pcbnew/undo_redo.cpp b/pcbnew/undo_redo.cpp
index 50b5b8b5b1..9668b8ed65 100644
--- a/pcbnew/undo_redo.cpp
+++ b/pcbnew/undo_redo.cpp
@@ -44,6 +44,7 @@ using namespace std::placeholders;
 #include <tools/pcb_control.h>
 #include <tools/board_editor_control.h>
 #include <drawing_sheet/ds_proxy_undo_item.h>
+#include <wx/msgdlg.h>
 
 /* Functions to undo and redo edit commands.
  *  commands to undo are stored in CurrentScreen->m_UndoList