diff --git a/pcbnew/dialogs/dialog_constraints_reporter.cpp b/pcbnew/dialogs/dialog_constraints_reporter.cpp
index e3d9dfce66..5f58a6aade 100644
--- a/pcbnew/dialogs/dialog_constraints_reporter.cpp
+++ b/pcbnew/dialogs/dialog_constraints_reporter.cpp
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <dialog_constraints_reporter.h>
 #include <pcb_base_frame.h>
 #include <wx_html_report_box.h>
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index 7589c8d509..c5cdcad131 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <confirm.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp
index 05c4e491b7..34d3d8e38d 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp
@@ -31,7 +31,6 @@
 #include <class_module.h>
 #include <confirm.h>
 #include <dialog_text_entry.h>
-#include <fctsys.h>
 #include <filename_resolver.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
index d5d520166a..05ad4a2b93 100644
--- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
+++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp
@@ -24,11 +24,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <dialog_text_entry.h>
-#include <pcbnew.h>
-#include <kiface_i.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <pcb_edit_frame.h>
 #include <validators.h>
diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp
index efd9e690d5..1c85d04d64 100644
--- a/pcbnew/dialogs/dialog_exchange_footprints.cpp
+++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp
@@ -29,10 +29,8 @@
 #include <class_board.h>
 #include <class_module.h>
 #include <dialog_exchange_footprints.h>
-#include <fctsys.h>
 #include <kicad_string.h>
 #include <kiway.h>
-#include <macros.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
 #include <project.h>
diff --git a/pcbnew/dialogs/dialog_export_svg.cpp b/pcbnew/dialogs/dialog_export_svg.cpp
index c7149273f4..44e302893f 100644
--- a/pcbnew/dialogs/dialog_export_svg.cpp
+++ b/pcbnew/dialogs/dialog_export_svg.cpp
@@ -23,15 +23,11 @@
  */
 
 
-#include <fctsys.h>
-//#include <kiface_i.h>
-//#include <common.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
 #include <wildcards_and_files_ext.h>
 #include <reporter.h>
 #include <confirm.h>
-#include <pcbnew.h>
 #include <pcbplot.h>
 #include <class_board.h>
 #include <dialog_export_svg_base.h>
diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp
index 9a2c431fe5..e1f1b3c1cb 100644
--- a/pcbnew/dialogs/dialog_export_vrml.cpp
+++ b/pcbnew/dialogs/dialog_export_vrml.cpp
@@ -30,11 +30,9 @@
 
 #include <class_board.h>
 #include <confirm.h>
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
-#include <pcbnew.h>
 #include <project/project_file.h>  // LAST_PATH_TYPE
 
 
diff --git a/pcbnew/dialogs/dialog_find.cpp b/pcbnew/dialogs/dialog_find.cpp
index c8e3546ce7..93b0979b40 100644
--- a/pcbnew/dialogs/dialog_find.cpp
+++ b/pcbnew/dialogs/dialog_find.cpp
@@ -29,7 +29,6 @@
 #include <class_pcb_text.h>
 #include <class_text_mod.h>
 #include <dialog_find.h>
-#include <fctsys.h>
 #include <kicad_string.h>
 #include <pcb_edit_frame.h>
 #include <string>
diff --git a/pcbnew/dialogs/dialog_fp_plugin_options.cpp b/pcbnew/dialogs/dialog_fp_plugin_options.cpp
index 613230fe93..d500527328 100644
--- a/pcbnew/dialogs/dialog_fp_plugin_options.cpp
+++ b/pcbnew/dialogs/dialog_fp_plugin_options.cpp
@@ -24,7 +24,6 @@
  */
 
 
-#include <fctsys.h>
 #include <invoke_pcb_dialog.h>
 #include <dialog_fp_plugin_options_base.h>
 #include <fp_lib_table.h>
diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp
index 5ebbcacb33..b0fed6f1ab 100644
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
@@ -54,7 +53,7 @@ int PCB_EDITOR_CONTROL::GenerateDrillFiles( const TOOL_EVENT& aEvent )
 {
     PCB_EDIT_FRAME* editFrame = getEditFrame<PCB_EDIT_FRAME>();
     DIALOG_GENDRILL dlg( editFrame, editFrame );
-    
+
     dlg.ShowModal();
     return 0;
 }
