From d946d6e68fd72cbcf1d2053c5ace46bece79df17 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Tue, 8 Jun 2021 21:56:00 -0400
Subject: [PATCH] Cleanup some pgm_base.h includes

---
 3d-viewer/3d_cache/3d_plugin_manager.cpp               | 1 -
 bitmap2component/bitmap2cmp_gui.cpp                    | 1 -
 common/env_paths.cpp                                   | 2 ++
 common/gal/dpi_scaling.cpp                             | 1 -
 common/kiway_player.cpp                                | 1 -
 common/languages_menu.cpp                              | 2 +-
 common/project.cpp                                     | 1 -
 common/widgets/grid_text_button_helpers.cpp            | 1 +
 eeschema/dialogs/dialog_edit_components_libid.cpp      | 1 -
 eeschema/dialogs/dialog_edit_line_style.cpp            | 1 -
 eeschema/dialogs/dialog_erc.cpp                        | 1 -
 eeschema/dialogs/dialog_junction_props.cpp             | 1 -
 eeschema/dialogs/dialog_lib_edit_text.cpp              | 1 -
 eeschema/dialogs/panel_eeschema_editing_options.cpp    | 1 -
 eeschema/dialogs/panel_setup_pinmap.cpp                | 1 -
 eeschema/getpart.cpp                                   | 1 -
 eeschema/lib_field.cpp                                 | 1 -
 eeschema/menubar.cpp                                   | 1 -
 eeschema/netlist_exporters/netlist_exporter_base.cpp   | 1 -
 eeschema/netlist_exporters/netlist_exporter_pspice.cpp | 1 +
 eeschema/netlist_exporters/netlist_generator.cpp       | 1 -
 eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp        | 1 -
 eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp      | 1 -
 eeschema/sch_screen.cpp                                | 1 -
 eeschema/symbol_editor/menubar_symbol_editor.cpp       | 1 -
 eeschema/symbol_editor/symbol_editor.cpp               | 1 -
 gerbview/events_called_functions.cpp                   | 1 -
 gerbview/widgets/dcode_selection_box.cpp               | 1 -
 include/env_paths.h                                    | 6 +++++-
 pagelayout_editor/menubar.cpp                          | 1 -
 pcbnew/dialogs/dialog_drc.cpp                          | 1 -
 pcbnew/dialogs/dialog_export_svg.cpp                   | 1 +
 pcbnew/dialogs/dialog_gendrill.cpp                     | 1 +
 pcbnew/dialogs/dialog_plot.cpp                         | 1 +
 pcbnew/edit.cpp                                        | 1 -
 pcbnew/exporters/gen_footprints_placefile.cpp          | 1 -
 pcbnew/exporters/gendrill_Excellon_writer.cpp          | 1 -
 pcbnew/exporters/gendrill_gerber_writer.cpp            | 1 -
 pcbnew/exporters/gerber_placefile_writer.cpp           | 1 -
 pcbnew/files.cpp                                       | 1 -
 pcbnew/footprint_info_impl.cpp                         | 1 -
 pcbnew/load_select_footprint.cpp                       | 1 -
 pcbnew/menubar_pcb_editor.cpp                          | 1 -
 pcbnew/pcbnew_config.cpp                               | 1 +
 pcbnew/pcbplot.h                                       | 1 -
 pcbnew/python/scripting/pcbnew_scripting.cpp           | 1 -
 pcbnew/router/pns_router.cpp                           | 1 -
 pcbnew/zones_functions_for_undo_redo.cpp               | 1 -
 48 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/3d-viewer/3d_cache/3d_plugin_manager.cpp b/3d-viewer/3d_cache/3d_plugin_manager.cpp
index e51d8a5261..130a912fb3 100644
--- a/3d-viewer/3d_cache/3d_plugin_manager.cpp
+++ b/3d-viewer/3d_cache/3d_plugin_manager.cpp
@@ -36,7 +36,6 @@
 
 #include <common.h>
 #include <paths.h>
