diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp
index abe1a3c3f2..5a06d8be75 100644
--- a/common/gr_basic.cpp
+++ b/common/gr_basic.cpp
@@ -24,17 +24,13 @@
 /********************************/
 
 
-#include <fctsys.h>
 #include <gr_basic.h>
-#include <common.h>
 #include <trigo.h>
-#include <macros.h>
 #include <base_struct.h>
 #include <base_screen.h>
 #include <bezier_curves.h>
 #include <math_for_graphics.h>
 #include <wx/graphics.h>
-#include <wx/tokenzr.h>
 #include <geometry/geometry_utils.h>
 #include <math/util.h>      // for KiROUND
 
diff --git a/common/gr_text.cpp b/common/gr_text.cpp
index 843caebd80..84ceb2b87f 100644
--- a/common/gr_text.cpp
+++ b/common/gr_text.cpp
@@ -29,16 +29,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <gr_basic.h>
-#include <common.h>
 #include <plotter.h>
-#include <eda_text.h>               // EDA_TEXT_HJUSTIFY_T and EDA_TEXT_VJUSTIFY_T
+#include <eda_text.h>           // EDA_TEXT_HJUSTIFY_T and EDA_TEXT_VJUSTIFY_T
 #include <trigo.h>
-#include <macros.h>
 #include <base_screen.h>
 #include <gr_text.h>
-#include <math/util.h>      // for KiROUND
+#include <math/util.h>          // for KiROUND
 
 #include <basic_gal.h>
 
diff --git a/cvpcb/readwrite_dlgs.cpp b/cvpcb/readwrite_dlgs.cpp
index 451f023ad1..2e3d35188a 100644
--- a/cvpcb/readwrite_dlgs.cpp
+++ b/cvpcb/readwrite_dlgs.cpp
@@ -24,12 +24,10 @@
  */
 
 #include <confirm.h>
-#include <fctsys.h>
 #include <fp_lib_table.h>
 #include <html_messagebox.h>
 #include <kiway.h>
 #include <lib_id.h>
-#include <macros.h>
 
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>
diff --git a/pagelayout_editor/design_inspector.cpp b/pagelayout_editor/design_inspector.cpp
index 3b9d7f280c..cb75878b9e 100644
--- a/pagelayout_editor/design_inspector.cpp
+++ b/pagelayout_editor/design_inspector.cpp
@@ -24,7 +24,7 @@
 
 #include <wx/imaglist.h>
 #include <wx/wupdlock.h>
-#include <fctsys.h>
+
 #include <ws_draw_item.h>
 #include <ws_data_model.h>
 #include <pl_editor_id.h>
diff --git a/pagelayout_editor/files.cpp b/pagelayout_editor/files.cpp
index c9bdfee0b4..e5a2f1b798 100644
--- a/pagelayout_editor/files.cpp
+++ b/pagelayout_editor/files.cpp
@@ -24,11 +24,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <common.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <macros.h>
 #include <ws_draw_item.h>
 #include <ws_data_model.h>
 #include <pl_editor_frame.h>
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index 7a8806f5ab..f048782358 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/pagelayout_editor/pl_editor_frame.cpp
@@ -23,10 +23,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
-//#include <base_units.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
 #include <dialogs/panel_pl_editor_color_settings.h>
diff --git a/pagelayout_editor/pl_editor_layout.cpp b/pagelayout_editor/pl_editor_layout.cpp
index 5ce16dadc2..2ed97b0cf2 100644
--- a/pagelayout_editor/pl_editor_layout.cpp
+++ b/pagelayout_editor/pl_editor_layout.cpp
@@ -29,8 +29,6 @@
 #include <algorithm>
 #include <climits>
 
-#include <fctsys.h>
-#include <common.h>
 #include <eda_rect.h>
 #include <pl_editor_layout.h>
 
diff --git a/pagelayout_editor/pl_editor_undo_redo.cpp b/pagelayout_editor/pl_editor_undo_redo.cpp
index e21558bbd4..c9f3a32d4b 100644
--- a/pagelayout_editor/pl_editor_undo_redo.cpp
+++ b/pagelayout_editor/pl_editor_undo_redo.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <ws_data_model.h>
 #include <pl_editor_frame.h>
 #include <tool/tool_manager.h>
diff --git a/pagelayout_editor/properties_frame.cpp b/pagelayout_editor/properties_frame.cpp
index 6648120bf4..39b99edcee 100644
--- a/pagelayout_editor/properties_frame.cpp
+++ b/pagelayout_editor/properties_frame.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <ws_draw_item.h>
 #include <ws_data_model.h>
 #include <project.h>