diff --git a/pcbnew/dialogs/dialog_global_deletion.cpp b/pcbnew/dialogs/dialog_global_deletion.cpp
index 3096b9b80f..7778d946ed 100644
--- a/pcbnew/dialogs/dialog_global_deletion.cpp
+++ b/pcbnew/dialogs/dialog_global_deletion.cpp
@@ -24,7 +24,6 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
@@ -62,7 +61,7 @@ int GLOBAL_EDIT_TOOL::GlobalDeletions( const TOOL_EVENT& aEvent )
 {
     PCB_EDIT_FRAME* editFrame = getEditFrame<PCB_EDIT_FRAME>();
     DIALOG_GLOBAL_DELETION dlg( editFrame );
-    
+
     dlg.SetCurrentLayer( frame()->GetActiveLayer() );
     dlg.ShowModal();
     return 0;
diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
index 6568ef4f7c..7980833b58 100644
--- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kicad_string.h>
 #include <board_commit.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
index 5273d47646..1470202a13 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_track.h>
@@ -382,7 +381,7 @@ int GLOBAL_EDIT_TOOL::EditTracksAndVias( const TOOL_EVENT& aEvent )
 {
     PCB_EDIT_FRAME* editFrame = getEditFrame<PCB_EDIT_FRAME>();
     DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS dlg( editFrame );
-    
+
     dlg.ShowQuasiModal();       // QuasiModal required for NET_SELECTOR
     return 0;
 }
diff --git a/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp b/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp
index 10d2137771..d60646a41a 100644
--- a/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp
+++ b/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp
@@ -22,7 +22,6 @@
 
 #include <confirm.h>
 #include <kiface_i.h>
-#include <macros.h>
 
 #include "fp_lib_table.h"
 
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index 5845891523..85bf21bc79 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -26,8 +26,6 @@
  * Edit properties of Lines, Circles, Arcs and Polygons for PCBNew and ModEdit
  */
 
-#include <fctsys.h>
-#include <macros.h>
 #include <confirm.h>
 #include <pcb_base_edit_frame.h>
 #include <wx/valnum.h>
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index 53af06d1bc..95120678d4 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@@ -21,11 +21,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <project.h>
 #include <kiface_i.h>
 #include <confirm.h>
-#include <macros.h>
 #include <html_messagebox.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
index e056a33ea1..a4dfb4e25e 100644
--- a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
+++ b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
@@ -26,7 +26,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <confirm.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
index e5e4f02ec3..3caeca47c4 100644
--- a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp
@@ -29,8 +29,6 @@
 
 #include <algorithm>
 
-#include <fctsys.h>
-#include <common.h>
 #include <confirm.h>
 #include <trigo.h>
 #include <pcb_base_frame.h>
diff --git a/pcbnew/dialogs/dialog_print_pcbnew.cpp b/pcbnew/dialogs/dialog_print_pcbnew.cpp
index ede6a649ab..ad52fb6ed9 100644
--- a/pcbnew/dialogs/dialog_print_pcbnew.cpp
+++ b/pcbnew/dialogs/dialog_print_pcbnew.cpp
@@ -24,11 +24,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <confirm.h>
 #include <base_units.h>
-#include <pcbnew.h>
 #include <pcbnew_settings.h>
 #include <pcbplot.h>
 #include <class_board.h>
diff --git a/pcbnew/dialogs/dialog_rule_area_properties.cpp b/pcbnew/dialogs/dialog_rule_area_properties.cpp
index be1e44b3f6..b8264c12cf 100644
--- a/pcbnew/dialogs/dialog_rule_area_properties.cpp
+++ b/pcbnew/dialogs/dialog_rule_area_properties.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <confirm.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/dialogs/dialog_scripting.cpp b/pcbnew/dialogs/dialog_scripting.cpp
index 426bf5fc8c..f3e3dcdac7 100644
--- a/pcbnew/dialogs/dialog_scripting.cpp
+++ b/pcbnew/dialogs/dialog_scripting.cpp
@@ -30,8 +30,6 @@
 #include <Python.h>
 #undef HAVE_CLOCK_GETTIME  // macro is defined in Python.h and causes redefine warning
 
-#include <fctsys.h>
-#include <pcbnew.h>
 #include <pcb_edit_frame.h>
 #include <dialog_scripting.h>
 
diff --git a/pcbnew/dialogs/dialog_select_net_from_list.cpp b/pcbnew/dialogs/dialog_select_net_from_list.cpp
index d483ca64bd..e38a1ab6c2 100644
--- a/pcbnew/dialogs/dialog_select_net_from_list.cpp
+++ b/pcbnew/dialogs/dialog_select_net_from_list.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <tools/pcb_inspection_tool.h>
 #include <class_board.h>
 #include <class_track.h>
diff --git a/pcbnew/dialogs/dialog_target_properties.cpp b/pcbnew/dialogs/dialog_target_properties.cpp
index 939b3a08e1..ff386f88fb 100644
--- a/pcbnew/dialogs/dialog_target_properties.cpp
+++ b/pcbnew/dialogs/dialog_target_properties.cpp
@@ -23,15 +23,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <base_units.h>
-#include <gr_basic.h>
 #include <board_commit.h>
 #include <class_board.h>
 #include <class_pcb_target.h>
-#include <pcbnew.h>
 #include <dialog_target_properties_base.h>
 #include <widgets/unit_binder.h>
 
diff --git a/pcbnew/dialogs/dialog_text_properties.cpp b/pcbnew/dialogs/dialog_text_properties.cpp
index f4168b66c1..2422aa8cae 100644
--- a/pcbnew/dialogs/dialog_text_properties.cpp
+++ b/pcbnew/dialogs/dialog_text_properties.cpp
@@ -24,8 +24,6 @@
 
 #include <dialog_text_properties.h>
 #include <confirm.h>
-#include <gr_text.h>
-#include <fctsys.h>
 #include <widgets/unit_binder.h>
 #include <board_commit.h>
 #include <class_board.h>
@@ -34,7 +32,6 @@
 #include <class_text_mod.h>
 #include <pcb_edit_frame.h>
 #include <pcb_layer_box_selector.h>
-#include <pcbnew.h>
 #include <wx/valnum.h>
 #include <math/util.h>      // for KiROUND
 
diff --git a/pcbnew/dialogs/panel_display_options.cpp b/pcbnew/dialogs/panel_display_options.cpp
index f39d440693..5c2cdb1fb3 100644
--- a/pcbnew/dialogs/panel_display_options.cpp
+++ b/pcbnew/dialogs/panel_display_options.cpp
@@ -18,8 +18,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fctsys.h>
-#include <pcbnew.h>
 #include <pcb_edit_frame.h>
 #include <pcb_display_options.h>
 #include <pcbnew_settings.h>
diff --git a/pcbnew/dialogs/panel_edit_options.cpp b/pcbnew/dialogs/panel_edit_options.cpp
index f1c2bc355b..a2f41902f1 100644
--- a/pcbnew/dialogs/panel_edit_options.cpp
+++ b/pcbnew/dialogs/panel_edit_options.cpp
@@ -24,12 +24,10 @@
 
 #include <board_design_settings.h>
 #include <class_board.h>
-#include <fctsys.h>
 #include <panel_edit_options.h>
 #include <pcb_edit_frame.h>
 #include <pcb_painter.h>
 #include <pcb_view.h>
-#include <pcbnew.h>
 #include <pcbnew_settings.h>
 #include <widgets/paged_dialog.h>
 #include <footprint_edit_frame.h>
diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp
index bb34c85c24..24fbbdaf16 100644
--- a/pcbnew/dialogs/panel_fp_lib_table.cpp
+++ b/pcbnew/dialogs/panel_fp_lib_table.cpp
@@ -35,7 +35,6 @@
 #include <wx/regex.h>
 #include <wx/grid.h>
 
-#include <fctsys.h>
 #include <project.h>
 #include <3d_viewer/eda_3d_viewer.h>      // for KISYS3DMOD
 #include <panel_fp_lib_table.h>
diff --git a/pcbnew/dialogs/panel_modedit_defaults.cpp b/pcbnew/dialogs/panel_modedit_defaults.cpp
index 8b230f8c81..2f1176e50a 100644
--- a/pcbnew/dialogs/panel_modedit_defaults.cpp
+++ b/pcbnew/dialogs/panel_modedit_defaults.cpp
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <widgets/paged_dialog.h>
 #include <footprint_edit_frame.h>
 #include <footprint_editor_settings.h>
diff --git a/pcbnew/dialogs/panel_pcbnew_display_origin.cpp b/pcbnew/dialogs/panel_pcbnew_display_origin.cpp
index 3914f664f8..ca4081ebd0 100644
--- a/pcbnew/dialogs/panel_pcbnew_display_origin.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_display_origin.cpp
@@ -24,12 +24,10 @@
 
 #include <board_design_settings.h>
 #include <class_board.h>
-#include <fctsys.h>
 #include <panel_pcbnew_display_origin.h>
 #include <pcb_edit_frame.h>
 #include <pcb_painter.h>
 #include <pcb_view.h>
-#include <pcbnew.h>
 #include <pcbnew_id.h>
 #include <widgets/paged_dialog.h>
 
diff --git a/pcbnew/dialogs/panel_setup_layers.cpp b/pcbnew/dialogs/panel_setup_layers.cpp
index c7f507a318..7d6a29d977 100644
--- a/pcbnew/dialogs/panel_setup_layers.cpp
+++ b/pcbnew/dialogs/panel_setup_layers.cpp
@@ -24,8 +24,6 @@
  */
 
 
-#include <fctsys.h>
-#include <macros.h>
 #include <confirm.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/dialogs/panel_setup_mask_and_paste.cpp b/pcbnew/dialogs/panel_setup_mask_and_paste.cpp
index bee09f3698..e8eb5f83dd 100644
--- a/pcbnew/dialogs/panel_setup_mask_and_paste.cpp
+++ b/pcbnew/dialogs/panel_setup_mask_and_paste.cpp
@@ -22,8 +22,6 @@
  */
 
 
-#include <fctsys.h>
-#include <pcbnew.h>
 #include <pcb_edit_frame.h>
 #include <board_design_settings.h>
 #include <dialog_text_entry.h>
diff --git a/pcbnew/dialogs/panel_setup_text_and_graphics.cpp b/pcbnew/dialogs/panel_setup_text_and_graphics.cpp
index 9a6dab9c79..5e26c17e7d 100644
--- a/pcbnew/dialogs/panel_setup_text_and_graphics.cpp
+++ b/pcbnew/dialogs/panel_setup_text_and_graphics.cpp
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <base_units.h>
 #include <pcb_edit_frame.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
index 6be4c09126..0b17220a5f 100644
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
@@ -22,7 +22,6 @@
  */
 
 
-#include <fctsys.h>
 #include <base_units.h>
 #include <pcb_edit_frame.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/drc/drc_rule_condition.cpp b/pcbnew/drc/drc_rule_condition.cpp
index 983095b03f..e8bf33087a 100644
--- a/pcbnew/drc/drc_rule_condition.cpp
+++ b/pcbnew/drc/drc_rule_condition.cpp
@@ -22,7 +22,6 @@
  */
 
 
-#include <fctsys.h>
 #include <class_board_item.h>
 #include <reporter.h>
 #include <drc/drc_rule_condition.h>
diff --git a/qa/qa_utils/mock_pgm.cpp b/qa/qa_utils/mock_pgm.cpp
index 11a51d77c1..9f6329ee44 100644
--- a/qa/qa_utils/mock_pgm.cpp
+++ b/qa/qa_utils/mock_pgm.cpp
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <kiway.h>
diff --git a/qa/qa_utils/mocks.cpp b/qa/qa_utils/mocks.cpp
index f3b39dca88..34861f255f 100644
--- a/qa/qa_utils/mocks.cpp
+++ b/qa/qa_utils/mocks.cpp
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <confirm.h>