-#include <pgm_base.h>
 #include "3d_plugin_manager.h"
 #include "plugins/3d/3d_plugin.h"
 #include "3d_cache/sg/scenegraph.h"
diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index 9464cc9504..092a7983b5 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@@ -30,7 +30,6 @@
 #include <kiface_i.h>
 #include <math/util.h>      // for KiROUND
 #include <kiway.h>
-#include <pgm_base.h>
 #include <potracelib.h>
 #include <wildcards_and_files_ext.h>
 #include <wx/clipbrd.h>
diff --git a/common/env_paths.cpp b/common/env_paths.cpp
index d4df557ef7..e57de058de 100644
--- a/common/env_paths.cpp
+++ b/common/env_paths.cpp
@@ -21,6 +21,8 @@
  */
 
 #include <env_paths.h>
+#include <project.h>
+#include <wx/filename.h>
 
 static bool normalizeAbsolutePaths( const wxFileName& aPathA, const wxFileName& aPathB,
                                     wxString* aResultPath )
diff --git a/common/gal/dpi_scaling.cpp b/common/gal/dpi_scaling.cpp
index 4b2cca695f..675dbb3647 100644
--- a/common/gal/dpi_scaling.cpp
+++ b/common/gal/dpi_scaling.cpp
@@ -26,7 +26,6 @@
 #include <core/optional.h>
 
 #include <env_vars.h>
-#include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <kiplatform/ui.h>
 
diff --git a/common/kiway_player.cpp b/common/kiway_player.cpp
index 4889bd12f7..99f79bed5a 100644
--- a/common/kiway_player.cpp
+++ b/common/kiway_player.cpp
@@ -23,7 +23,6 @@
  */
 
 
-#include <pgm_base.h>
 #include <kiway_player.h>
 #include <kiway_express.h>
 #include <kiway.h>
diff --git a/common/languages_menu.cpp b/common/languages_menu.cpp
index deb09c6a04..dbfafa2caa 100644
--- a/common/languages_menu.cpp
+++ b/common/languages_menu.cpp
@@ -27,9 +27,9 @@
  * @brief build the standard menu to show the list of available translations
  */
 
-#include <pgm_base.h>
 #include <id.h>
 #include <menus_helpers.h>
+#include <pgm_base.h> // LanguagesList
 #include <tool/tool_interactive.h>
 #include <tool/action_menu.h>
 #include <tool/conditional_menu.h>
diff --git a/common/project.cpp b/common/project.cpp
index 0aaaf5e27c..02d3ab70c3 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -32,7 +32,6 @@
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <macros.h>
-#include <pgm_base.h>
 #include <project.h>
 #include <project/project_file.h>
 #include <trace_helpers.h>
diff --git a/common/widgets/grid_text_button_helpers.cpp b/common/widgets/grid_text_button_helpers.cpp
index e7ad651b80..ae01329058 100644
--- a/common/widgets/grid_text_button_helpers.cpp
+++ b/common/widgets/grid_text_button_helpers.cpp
@@ -33,6 +33,7 @@
 #include <dialog_shim.h>
 #include <common.h>
 #include <env_paths.h>
+#include <pgm_base.h>
 #include <widgets/wx_grid.h>
 #include <widgets/grid_text_button_helpers.h>
 #include <eda_doc.h>
diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp
index 9144676bf7..94b9d9f23e 100644
--- a/eeschema/dialogs/dialog_edit_components_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_components_libid.cpp
@@ -34,7 +34,6 @@
 #include <sch_symbol.h>
 #include <sch_reference_list.h>
 #include <schematic.h>
-#include <pgm_base.h>
 #include <symbol_lib_table.h>
 #include <trace_helpers.h>
 #include <widgets/wx_grid.h>
