diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index b249dd200b..f4f43daa07 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -225,6 +225,7 @@ set( COMMON_WIDGET_SRCS
     widgets/layer_box_selector.cpp
     widgets/lib_tree.cpp
     widgets/mathplot.cpp
+    widgets/msgpanel.cpp
     widgets/number_badge.cpp
     widgets/paged_dialog.cpp
     widgets/progress_reporter.cpp
@@ -360,7 +361,6 @@ set( COMMON_SRCS
     lockfile.cpp
     lset.cpp
     marker_base.cpp
-    msgpanel.cpp
     netclass.cpp
     observable.cpp
     origin_transforms.cpp
diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index cad8ac836f..fe6d4c520e 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -33,7 +33,6 @@
 #include <kiface_i.h>
 #include <lockfile.h>
 #include <macros.h>
-#include <msgpanel.h>
 #include <page_info.h>
 #include <pgm_base.h>
 #include <render_settings.h>
@@ -53,6 +52,7 @@
 #include <trace_helpers.h>
 #include <view/view.h>
 #include <page_layout/ws_draw_item.h>
+#include <widgets/msgpanel.h>
 #include <wx/snglinst.h>
 #include <dialogs/dialog_grid_settings.h>
 
diff --git a/common/msgpanel.cpp b/common/widgets/msgpanel.cpp
similarity index 99%
rename from common/msgpanel.cpp
rename to common/widgets/msgpanel.cpp
index 438bdb9f08..c4324d8790 100644
--- a/common/msgpanel.cpp
+++ b/common/widgets/msgpanel.cpp
@@ -28,7 +28,7 @@
  * @brief Message panel implementation file.
  */
 
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 
 #include <wx/dcscreen.h>
 #include <wx/dcclient.h>
diff --git a/cvpcb/display_footprints_frame.cpp b/cvpcb/display_footprints_frame.cpp
index 4815334bf7..2fae56218f 100644
--- a/cvpcb/display_footprints_frame.cpp
+++ b/cvpcb/display_footprints_frame.cpp
@@ -35,7 +35,7 @@
 #include <kiface_i.h>
 #include <lib_id.h>
 #include <macros.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <pcb_draw_panel_gal.h>
 #include <pcb_painter.h>
 #include <pgm_base.h>
diff --git a/eeschema/lib_arc.cpp b/eeschema/lib_arc.cpp
index 3a2c7eabfa..f6e71fef87 100644
--- a/eeschema/lib_arc.cpp
+++ b/eeschema/lib_arc.cpp
@@ -27,7 +27,7 @@
 #include <plotter.h>
 #include <trigo.h>
 #include <base_units.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <math/util.h>      // for KiROUND
 #include <eda_draw_frame.h>
diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp
index 565415326b..d4a31555a6 100644
--- a/eeschema/lib_bezier.cpp
+++ b/eeschema/lib_bezier.cpp
@@ -27,7 +27,7 @@
 #include <bezier_curves.h>
 #include <base_units.h>
 #include <eda_draw_frame.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <eda_draw_frame.h>
 #include <general.h>
 #include <lib_bezier.h>
diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp
index d3a769b623..9b3b6a36f0 100644
--- a/eeschema/lib_circle.cpp
+++ b/eeschema/lib_circle.cpp
@@ -26,7 +26,7 @@
 #include <plotter.h>
 #include <trigo.h>
 #include <base_units.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <math/util.h>      // for KiROUND
 #include <eda_draw_frame.h>
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index b19f3bad2f..eb04e3ab83 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -32,7 +32,7 @@
 #include <plotter.h>
 #include <trigo.h>
 #include <base_units.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <general.h>
 #include <class_libentry.h>
diff --git a/eeschema/lib_item.cpp b/eeschema/lib_item.cpp
index 15f950fd8e..feca13aff3 100644
--- a/eeschema/lib_item.cpp
+++ b/eeschema/lib_item.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <sch_draw_panel.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 
 #include <general.h>
 #include <lib_item.h>
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index 291529052a..e4c3a8bc7a 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -27,7 +27,7 @@
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <general.h>
 #include <lib_edit_frame.h>
 #include <class_libentry.h>
diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp
index b9f847a518..526556e256 100644
--- a/eeschema/lib_polyline.cpp
+++ b/eeschema/lib_polyline.cpp
@@ -27,7 +27,7 @@
 #include <plotter.h>
 #include <trigo.h>
 #include <base_units.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <eda_draw_frame.h>
 #include <general.h>
diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp
index 952af6cb3e..3c43539209 100644
--- a/eeschema/lib_rectangle.cpp
+++ b/eeschema/lib_rectangle.cpp
@@ -26,7 +26,7 @@
 #include <plotter.h>
 #include <trigo.h>
 #include <base_units.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <eda_draw_frame.h>
 #include <general.h>
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index 06b9495d4f..778ff5dea9 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -31,7 +31,7 @@
 #include <gr_text.h>
 #include <trigo.h>
 #include <base_units.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <eda_draw_frame.h>
 #include <lib_item.h>
diff --git a/eeschema/lib_view_frame.cpp b/eeschema/lib_view_frame.cpp
index 1957dfe36a..78d1212f00 100644
--- a/eeschema/lib_view_frame.cpp
+++ b/eeschema/lib_view_frame.cpp
@@ -34,7 +34,7 @@
 #include <kiface_i.h>
 #include <kiway.h>
 #include <lib_view_frame.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <sch_view.h>
 #include <sch_painter.h>
 #include <symbol_lib_table.h>
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 68046824d8..9b8c6daebf 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <sch_edit_frame.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <lib_rectangle.h>
 #include <lib_pin.h>
diff --git a/eeschema/sch_component.h b/eeschema/sch_component.h
index 9124b1394e..1a1d885d9f 100644
--- a/eeschema/sch_component.h
+++ b/eeschema/sch_component.h
@@ -31,7 +31,7 @@
 #include <core/typeinfo.h>
 #include <layers_id_colors_and_visibility.h>
 #include <lib_id.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 
 #include <memory>
 #include <string>
diff --git a/eeschema/sch_connection.h b/eeschema/sch_connection.h
index f407093085..00834ad7cc 100644
--- a/eeschema/sch_connection.h
+++ b/eeschema/sch_connection.h
@@ -28,7 +28,7 @@
 #include <wx/regex.h>
 
 #include <bus_alias.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <sch_sheet_path.h>
 
 
diff --git a/eeschema/sch_marker.cpp b/eeschema/sch_marker.cpp
index e4feaacb7f..bf9f06bc68 100644
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@@ -24,7 +24,7 @@
 
 #include <sch_draw_panel.h>
 #include <trigo.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <base_units.h>
 #include <erc_settings.h>
diff --git a/eeschema/sch_pin.h b/eeschema/sch_pin.h
index c8e2b66942..716ec41c28 100644
--- a/eeschema/sch_pin.h
+++ b/eeschema/sch_pin.h
@@ -23,9 +23,9 @@
 #define _SCH_PIN_CONNECTION_H
 
 #include <lib_pin.h>
-#include <msgpanel.h>
 #include <sch_item.h>
 #include <sch_sheet_path.h>
+#include <widgets/msgpanel.h>
 
 #include <mutex>
 #include <map>
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index e4238e6d9e..6518a4db02 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -28,7 +28,7 @@
 #include <sch_edit_frame.h>
 #include <plotter.h>
 #include <kicad_string.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <math/util.h>      // for KiROUND
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 25a41cdc37..ea9d4ebe30 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -31,7 +31,7 @@
 #include <sch_component.h>
 #include <sch_edit_frame.h>
 #include <plotter.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <gal/stroke_font.h>
 #include <bitmaps.h>
 #include <kicad_string.h>
diff --git a/gerbview/gerber_draw_item.cpp b/gerbview/gerber_draw_item.cpp
index e95d731b02..8a8c339a43 100644
--- a/gerbview/gerber_draw_item.cpp
+++ b/gerbview/gerber_draw_item.cpp
@@ -25,7 +25,6 @@
 #include <trigo.h>
 #include <bitmaps.h>
 #include <eda_text.h>
-#include <msgpanel.h>
 #include <gerbview_frame.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <gerber_draw_item.h>
@@ -34,6 +33,7 @@
 #include <kicad_string.h>
 #include <geometry/shape_arc.h>
 #include <math/util.h>      // for KiROUND
+#include <widgets/msgpanel.h>
 
 #include <wx/msgdlg.h>
 
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index f2ac6f309b..40628823c5 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -23,7 +23,6 @@
 #include <eda_base_frame.h>
 #include <base_units.h>
 #include <gbr_layer_box_selector.h>
-#include <msgpanel.h>
 #include <bitmaps.h>
 #include <wildcards_and_files_ext.h>
 #include <gerbview.h>
@@ -55,6 +54,7 @@
 #include <view/view.h>
 #include <base_screen.h>
 #include <gerbview_painter.h>
+#include <widgets/msgpanel.h>
 #include <widgets/paged_dialog.h>
 #include <dialogs/panel_gerbview_settings.h>
 #include <dialogs/panel_gerbview_display_options.h>
diff --git a/include/class_draw_panel_gal.h b/include/class_draw_panel_gal.h
index d20290b59d..a30bf14b74 100644
--- a/include/class_draw_panel_gal.h
+++ b/include/class_draw_panel_gal.h
@@ -33,7 +33,7 @@
 #include <wx/grid.h> // needed for MSVC to see wxScrolledCanvas indirectly exported
 #include <math/box2.h>
 #include <math/vector2d.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <memory>
 #include <cursors.h>
 
diff --git a/include/page_layout/ws_draw_item.h b/include/page_layout/ws_draw_item.h
index 97737f988a..11736314b4 100644
--- a/include/page_layout/ws_draw_item.h
+++ b/include/page_layout/ws_draw_item.h
@@ -29,7 +29,7 @@
 #include <math/vector2d.h>
 #include <eda_text.h>
 #include <bitmap_base.h>
-#include "msgpanel.h"
+#include "widgets/msgpanel.h"
 #include <geometry/shape_poly_set.h>
 #include <eda_units.h>
 
diff --git a/include/msgpanel.h b/include/widgets/msgpanel.h
similarity index 100%
rename from include/msgpanel.h
rename to include/widgets/msgpanel.h
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index 54df0abbf0..d0100d8b9a 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/pagelayout_editor/pl_editor_frame.cpp
@@ -25,7 +25,6 @@
 
 #include <kiface_i.h>
 #include <pgm_base.h>
-#include <msgpanel.h>
 #include <bitmaps.h>
 #include <eda_item.h>
 #include <page_layout/ws_data_item.h>
@@ -47,6 +46,7 @@
 #include <tool/picker_tool.h>
 #include <tool/zoom_tool.h>
 #include <widgets/infobar.h>
+#include <widgets/msgpanel.h>
 #include <settings/settings_manager.h>
 
 #include "dialogs/panel_pl_editor_color_settings.h"
diff --git a/pcbnew/autorouter/ar_autoplacer.cpp b/pcbnew/autorouter/ar_autoplacer.cpp
index 34b3ea2448..d08c5dcd43 100644
--- a/pcbnew/autorouter/ar_autoplacer.cpp
+++ b/pcbnew/autorouter/ar_autoplacer.cpp
@@ -28,7 +28,7 @@
 #include <confirm.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_track.h>
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index a7f55f3b95..07395397f7 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -28,7 +28,6 @@
  * D_PAD class implementation.
  */
 
-#include <msgpanel.h>
 #include <base_units.h>
 #include <bitmaps.h>
 #include <math/util.h>      // for KiROUND
@@ -47,6 +46,7 @@
 #include <connectivity/connectivity_data.h>
 #include <convert_to_biu.h>
 #include <convert_basic_shapes_to_polygon.h>
+#include <widgets/msgpanel.h>
 
 #include <memory>
 
diff --git a/pcbnew/class_pcb_group.cpp b/pcbnew/class_pcb_group.cpp
index f2db9f21e9..11e40a372f 100644
--- a/pcbnew/class_pcb_group.cpp
+++ b/pcbnew/class_pcb_group.cpp
@@ -26,7 +26,7 @@
 #include <class_board_item.h>
 #include <class_pcb_group.h>
 #include <confirm.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <view/view.h>
 
 PCB_GROUP::PCB_GROUP( BOARD_ITEM* aParent ) :
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index efab363958..0a19291c73 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -29,7 +29,7 @@
 #include <pcb_edit_frame.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <pgm_base.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <fp_lib_table.h>
 #include <kiface_i.h>
 #include <trace_helpers.h>
diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
index da21dee675..9e377e7da8 100644
--- a/pcbnew/footprint_viewer_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -35,7 +35,7 @@
 #include <footprint_viewer_frame.h>
 #include <fp_lib_table.h>
 #include <kiway.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <pcb_draw_panel_gal.h>
 #include <pcb_painter.h>
 #include <pcbnew_id.h>
diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index 8d9ad1679d..7c9db608a8 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -28,7 +28,7 @@
 #include <pcb_draw_panel_gal.h>
 #include <pcb_edit_frame.h>
 #include <3d_viewer/eda_3d_viewer.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <grid_tricks.h>
 #include <class_board.h>
diff --git a/pcbnew/netinfo_item.cpp b/pcbnew/netinfo_item.cpp
index 5a47f60212..def4859013 100644
--- a/pcbnew/netinfo_item.cpp
+++ b/pcbnew/netinfo_item.cpp
@@ -29,7 +29,7 @@
 
 #include <pcb_base_frame.h>
 #include <kicad_string.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <base_units.h>
 #include <class_board.h>
 #include <class_track.h>
diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp
index c5eaa81378..1916b31e88 100644
--- a/pcbnew/pcb_base_frame.cpp
+++ b/pcbnew/pcb_base_frame.cpp
@@ -29,7 +29,7 @@
 #include <dialog_helpers.h>
 #include <pcb_base_frame.h>
 #include <base_units.h>
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 #include <pgm_base.h>
 #include <3d_viewer/eda_3d_viewer.h>          // To include VIEWER3D_FRAMENAME
 #include <footprint_editor_settings.h>
diff --git a/pcbnew/router/pns_tool_base.h b/pcbnew/router/pns_tool_base.h
index c751ab3dd1..97b1ffa10b 100644
--- a/pcbnew/router/pns_tool_base.h
+++ b/pcbnew/router/pns_tool_base.h
@@ -30,7 +30,7 @@
 #include <tools/pcb_tool_base.h>
 #include <board_commit.h>
 
-#include <msgpanel.h>
+#include <widgets/msgpanel.h>
 
 #include "pns_router.h"