diff --git a/pagelayout_editor/toolbars_pl_editor.cpp b/pagelayout_editor/toolbars_pl_editor.cpp
index 8c76c839b8..a92a3624a3 100644
--- a/pagelayout_editor/toolbars_pl_editor.cpp
+++ b/pagelayout_editor/toolbars_pl_editor.cpp
@@ -19,9 +19,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fctsys.h>
-#include <common.h>
-#include <macros.h>
 #include <bitmaps.h>
 #include <tool/action_toolbar.h>
 #include <tools/pl_actions.h>
diff --git a/pcbnew/board_connected_item.cpp b/pcbnew/board_connected_item.cpp
index 57d2bbdd5a..78178a2173 100644
--- a/pcbnew/board_connected_item.cpp
+++ b/pcbnew/board_connected_item.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <class_board.h>
 #include <class_board_item.h>
 #include <connectivity/connectivity_data.h>
diff --git a/pcbnew/board_design_settings.cpp b/pcbnew/board_design_settings.cpp
index c8d308c5b4..50853b29a3 100644
--- a/pcbnew/board_design_settings.cpp
+++ b/pcbnew/board_design_settings.cpp
@@ -21,8 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <common.h>
 #include <class_dimension.h>
 #include <class_track.h>
 #include <layers_id_colors_and_visibility.h>
diff --git a/pcbnew/board_items_to_polygon_shape_transform.cpp b/pcbnew/board_items_to_polygon_shape_transform.cpp
index 4328e844f6..973cdffdc6 100644
--- a/pcbnew/board_items_to_polygon_shape_transform.cpp
+++ b/pcbnew/board_items_to_polygon_shape_transform.cpp
@@ -22,11 +22,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <vector>
 #include <bezier_curves.h>
 #include <base_units.h>     // for IU_PER_MM
-#include <gr_text.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
 #include <trigo.h>
diff --git a/pcbnew/build_BOM_from_board.cpp b/pcbnew/build_BOM_from_board.cpp
index fce0b23e3b..337399569e 100644
--- a/pcbnew/build_BOM_from_board.cpp
+++ b/pcbnew/build_BOM_from_board.cpp
@@ -25,7 +25,6 @@
 /* build_BOM_from_board.cpp */
 
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <kicad_string.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 48410bb5a3..fc65b1e1ab 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -27,7 +27,6 @@
 
 #include <algorithm>
 #include <iterator>
-#include <fctsys.h>
 #include <pcb_base_frame.h>
 #include <reporter.h>
 #include <ws_proxy_view_item.h>
diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp
index c6cea0cc4d..8785710bc9 100644
--- a/pcbnew/class_board_item.cpp
+++ b/pcbnew/class_board_item.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcbnew.h>
 #include <wx/debug.h>
 
diff --git a/pcbnew/class_dimension.cpp b/pcbnew/class_dimension.cpp
index 54f6ac5895..6949771b48 100644
--- a/pcbnew/class_dimension.cpp
+++ b/pcbnew/class_dimension.cpp
@@ -24,8 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
 #include <bitmaps.h>
 #include <pcb_edit_frame.h>
 #include <base_units.h>
diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index 216de870d3..385ceeed1b 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -24,8 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
 #include <bezier_curves.h>
 #include <pcb_screen.h>
 #include <bitmaps.h>
diff --git a/pcbnew/class_edge_mod.cpp b/pcbnew/class_edge_mod.cpp
index 7095a87010..175ba7c03b 100644
--- a/pcbnew/class_edge_mod.cpp
+++ b/pcbnew/class_edge_mod.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <bitmaps.h>
 #include <math/util.h>      // for KiROUND
 #include <settings/color_settings.h>
diff --git a/pcbnew/class_marker_pcb.cpp b/pcbnew/class_marker_pcb.cpp
index a4407f84a6..9bc4b31bb7 100644
--- a/pcbnew/class_marker_pcb.cpp
+++ b/pcbnew/class_marker_pcb.cpp
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
 #include <bitmaps.h>
 #include <base_units.h>
 #include <pcb_base_frame.h>
@@ -78,7 +76,7 @@ MARKER_PCB* MARKER_PCB::Deserialize( const wxString& data )
                              (int) strtol( props[2].c_str(), nullptr, 10 ) );
 
     std::shared_ptr<DRC_ITEM> drcItem =  DRC_ITEM::Create( props[0] );