diff --git a/eeschema/dialogs/dialog_edit_line_style.cpp b/eeschema/dialogs/dialog_edit_line_style.cpp
index 7aa5f30d0f..6da2c96b02 100644
--- a/eeschema/dialogs/dialog_edit_line_style.cpp
+++ b/eeschema/dialogs/dialog_edit_line_style.cpp
@@ -26,7 +26,6 @@
 #include <sch_line.h>
 #include <dialog_edit_line_style.h>
 #include <dialogs/dialog_color_picker.h>
-#include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <sch_edit_frame.h>
 #include <widgets/color_swatch.h>
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 5731ef255f..4469b6ed5b 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -24,7 +24,6 @@
  */
 
 #include <gestfich.h>
-#include <pgm_base.h>
 #include <sch_screen.h>
 #include <sch_edit_frame.h>
 #include <schematic.h>
diff --git a/eeschema/dialogs/dialog_junction_props.cpp b/eeschema/dialogs/dialog_junction_props.cpp
index 1b5a194de6..42d515ad59 100644
--- a/eeschema/dialogs/dialog_junction_props.cpp
+++ b/eeschema/dialogs/dialog_junction_props.cpp
@@ -20,7 +20,6 @@
 
 #include <sch_junction.h>
 #include <dialog_junction_props.h>
-#include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <sch_edit_frame.h>
 #include <widgets/color_swatch.h>
diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp
index 8091f7d0b5..e1241a29ba 100644
--- a/eeschema/dialogs/dialog_lib_edit_text.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_text.cpp
@@ -27,7 +27,6 @@
 #include <settings/settings_manager.h>
 #include <dialog_lib_edit_text.h>
 #include <symbol_editor/symbol_editor_settings.h>
-#include <pgm_base.h>
 #include <tools/symbol_editor_drawing_tools.h>
 
 
diff --git a/eeschema/dialogs/panel_eeschema_editing_options.cpp b/eeschema/dialogs/panel_eeschema_editing_options.cpp
index c4cf7bbd21..1853ca7660 100644
--- a/eeschema/dialogs/panel_eeschema_editing_options.cpp
+++ b/eeschema/dialogs/panel_eeschema_editing_options.cpp
@@ -26,7 +26,6 @@
 #include <settings/settings_manager.h>
 #include <settings/color_settings.h>
 #include <painter.h>
-#include <pgm_base.h>
 #include <eeschema_settings.h>
 #include "panel_eeschema_editing_options.h"
 
diff --git a/eeschema/dialogs/panel_setup_pinmap.cpp b/eeschema/dialogs/panel_setup_pinmap.cpp
index 59f73b28d1..a01326466e 100644
--- a/eeschema/dialogs/panel_setup_pinmap.cpp
+++ b/eeschema/dialogs/panel_setup_pinmap.cpp
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pgm_base.h>
 #include <sch_edit_frame.h>
 #include <kiface_i.h>
 #include <bitmaps.h>
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 2b0d8b82d2..2b94947d20 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -30,7 +30,6 @@
 #include <general.h>
 #include <kiway.h>
 #include <symbol_viewer_frame.h>
-#include <pgm_base.h>
 #include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <symbol_lib_table.h>
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index 3652a62ab9..25a63bdda4 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pgm_base.h>
 #include <eda_item.h>
 #include <gr_text.h>
 #include <kicad_string.h>
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 48a7b2363f..cb8e294a32 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -28,7 +28,6 @@
 #include <filehistory.h>
 #include <kiface_i.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <schematic.h>
 #include <tool/action_manager.h>
 #include <tool/action_menu.h>
diff --git a/eeschema/netlist_exporters/netlist_exporter_base.cpp b/eeschema/netlist_exporters/netlist_exporter_base.cpp
index 831b30f7e7..75910517a9 100644
--- a/eeschema/netlist_exporters/netlist_exporter_base.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_base.cpp
@@ -25,7 +25,6 @@
 
 #include <netlist_exporter_base.h>
 
