From 4c63b4e061b405a91c222c3cf3008ea8873c6ddf Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Wed, 28 Dec 2022 22:03:03 +0000
Subject: [PATCH] Class name <-> file name sync.

---
 3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp                 | 2 +-
 3d-viewer/dialogs/panel_preview_3d_model.cpp                | 2 +-
 common/CMakeLists.txt                                       | 6 +++---
 common/draw_panel_gal.cpp                                   | 2 +-
 common/eda_base_frame.cpp                                   | 4 ++--
 common/eda_draw_frame.cpp                                   | 2 +-
 common/{filehistory.cpp => file_history.cpp}                | 2 +-
 common/reporter.cpp                                         | 2 +-
 common/widgets/paged_dialog.cpp                             | 2 +-
 .../{collapsible_pane.cpp => wx_collapsible_pane.cpp}       | 2 +-
 common/widgets/{infobar.cpp => wx_infobar.cpp}              | 2 +-
 cvpcb/display_footprints_frame.cpp                          | 2 +-
 eeschema/dialogs/dialog_annotate_base.cpp                   | 2 +-
 eeschema/dialogs/dialog_erc_base.cpp                        | 2 +-
 eeschema/dialogs/dialog_pin_properties_base.cpp             | 2 +-
 eeschema/dialogs/dialog_shape_properties_base.cpp           | 2 +-
 eeschema/dialogs/dialog_sheet_properties_base.cpp           | 2 +-
 eeschema/dialogs/dialog_text_properties_base.cpp            | 2 +-
 eeschema/files-io.cpp                                       | 2 +-
 eeschema/menubar.cpp                                        | 2 +-
 eeschema/sch_edit_frame.cpp                                 | 2 +-
 eeschema/symbol_editor/symbol_edit_frame.cpp                | 2 +-
 eeschema/symbol_editor/symbol_editor.cpp                    | 2 +-
 gerbview/gerbview_frame.h                                   | 2 +-
 include/eda_base_frame.h                                    | 2 +-
 include/{filehistory.h => file_history.h}                   | 0
 .../widgets/{collapsible_pane.h => wx_collapsible_pane.h}   | 6 +++---
 include/widgets/{infobar.h => wx_infobar.h}                 | 0
 kicad/kicad.cpp                                             | 2 +-
 kicad/kicad_manager_frame.cpp                               | 2 +-
 kicad/menubar.cpp                                           | 2 +-
 pagelayout_editor/files.cpp                                 | 2 +-
 pagelayout_editor/menubar.cpp                               | 2 +-
 pcbnew/autorouter/autoplace_tool.cpp                        | 2 +-
 pcbnew/files.cpp                                            | 2 +-
 pcbnew/menubar_pcb_editor.cpp                               | 2 +-
 pcbnew/pcb_edit_frame.cpp                                   | 2 +-
 pcbnew/router/router_tool.cpp                               | 2 +-
 pcbnew/tools/drawing_tool.cpp                               | 2 +-
 pcbnew/tools/footprint_editor_control.cpp                   | 2 +-
 pcbnew/tools/pad_tool.cpp                                   | 2 +-
 pcbnew/tools/pcb_control.cpp                                | 2 +-
 pcbnew/tools/zone_filler_tool.cpp                           | 2 +-
 pcbnew/widgets/appearance_controls.cpp                      | 4 ++--
 44 files changed, 48 insertions(+), 48 deletions(-)
 rename common/{filehistory.cpp => file_history.cpp} (99%)
 rename common/widgets/{collapsible_pane.cpp => wx_collapsible_pane.cpp} (99%)
 rename common/widgets/{infobar.cpp => wx_infobar.cpp} (99%)
 rename include/{filehistory.h => file_history.h} (100%)
 rename include/widgets/{collapsible_pane.h => wx_collapsible_pane.h} (97%)
 rename include/widgets/{infobar.h => wx_infobar.h} (100%)