-    
+
     if( !drcItem )
         return nullptr;
 
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 2e9fe27eb3..36c26b7b51 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -24,8 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
 #include <confirm.h>
 #include <refdes_utils.h>
 #include <bitmaps.h>
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 3086dcfb8b..71a56f693d 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -28,9 +28,6 @@
  * D_PAD class implementation.
  */
 
-#include <fctsys.h>
-#include <trigo.h>
-#include <macros.h>
 #include <msgpanel.h>
 #include <base_units.h>
 #include <bitmaps.h>
diff --git a/pcbnew/class_pcb_target.cpp b/pcbnew/class_pcb_target.cpp
index 17f69f56a6..9f8cea1a0f 100644
--- a/pcbnew/class_pcb_target.cpp
+++ b/pcbnew/class_pcb_target.cpp
@@ -29,8 +29,6 @@
  * PCB_TARGET class definition - targets for photo plots, formerly called MIRE (from French 'mire optique')
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
 #include <bitmaps.h>
 #include <pcb_edit_frame.h>
 #include <class_board.h>
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index c31c7fc773..9182803fd6 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <base_struct.h>
 #include <pcb_edit_frame.h>
 #include <base_units.h>
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index 4a821ae99b..4fe1260d8c 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <bitmaps.h>
@@ -457,10 +456,7 @@ wxString TEXTE_MODULE::GetShownText( int aDepth ) const
 
 std::shared_ptr<SHAPE> TEXTE_MODULE::GetEffectiveShape( PCB_LAYER_ID aLayer ) const
 {
-    const MODULE* module = static_cast<MODULE*>( GetParent() );
-    auto shape = GetEffectiveTextShape();
-
-    return shape;
+    return GetEffectiveTextShape();
 }
 
 
diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index e247001dc5..d36a02ada3 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_base_frame.h>
 #include <connectivity/connectivity_data.h>
 #include <class_board.h>
diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index c9f283e8ee..a10261c5ca 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -24,7 +24,6 @@
  */
 
 #include <bitmaps.h>
-#include <fctsys.h>
 #include <geometry/geometry_utils.h>
 #include <geometry/shape_null.h>
 #include <advanced_config.h>
diff --git a/pcbnew/cleanup_item.cpp b/pcbnew/cleanup_item.cpp
index 6ff31884f1..ee14a611f3 100644
--- a/pcbnew/cleanup_item.cpp
+++ b/pcbnew/cleanup_item.cpp
@@ -22,7 +22,6 @@
  */
 
 
-#include <fctsys.h>
 #include <cleanup_item.h>
 #include <pcb_base_frame.h>
 
diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index 8148d69a76..c2e200ce2d 100644
--- a/pcbnew/cross-probing.cpp
+++ b/pcbnew/cross-probing.cpp
@@ -36,10 +36,8 @@
 #include <class_track.h>
 #include <collectors.h>
 #include <eda_dde.h>
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <kiway_express.h>
-#include <macros.h>
 #include <netlist_reader/pcb_netlist.h>
 #include <netlist_reader/board_netlist_updater.h>
 #include <pcb_edit_frame.h>
@@ -236,8 +234,8 @@ void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
 
         pcb->HighLightON();
 