-#include <pgm_base.h>
 #include <refdes_utils.h>
 
 #include <class_library.h>
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index da7cf9db56..7f83279b66 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -35,6 +35,7 @@
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
 #include <env_paths.h>
+#include <pgm_base.h>
 
 #include <wx/tokenzr.h>
 #include <wx/regex.h>
diff --git a/eeschema/netlist_exporters/netlist_generator.cpp b/eeschema/netlist_exporters/netlist_generator.cpp
index 90b6a7a174..c9fb34da11 100644
--- a/eeschema/netlist_exporters/netlist_generator.cpp
+++ b/eeschema/netlist_exporters/netlist_generator.cpp
@@ -26,7 +26,6 @@
 #include <common.h>     // for ProcessExecute
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <pgm_base.h>
 #include <sch_edit_frame.h>
 #include <schematic.h>
 #include <reporter.h>
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
index 0b9c2482f6..e3a1cbdd2a 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@@ -29,7 +29,6 @@
 #include <wx/log.h>
 #include <wx/mstream.h>
 #include <advanced_config.h>
-#include <pgm_base.h>
 #include <trace_helpers.h>
 #include <locale_io.h>
 #include <sch_bitmap.h>
diff --git a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
index f95498d65c..8e5ea0014f 100644
--- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
+++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
@@ -32,7 +32,6 @@
 #include <wx/textfile.h>
 #include <wx/tokenzr.h>
 
-#include <pgm_base.h>
 #include <gr_text.h>
 #include <kiway.h>
 #include <kicad_string.h>
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 9115046bbd..a72199fa1d 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -36,7 +36,6 @@
 #include <id.h>
 #include <kicad_string.h>
 #include <kiway.h>
-#include <pgm_base.h>
 #include <plotter.h>
 #include <project.h>
 #include <reporter.h>
diff --git a/eeschema/symbol_editor/menubar_symbol_editor.cpp b/eeschema/symbol_editor/menubar_symbol_editor.cpp
index a155837fad..f773d1eafa 100644
--- a/eeschema/symbol_editor/menubar_symbol_editor.cpp
+++ b/eeschema/symbol_editor/menubar_symbol_editor.cpp
@@ -25,7 +25,6 @@
 
 #include <bitmaps.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <tool/action_menu.h>
 #include <tool/tool_manager.h>
 #include <tools/ee_actions.h>
diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp
index cf14b2f5d3..aba84b3046 100644
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pgm_base.h>
 #include <confirm.h>
 #include <kiway.h>
 #include <widgets/infobar.h>
diff --git a/gerbview/events_called_functions.cpp b/gerbview/events_called_functions.cpp
index 5888ffd2b9..1cbebbd556 100644
--- a/gerbview/events_called_functions.cpp
+++ b/gerbview/events_called_functions.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pgm_base.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>
 #include <gerbview_id.h>
diff --git a/gerbview/widgets/dcode_selection_box.cpp b/gerbview/widgets/dcode_selection_box.cpp
index 6dceb7ae2a..c72eabca17 100644
--- a/gerbview/widgets/dcode_selection_box.cpp
+++ b/gerbview/widgets/dcode_selection_box.cpp
@@ -23,7 +23,6 @@
  */
 
 #include <wx/aui/aui.h>
-#include <pgm_base.h>
 #include <dcode.h>
 
 #include "dcode_selection_box.h"
diff --git a/include/env_paths.h b/include/env_paths.h
index 3c84346cfe..88011632f2 100644
--- a/include/env_paths.h
+++ b/include/env_paths.h
@@ -26,7 +26,11 @@
 #ifndef ENV_PATHS_H
 #define ENV_PATHS_H
 