diff --git a/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp b/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp
index 42b6082a2e..3a666e5ec0 100644
--- a/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp
+++ b/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp
@@ -53,7 +53,7 @@
 #include <tool/tool_manager.h>
 #include <tool/tool_dispatcher.h>
 #include <tool/action_toolbar.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wildcards_and_files_ext.h>
 
 #if defined( KICAD_USE_3DCONNEXION )
diff --git a/3d-viewer/dialogs/panel_preview_3d_model.cpp b/3d-viewer/dialogs/panel_preview_3d_model.cpp
index d7411d78c1..4fdab6e453 100644
--- a/3d-viewer/dialogs/panel_preview_3d_model.cpp
+++ b/3d-viewer/dialogs/panel_preview_3d_model.cpp
@@ -38,7 +38,7 @@
 #include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <settings/settings_manager.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <eda_3d_viewer_settings.h>
 #include <board_design_settings.h>
 
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index b96b93d08a..0c3009cea5 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -169,7 +169,7 @@ set( COMMON_WIDGET_SRCS
     widgets/bitmap_button.cpp
     widgets/bitmap_toggle.cpp
     widgets/button_row_panel.cpp
-    widgets/collapsible_pane.cpp
+        widgets/wx_collapsible_pane.cpp
     widgets/color_swatch.cpp
     widgets/font_choice.cpp
     widgets/footprint_choice.cpp
@@ -183,7 +183,7 @@ set( COMMON_WIDGET_SRCS
     widgets/grid_text_button_helpers.cpp
     widgets/grid_text_helpers.cpp
     widgets/indicator_icon.cpp
-    widgets/infobar.cpp
+        widgets/wx_infobar.cpp
     widgets/layer_box_selector.cpp
     widgets/lib_tree.cpp
     widgets/mathplot.cpp
@@ -324,7 +324,7 @@ set( COMMON_SRCS
     exceptions.cpp
     executable_names.cpp
     filename_resolver.cpp
-    filehistory.cpp
+        file_history.cpp
     filter_reader.cpp
     footprint_filter.cpp
     footprint_info.cpp
diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index 4a79f9a782..f68e52f0f0 100644
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@@ -46,7 +46,7 @@
 #include <tool/tool_dispatcher.h>
 #include <tool/tool_manager.h>
 
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 
 #include <kiplatform/ui.h>
 
diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index ba1cfbc718..853a620f4c 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -30,7 +30,7 @@
 #include <dialogs/panel_mouse_settings.h>
 #include <dialogs/panel_data_collection.h>
 #include <eda_dde.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <id.h>
 #include <kiface_base.h>
 #include <menus_helpers.h>
@@ -53,7 +53,7 @@
 #include <tool/tool_dispatcher.h>
 #include <trace_helpers.h>
 #include <widgets/paged_dialog.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_aui_art_providers.h>
 #include <wx/app.h>
 #include <wx/config.h>
diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index 7ac9ac0af3..61e09faa6c 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -29,7 +29,7 @@
 #include <core/arraydim.h>
 #include <dialog_shim.h>
 #include <eda_draw_frame.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <id.h>
 #include <kiface_base.h>
 #include <lockfile.h>
diff --git a/common/filehistory.cpp b/common/file_history.cpp
similarity index 99%
rename from common/filehistory.cpp
rename to common/file_history.cpp
index 532160d0b3..ac8280c451 100644
--- a/common/filehistory.cpp
+++ b/common/file_history.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <filehistory.h>
+#include <file_history.h>
 #include <id.h>
 #include <settings/app_settings.h>
 #include <tool/action_menu.h>
diff --git a/common/reporter.cpp b/common/reporter.cpp
index 8275b70194..c91a4161b5 100644
--- a/common/reporter.cpp
+++ b/common/reporter.cpp
@@ -27,7 +27,7 @@
 
 #include <macros.h>
 #include <reporter.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_html_report_panel.h>
 #include <wx/log.h>
 #include <wx/textctrl.h>
diff --git a/common/widgets/paged_dialog.cpp b/common/widgets/paged_dialog.cpp
index f021cea112..6b5c8e6ed5 100644
--- a/common/widgets/paged_dialog.cpp
+++ b/common/widgets/paged_dialog.cpp
@@ -26,7 +26,7 @@
 #include <wx/treebook.h>
 #include <wx/treectrl.h>
 
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/paged_dialog.h>
 #include <wx/stc/stc.h>
 
diff --git a/common/widgets/collapsible_pane.cpp b/common/widgets/wx_collapsible_pane.cpp
similarity index 99%
rename from common/widgets/collapsible_pane.cpp
rename to common/widgets/wx_collapsible_pane.cpp
index 3e8c2b0460..25ad632411 100644
--- a/common/widgets/collapsible_pane.cpp
+++ b/common/widgets/wx_collapsible_pane.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <bitmaps.h>
-#include <widgets/collapsible_pane.h>
+#include <widgets/wx_collapsible_pane.h>
 
 #include <wx/collpane.h>
 #include <wx/dc.h>
diff --git a/common/widgets/infobar.cpp b/common/widgets/wx_infobar.cpp
similarity index 99%
rename from common/widgets/infobar.cpp
rename to common/widgets/wx_infobar.cpp
index 34634855f0..c8916f3b9f 100644
--- a/common/widgets/infobar.cpp
+++ b/common/widgets/wx_infobar.cpp
@@ -20,7 +20,7 @@
 
 #include <id.h>
 #include <kiplatform/ui.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include "wx/artprov.h"
 #include <wx/aui/framemanager.h>
 #include <wx/debug.h>
diff --git a/cvpcb/display_footprints_frame.cpp b/cvpcb/display_footprints_frame.cpp
index de636aa2cf..f39240d820 100644
--- a/cvpcb/display_footprints_frame.cpp
+++ b/cvpcb/display_footprints_frame.cpp
@@ -54,7 +54,7 @@
 #include <tools/pcb_editor_conditions.h>  // Shared conditions with other Pcbnew frames
 #include <tools/pcb_viewer_tools.h>       // shared tools with other Pcbnew frames
 #include <tools/cvpcb_fpviewer_selection_tool.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wx/choice.h>
 #include <wx/debug.h>
 #include <cvpcb_id.h>
diff --git a/eeschema/dialogs/dialog_annotate_base.cpp b/eeschema/dialogs/dialog_annotate_base.cpp
index d0fd595eb5..ed44cdeaa2 100644
--- a/eeschema/dialogs/dialog_annotate_base.cpp
+++ b/eeschema/dialogs/dialog_annotate_base.cpp
@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/wx_html_report_panel.h"
 
 #include "dialog_annotate_base.h"
diff --git a/eeschema/dialogs/dialog_erc_base.cpp b/eeschema/dialogs/dialog_erc_base.cpp
index 343f34d5ed..8e0de2fab7 100644
--- a/eeschema/dialogs/dialog_erc_base.cpp
+++ b/eeschema/dialogs/dialog_erc_base.cpp
@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/wx_html_report_box.h"
 
 #include "dialog_erc_base.h"
diff --git a/eeschema/dialogs/dialog_pin_properties_base.cpp b/eeschema/dialogs/dialog_pin_properties_base.cpp
index 192b9e6532..5ada6ea9c6 100644
--- a/eeschema/dialogs/dialog_pin_properties_base.cpp
+++ b/eeschema/dialogs/dialog_pin_properties_base.cpp
@@ -7,7 +7,7 @@
 
 #include "pin_shape_combobox.h"
 #include "pin_type_combobox.h"
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/std_bitmap_button.h"
 #include "widgets/wx_grid.h"
 #include "wx/bmpcbox.h"
diff --git a/eeschema/dialogs/dialog_shape_properties_base.cpp b/eeschema/dialogs/dialog_shape_properties_base.cpp
index 048ff7ce5c..900358a560 100644
--- a/eeschema/dialogs/dialog_shape_properties_base.cpp
+++ b/eeschema/dialogs/dialog_shape_properties_base.cpp
@@ -6,7 +6,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #include "widgets/color_swatch.h"
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 
 #include "dialog_shape_properties_base.h"
 
diff --git a/eeschema/dialogs/dialog_sheet_properties_base.cpp b/eeschema/dialogs/dialog_sheet_properties_base.cpp
index 9120335711..ebb5c99408 100644
--- a/eeschema/dialogs/dialog_sheet_properties_base.cpp
+++ b/eeschema/dialogs/dialog_sheet_properties_base.cpp
@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/std_bitmap_button.h"
 #include "widgets/wx_grid.h"
 
diff --git a/eeschema/dialogs/dialog_text_properties_base.cpp b/eeschema/dialogs/dialog_text_properties_base.cpp
index 38e93d2d10..454c05d8d5 100644
--- a/eeschema/dialogs/dialog_text_properties_base.cpp
+++ b/eeschema/dialogs/dialog_text_properties_base.cpp
@@ -8,7 +8,7 @@
 #include "widgets/bitmap_button.h"
 #include "widgets/color_swatch.h"
 #include "widgets/font_choice.h"
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/wx_combobox.h"
 
 #include "dialog_text_properties_base.h"
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index c1f2692178..63dd9aec4a 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -55,7 +55,7 @@
 #include <tools/sch_editor_control.h>
 #include <tools/sch_navigate_tool.h>
 #include <trace_helpers.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wildcards_and_files_ext.h>
 #include <drawing_sheet/ds_data_model.h>
 #include <wx/app.h>
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index f01d8a90a2..efe4ceb320 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <bitmaps.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <kiface_base.h>
 #include <menus_helpers.h>
 #include <schematic.h>
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index 7d756b61a7..b291293ce5 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -77,7 +77,7 @@
 #include <tools/sch_move_tool.h>
 #include <tools/sch_navigate_tool.h>
 #include <view/view_controls.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/hierarchy_pane.h>
 #include <wildcards_and_files_ext.h>
 #include <wx/cmdline.h>
diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp
index 1c8c0d3c00..4a44b8e7f1 100644
--- a/eeschema/symbol_editor/symbol_edit_frame.cpp
+++ b/eeschema/symbol_editor/symbol_edit_frame.cpp
@@ -65,7 +65,7 @@
 #include <tools/symbol_editor_move_tool.h>
 #include <tools/symbol_editor_pin_tool.h>
 #include <widgets/app_progress_dialog.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/lib_tree.h>
 #include <widgets/wx_progress_reporters.h>
 #include <widgets/symbol_tree_pane.h>
diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp
index adea6fb96e..11a92149cc 100644
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@@ -26,7 +26,7 @@
 #include <pgm_base.h>
 #include <confirm.h>
 #include <kiway.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <tools/ee_actions.h>
 #include <tools/symbol_editor_drawing_tools.h>
 #include <symbol_edit_frame.h>
diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h
index 92d4cb2081..2c32036a1a 100644
--- a/gerbview/gerbview_frame.h
+++ b/gerbview/gerbview_frame.h
@@ -22,7 +22,7 @@
 #ifndef  WX_GERBER_STRUCT_H
 #define  WX_GERBER_STRUCT_H
 
-#include <filehistory.h>
+#include <file_history.h>
 #include <config_params.h>
 #include <eda_draw_frame.h>
 #include <layer_ids.h>
diff --git a/include/eda_base_frame.h b/include/eda_base_frame.h
index f57f21e986..701ac90203 100644
--- a/include/eda_base_frame.h
+++ b/include/eda_base_frame.h
@@ -42,7 +42,7 @@
 #include <kiway_holder.h>
 #include <tool/tools_holder.h>
 #include <widgets/ui_common.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <undo_redo_container.h>
 #include <units_provider.h>
 #include <origin_transforms.h>
diff --git a/include/filehistory.h b/include/file_history.h
similarity index 100%
rename from include/filehistory.h
rename to include/file_history.h
diff --git a/include/widgets/collapsible_pane.h b/include/widgets/wx_collapsible_pane.h
similarity index 97%
rename from include/widgets/collapsible_pane.h
rename to include/widgets/wx_collapsible_pane.h
index be9631d9bf..92733dc066 100644
--- a/include/widgets/collapsible_pane.h
+++ b/include/widgets/wx_collapsible_pane.h
@@ -17,8 +17,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KICAD_COLLAPSIBLE_PANE_H
-#define KICAD_COLLAPSIBLE_PANE_H
+#ifndef KICAD_WX_COLLAPSIBLE_PANE_H
+#define KICAD_WX_COLLAPSIBLE_PANE_H
 
 #include <wx/control.h>
 #include <wx/containr.h>
@@ -172,4 +172,4 @@ private:
     void onHeaderClicked( wxCommandEvent& aEvent );
 };
 
-#endif // KICAD_COLLAPSIBLE_PANE_H
+#endif // KICAD_WX_COLLAPSIBLE_PANE_H
diff --git a/include/widgets/infobar.h b/include/widgets/wx_infobar.h
similarity index 100%
rename from include/widgets/infobar.h
rename to include/widgets/wx_infobar.h
diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp
index 29df4b3abe..3bb2b6513d 100644
--- a/kicad/kicad.cpp
+++ b/kicad/kicad.cpp
@@ -35,7 +35,7 @@
 #include <wx/msgdlg.h>
 #include <wx/cmdline.h>
 
-#include <filehistory.h>
+#include <file_history.h>
 #include <hotkeys_basic.h>
 #include <kiway.h>
 #include <macros.h>
diff --git a/kicad/kicad_manager_frame.cpp b/kicad/kicad_manager_frame.cpp
index 75adbed90c..118e88a32b 100644
--- a/kicad/kicad_manager_frame.cpp
+++ b/kicad/kicad_manager_frame.cpp
@@ -35,7 +35,7 @@
 #include <dialogs/panel_kicad_launcher.h>
 #include <eda_base_frame.h>
 #include <executable_names.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <policy_keys.h>
 #include <gestfich.h>
 #include <kiplatform/app.h>
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index c287e5aea2..5a923d1e17 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <bitmaps.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <kiplatform/policy.h>
 #include <menus_helpers.h>
 #include <paths.h>
diff --git a/pagelayout_editor/files.cpp b/pagelayout_editor/files.cpp
index 8f02afc10a..2ea46b4a3f 100644
--- a/pagelayout_editor/files.cpp
+++ b/pagelayout_editor/files.cpp
@@ -29,7 +29,7 @@
 #include <drawing_sheet/ds_data_model.h>
 #include <drawing_sheet/ds_file_versions.h>
 #include <paths.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wildcards_and_files_ext.h>
 
 #include "pl_editor_frame.h"
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index ae70101a4f..50525bd278 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <bitmaps.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <kiface_base.h>
 #include <menus_helpers.h>
 #include <tool/action_manager.h>
diff --git a/pcbnew/autorouter/autoplace_tool.cpp b/pcbnew/autorouter/autoplace_tool.cpp
index 7fe0d13c92..3d9abae342 100644
--- a/pcbnew/autorouter/autoplace_tool.cpp
+++ b/pcbnew/autorouter/autoplace_tool.cpp
@@ -24,7 +24,7 @@
 
 #include <board_commit.h>
 #include <tools/pcb_actions.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_progress_reporters.h>
 
 #include "ar_autoplacer.h"
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 3c4f644a5b..87c2807943 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -47,7 +47,7 @@
 #include <ratsnest/ratsnest_data.h>
 #include <kiplatform/app.h>
 #include <widgets/appearance_controls.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_progress_reporters.h>
 #include <settings/settings_manager.h>
 #include <paths.h>
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index 9f6fbeb860..a0f658ccf6 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -26,7 +26,7 @@
 
 #include <advanced_config.h>
 #include <bitmaps.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <kiface_base.h>
 #include <menus_helpers.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index f814f8e688..fb8cb63b04 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -96,7 +96,7 @@
 #include <ratsnest/ratsnest_view_item.h>
 #include <widgets/appearance_controls.h>
 #include <widgets/pcb_search_pane.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/panel_selection_filter.h>
 #include <widgets/pcb_properties_panel.h>
 #include <widgets/wx_aui_utils.h>
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 5803438c6f..1238d8626d 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -41,7 +41,7 @@ using namespace std::placeholders;
 #include <dialogs/dialog_pns_settings.h>
 #include <dialogs/dialog_pns_diff_pair_dimensions.h>
 #include <dialogs/dialog_track_via_size.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/appearance_controls.h>
 #include <connectivity/connectivity_data.h>
 #include <connectivity/connectivity_algo.h>
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index d9cdb58df1..8ed44c3e9a 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -48,7 +48,7 @@
 #include <tools/zone_filler_tool.h>
 #include <view/view.h>
 #include <widgets/appearance_controls.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wx/filedlg.h>
 
 #include <bitmaps.h>
diff --git a/pcbnew/tools/footprint_editor_control.cpp b/pcbnew/tools/footprint_editor_control.cpp
index d246607175..b2f909e10e 100644
--- a/pcbnew/tools/footprint_editor_control.cpp
+++ b/pcbnew/tools/footprint_editor_control.cpp
@@ -32,7 +32,7 @@
 #include <footprint_edit_frame.h>
 #include <pcbnew_id.h>
 #include <confirm.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <footprint.h>
 #include <pad.h>
 #include <pcb_group.h>
diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp
index af58792694..35a51b5fbb 100644
--- a/pcbnew/tools/pad_tool.cpp
+++ b/pcbnew/tools/pad_tool.cpp
@@ -41,7 +41,7 @@
 #include <tools/pcb_selection_conditions.h>
 #include <tools/edit_tool.h>
 #include <dialogs/dialog_enum_pads.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 
 PAD_TOOL::PAD_TOOL() :
         PCB_TOOL_BASE( "pcbnew.PadTool" ),
diff --git a/pcbnew/tools/pcb_control.cpp b/pcbnew/tools/pcb_control.cpp
index 61e94ab3da..66fd2a7e79 100644
--- a/pcbnew/tools/pcb_control.cpp
+++ b/pcbnew/tools/pcb_control.cpp
@@ -59,7 +59,7 @@
 #include <tool/tool_manager.h>
 #include <footprint_edit_frame.h>
 #include <widgets/wx_progress_reporters.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wx/hyperlink.h>
 
 using namespace std::placeholders;
diff --git a/pcbnew/tools/zone_filler_tool.cpp b/pcbnew/tools/zone_filler_tool.cpp
index 52bd4c7bdf..1b9a75edfb 100644
--- a/pcbnew/tools/zone_filler_tool.cpp
+++ b/pcbnew/tools/zone_filler_tool.cpp
@@ -33,7 +33,7 @@
 #include <pcb_group.h>
 #include <board_design_settings.h>
 #include <progress_reporter.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_progress_reporters.h>
 #include <wx/event.h>
 #include <wx/hyperlink.h>
diff --git a/pcbnew/widgets/appearance_controls.cpp b/pcbnew/widgets/appearance_controls.cpp
index 9f4c31e74a..8951535912 100644
--- a/pcbnew/widgets/appearance_controls.cpp
+++ b/pcbnew/widgets/appearance_controls.cpp
@@ -40,13 +40,13 @@
 #include <tools/pcb_actions.h>
 #include <widgets/bitmap_button.h>
 #include <widgets/bitmap_toggle.h>
-#include <widgets/collapsible_pane.h>
+#include <widgets/wx_collapsible_pane.h>
 #include <widgets/color_swatch.h>
 #include <widgets/grid_bitmap_toggle.h>
 #include <widgets/grid_color_swatch_helpers.h>
 #include <widgets/grid_text_helpers.h>
 #include <widgets/indicator_icon.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_grid.h>
 #include <dialogs/eda_view_switcher.h>
 #include <wx/bmpbuttn.h>