-        auto merge_area = 
-            [netcode, &bbox]( BOARD_CONNECTED_ITEM* aItem ) 
+        auto merge_area =
+            [netcode, &bbox]( BOARD_CONNECTED_ITEM* aItem )
             {
             if( aItem->GetNetCode() == netcode )
             {
@@ -316,7 +314,7 @@ void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
         screenSize.y = std::max( 10.0, screenSize.y );
         double ratio = std::max( -1.0, fabs( bbSize.y / screenSize.y ) );
         // Original KiCad code for how much to scale the zoom
-        double kicadRatio = std::max( fabs( bbSize.x / screenSize.x ), 
+        double kicadRatio = std::max( fabs( bbSize.x / screenSize.x ),
                                       fabs( bbSize.y / screenSize.y ) );
 
         // LUT to scale zoom ratio to provide reasonable schematic context.  Must work
diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 86b0475d92..93656641b3 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -39,7 +39,6 @@
 #include <dialogs/panel_modedit_defaults.h>
 #include <dialogs/panel_display_options.h>
 #include <dialogs/panel_edit_options.h>
-#include <fctsys.h>
 #include <footprint_edit_frame.h>
 #include <footprint_editor_settings.h>
 #include <footprint_info_impl.h>
diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp
index 38ecba9ebb..f3bf9dbfc7 100644
--- a/pcbnew/footprint_info_impl.cpp
+++ b/pcbnew/footprint_info_impl.cpp
@@ -23,8 +23,6 @@
 #include <footprint_info_impl.h>
 
 #include <class_module.h>
-#include <common.h>
-#include <fctsys.h>
 #include <footprint_info.h>
 #include <fp_lib_table.h>
 #include <html_messagebox.h>
@@ -32,7 +30,6 @@
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <lib_id.h>
-#include <macros.h>
 #include <pgm_base.h>
 #include <wildcards_and_files_ext.h>
 #include <widgets/progress_reporter.h>
diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index b945f18a2b..14ee839d1e 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -22,7 +22,6 @@
  */
 
 #include <wx/ffile.h>
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <confirm.h>
@@ -30,7 +29,6 @@
 #include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <filter_reader.h>
-#include <macros.h>
 #include <fp_lib_table.h>
 #include <validators.h>
 #include <dialog_text_entry.h>
diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
index bc342e8dd3..3800587d2e 100644
--- a/pcbnew/footprint_viewer_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -31,7 +31,6 @@
 #include <confirm.h>
 #include <dialog_helpers.h>
 #include <eda_pattern_match.h>
-#include <fctsys.h>
 #include <footprint_info.h>
 #include <footprint_viewer_frame.h>
 #include <fp_lib_table.h>
diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index a11a480a92..4f7eb759f7 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -24,13 +24,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <pcb_draw_panel_gal.h>
 #include <pcb_edit_frame.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <msgpanel.h>
-#include <macros.h>
 #include <bitmaps.h>
 #include <grid_tricks.h>
 #include <class_board.h>
diff --git a/pcbnew/footprint_wizard_frame_functions.cpp b/pcbnew/footprint_wizard_frame_functions.cpp
index 5ddda80e9d..adaf7e50e8 100644
--- a/pcbnew/footprint_wizard_frame_functions.cpp
+++ b/pcbnew/footprint_wizard_frame_functions.cpp
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
 #include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 
diff --git a/pcbnew/graphics_cleaner.cpp b/pcbnew/graphics_cleaner.cpp
index fc07327394..589f544bbb 100644
--- a/pcbnew/graphics_cleaner.cpp
+++ b/pcbnew/graphics_cleaner.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <reporter.h>
 #include <board_commit.h>
 #include <cleanup_item.h>
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 00c111d643..2be868450a 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -20,7 +20,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <kiway.h>
 #include <pgm_base.h>
diff --git a/pcbnew/pcb_screen.cpp b/pcbnew/pcb_screen.cpp
index 04b6fe0e4d..e9e8ef9ffb 100644
--- a/pcbnew/pcb_screen.cpp
+++ b/pcbnew/pcb_screen.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_screen.h>
 #include <layers_id_colors_and_visibility.h>
 
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index 8158cfe1e2..f84439d85a 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_edit_frame.h>
 #include <panel_hotkeys_editor.h>
 #include <panel_edit_options.h>
diff --git a/pcbnew/toolbars_footprint_editor.cpp b/pcbnew/toolbars_footprint_editor.cpp
index 676fadd2f3..9a79805578 100644
--- a/pcbnew/toolbars_footprint_editor.cpp
+++ b/pcbnew/toolbars_footprint_editor.cpp
@@ -20,9 +20,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fctsys.h>
 #include <tool/actions.h>
-#include <pcbnew.h>
 #include <class_board.h>
 #include <footprint_edit_frame.h>
 #include <dialog_helpers.h>
diff --git a/pcbnew/toolbars_pcb_editor.cpp b/pcbnew/toolbars_pcb_editor.cpp
index ba7f1f92d8..7d74ca7c40 100644
--- a/pcbnew/toolbars_pcb_editor.cpp
+++ b/pcbnew/toolbars_pcb_editor.cpp
@@ -24,16 +24,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <memory>
+
 #include <bitmaps.h>
 #include <class_board.h>
 #include <confirm.h>
 #include <dialog_helpers.h>
-#include <fctsys.h>
 #include <kiface_i.h>
-#include <memory>
 #include <pcb_edit_frame.h>
 #include <pcb_layer_box_selector.h>
-#include <pcbnew.h>
 #include <pcbnew_id.h>
 #include <pcbnew_settings.h>
 #include <pgm_base.h>