-#include <pgm_base.h>
+#include <wx/string.h>
+#include <settings/environment.h>
+
+class wxFileName;
+class PROJECT;
 
 /**
  * Normalize a file path to an environmental variable, if possible.
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index 73c8dfc3ec..0111727ecb 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -27,7 +27,6 @@
 #include <filehistory.h>
 #include <kiface_i.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <tool/action_manager.h>
 #include <tool/action_menu.h>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index 4d52c8cc1f..2b541a5457 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -31,7 +31,6 @@
 #include <pad.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
-#include <pgm_base.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <wildcards_and_files_ext.h>
diff --git a/pcbnew/dialogs/dialog_export_svg.cpp b/pcbnew/dialogs/dialog_export_svg.cpp
index 9f9c5698bd..59540b29c0 100644
--- a/pcbnew/dialogs/dialog_export_svg.cpp
+++ b/pcbnew/dialogs/dialog_export_svg.cpp
@@ -40,6 +40,7 @@
 #include <widgets/unit_binder.h>
 #include <plotters/plotters_pslike.h>
 #include <wx/dirdlg.h>
+#include <pgm_base.h>
 
 class DIALOG_EXPORT_SVG : public DIALOG_EXPORT_SVG_BASE
 {
diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp
index 06135e07d7..5070c8d953 100644
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@@ -37,6 +37,7 @@
 #include <pad.h>
 #include <track.h>
 #include <paths.h>
+#include <project.h>
 #include <dialog_gendrill.h>
 #include <wildcards_and_files_ext.h>
 #include <reporter.h>
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 867186dc97..0fa96655e6 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -28,6 +28,7 @@
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
 #include <pcbplot.h>
+#include <pgm_base.h>
 #include <gerber_jobfile_writer.h>
 #include <reporter.h>
 #include <wildcards_and_files_ext.h>
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index 298686be51..b4f04c8cca 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pgm_base.h>
 #include <kiface_i.h>
 #include <confirm.h>
 #include <gestfich.h>
diff --git a/pcbnew/exporters/gen_footprints_placefile.cpp b/pcbnew/exporters/gen_footprints_placefile.cpp
index 810f6d9538..e979e51ca9 100644
--- a/pcbnew/exporters/gen_footprints_placefile.cpp
+++ b/pcbnew/exporters/gen_footprints_placefile.cpp
@@ -31,7 +31,6 @@
 #include <gestfich.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
-#include <pgm_base.h>
 #include <bitmaps.h>
 #include <reporter.h>
 #include <tools/board_editor_control.h>
diff --git a/pcbnew/exporters/gendrill_Excellon_writer.cpp b/pcbnew/exporters/gendrill_Excellon_writer.cpp
index 65a19307ce..54af955c48 100644
--- a/pcbnew/exporters/gendrill_Excellon_writer.cpp
+++ b/pcbnew/exporters/gendrill_Excellon_writer.cpp
@@ -40,7 +40,6 @@
 #include <locale_io.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
-#include <pgm_base.h>
 #include <build_version.h>
 #include <math/util.h>      // for KiROUND
 #include <trigo.h>
diff --git a/pcbnew/exporters/gendrill_gerber_writer.cpp b/pcbnew/exporters/gendrill_gerber_writer.cpp
index cdfd6cd4ec..18c13a268d 100644
--- a/pcbnew/exporters/gendrill_gerber_writer.cpp
+++ b/pcbnew/exporters/gendrill_gerber_writer.cpp
@@ -34,7 +34,6 @@
 #include <kicad_string.h>
 #include <locale_io.h>
 #include <pcb_edit_frame.h>
-#include <pgm_base.h>
 #include <board.h>
 #include <footprint.h>
 #include <track.h>
diff --git a/pcbnew/exporters/gerber_placefile_writer.cpp b/pcbnew/exporters/gerber_placefile_writer.cpp
index 37caadeaec..34b70130e0 100644
--- a/pcbnew/exporters/gerber_placefile_writer.cpp
+++ b/pcbnew/exporters/gerber_placefile_writer.cpp
@@ -33,7 +33,6 @@
 #include <locale_io.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
-#include <pgm_base.h>
 
 #include <board.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 486b98e720..428a023dfb 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -30,7 +30,6 @@
 #include <pcb_edit_frame.h>
 #include <board_design_settings.h>
 #include <3d_viewer/eda_3d_viewer.h>
-#include <pgm_base.h>
 #include <widgets/msgpanel.h>
 #include <fp_lib_table.h>
 #include <kiface_i.h>
diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp
index 2b39d94295..fc7247682f 100644
--- a/pcbnew/footprint_info_impl.cpp
+++ b/pcbnew/footprint_info_impl.cpp
@@ -32,7 +32,6 @@
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <lib_id.h>
-#include <pgm_base.h>
 #include <wildcards_and_files_ext.h>
 #include <widgets/progress_reporter.h>
 #include <wx/textfile.h>
diff --git a/pcbnew/load_select_footprint.cpp b/pcbnew/load_select_footprint.cpp
index 301309e441..68be0654d0 100644
--- a/pcbnew/load_select_footprint.cpp
+++ b/pcbnew/load_select_footprint.cpp
@@ -45,7 +45,6 @@ using namespace std::placeholders;
 #include <macros.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
-#include <pgm_base.h>
 #include <view/view_controls.h>
 #include <widgets/lib_tree.h>
 #include <widgets/progress_reporter.h>
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index 9d83604d43..582c8ec42b 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -31,7 +31,6 @@
 #include <menus_helpers.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_id.h>
-#include <pgm_base.h>
 #include <python_scripting.h>
 #include <tool/action_manager.h>
 #include <tool/actions.h>
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index 0f9ab35ac2..fbed5d995c 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -37,6 +37,7 @@
 #include <drawing_sheet/ds_data_model.h>
 #include <pcbplot.h>
 #include <pcb_painter.h>
+#include <project.h>
 #include <invoke_pcb_dialog.h>
 #include <widgets/appearance_controls.h>
 #include <widgets/paged_dialog.h>
diff --git a/pcbnew/pcbplot.h b/pcbnew/pcbplot.h
index 33f17ec388..e755bac28f 100644
--- a/pcbnew/pcbplot.h
+++ b/pcbnew/pcbplot.h
@@ -32,7 +32,6 @@
 #include <layers_id_colors_and_visibility.h>
 #include <pad_shapes.h>
 #include <pcb_plot_params.h>
-#include <pgm_base.h>
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>
 
diff --git a/pcbnew/python/scripting/pcbnew_scripting.cpp b/pcbnew/python/scripting/pcbnew_scripting.cpp
index 62892e8843..be60ea9f05 100644
--- a/pcbnew/python/scripting/pcbnew_scripting.cpp
+++ b/pcbnew/python/scripting/pcbnew_scripting.cpp
@@ -40,7 +40,6 @@
 #include <kicad_string.h>
 #include <macros.h>
 #include <paths.h>
-#include <pgm_base.h>
 #include <settings/settings_manager.h>
 
 #include <kiplatform/environment.h>
diff --git a/pcbnew/router/pns_router.cpp b/pcbnew/router/pns_router.cpp
index d939ebbcca..734e61e48e 100644
--- a/pcbnew/router/pns_router.cpp
+++ b/pcbnew/router/pns_router.cpp
@@ -27,7 +27,6 @@
 #include <view/view_group.h>
 #include <gal/graphics_abstraction_layer.h>
 
-#include <pgm_base.h>
 #include <settings/settings_manager.h>
 
 #include <pcb_painter.h>
diff --git a/pcbnew/zones_functions_for_undo_redo.cpp b/pcbnew/zones_functions_for_undo_redo.cpp
index 49b9491944..e9fc1374eb 100644
--- a/pcbnew/zones_functions_for_undo_redo.cpp
+++ b/pcbnew/zones_functions_for_undo_redo.cpp
@@ -41,7 +41,6 @@
  * are really modified, and ones they are modified (changes, deletion or addition)
  */
 
-#include <pgm_base.h>
 #include <pcb_edit_frame.h>
 
 #include <board.h>