diff --git a/common/dsnlexer.cpp b/common/dsnlexer.cpp
index 8824af6916..6bdb2e6ee5 100644
--- a/common/dsnlexer.cpp
+++ b/common/dsnlexer.cpp
@@ -3,7 +3,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2007-2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2007-2020 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2007-2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -29,13 +29,8 @@
 #include <cstdlib>         // bsearch()
 #include <cctype>
 
-#include <macros.h>
-#include <fctsys.h>
 #include <dsnlexer.h>
 
-
-//#define STANDALONE  1       // enable this for stand alone testing.
-
 #define FMT_CLIPBOARD       _( "clipboard" )
 
 
diff --git a/gerbview/clear_gbr_drawlayers.cpp b/gerbview/clear_gbr_drawlayers.cpp
index 7cf1cf63e9..2ec0e45428 100644
--- a/gerbview/clear_gbr_drawlayers.cpp
+++ b/gerbview/clear_gbr_drawlayers.cpp
@@ -27,7 +27,6 @@
  * @brief erase a given or all draw layers, an free memory relative to the cleared layer(s)
  */
 
-//#include <fctsys.h>
 #include <confirm.h>
 #include <gerbview_frame.h>
 #include <gerber_file_image.h>
diff --git a/gerbview/excellon_read_drill_file.cpp b/gerbview/excellon_read_drill_file.cpp
index 242adda288..a5765f3b47 100644
--- a/gerbview/excellon_read_drill_file.cpp
+++ b/gerbview/excellon_read_drill_file.cpp
@@ -62,9 +62,6 @@
  */
 
 
-#include <fctsys.h>
-#include <common.h>
-#include <confirm.h>
 #include <math/util.h>      // for KiROUND
 
 #include <gerbview.h>
diff --git a/gerbview/select_layers_to_pcb.cpp b/gerbview/select_layers_to_pcb.cpp
index 03f353054c..cbbad6d8ed 100644
--- a/gerbview/select_layers_to_pcb.cpp
+++ b/gerbview/select_layers_to_pcb.cpp
@@ -27,7 +27,6 @@
  */
 
 #include <X2_gerber_attributes.h>
-#include <fctsys.h>
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
 #include <gerbview.h>
diff --git a/pcb_calculator/pcb_calculator.cpp b/pcb_calculator/pcb_calculator.cpp
index ad5fb9cf4c..6fb403db84 100644
--- a/pcb_calculator/pcb_calculator.cpp
+++ b/pcb_calculator/pcb_calculator.cpp
@@ -17,22 +17,15 @@
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <fctsys.h>
+
 #include <pgm_base.h>
 #include <kiface_i.h>
-#include <confirm.h>
-#include <gestfich.h>
 #include <settings/settings_manager.h>
 
-#include <wx/wx.h>
-
 #include <pcb_calculator_frame_base.h>
 #include <pcb_calculator_settings.h>
 #include <pcb_calculator.h>
 
-#include <bitmaps.h>
-#include <build_version.h>
-
 // Pcb_calculator data file extension:
 const wxString PcbCalcDataFileExt( wxT("pcbcalc") );
 
diff --git a/pcbnew/eagle_plugin.cpp b/pcbnew/eagle_plugin.cpp
index dbe6b55ca5..3cccf30b13 100644
--- a/pcbnew/eagle_plugin.cpp
+++ b/pcbnew/eagle_plugin.cpp
@@ -54,16 +54,13 @@ Load() TODO's
 
 #include <wx/string.h>
 #include <wx/xml/xml.h>
+#include <wx/filename.h>
 
-#include <common.h>
 #include <convert_basic_shapes_to_polygon.h>
-#include <fctsys.h>
 #include <geometry/geometry_utils.h>
 #include <kicad_string.h>
-#include <macros.h>
 #include <properties.h>
 #include <trigo.h>
-#include <wx/filename.h>
 #include <math/util.h>      // for KiROUND
 
 #include <class_board.h>
@@ -2505,7 +2502,7 @@ PCB_LAYER_ID EAGLE_PLUGIN::kicad_layer( int aEagleLayer ) const
 
         case EAGLE_LAYER::TKEEPOUT:      kiLayer = F_CrtYd;      break;
         case EAGLE_LAYER::BKEEPOUT:      kiLayer = B_CrtYd;      break;
-        
+
         case EAGLE_LAYER::MILLING:
         case EAGLE_LAYER::TTEST:
         case EAGLE_LAYER::BTEST:
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index f85542e052..62e52a9294 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -24,7 +24,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>
diff --git a/pcbnew/edit_track_width.cpp b/pcbnew/edit_track_width.cpp
index da712b171f..221a9e2fbe 100644
--- a/pcbnew/edit_track_width.cpp
+++ b/pcbnew/edit_track_width.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_id.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index b7dc8b523b..0a8cdfcb0a 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
diff --git a/pcbnew/gpcb_plugin.cpp b/pcbnew/gpcb_plugin.cpp
index ef29ac3a87..fcf633dd67 100644
--- a/pcbnew/gpcb_plugin.cpp
+++ b/pcbnew/gpcb_plugin.cpp
@@ -27,10 +27,6 @@
  * @brief Geda PCB file plugin implementation file.
  */
 
-#include <fctsys.h>
-#include <common.h>
-#include <macros.h>
-#include <trigo.h>
 #include <wildcards_and_files_ext.h>
 #include <filter_reader.h>
 #include <trace_helpers.h>
diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp
index f6761a3518..a47e1a2945 100644
--- a/pcbnew/initpcb.cpp
+++ b/pcbnew/initpcb.cpp
@@ -26,7 +26,6 @@
  * @file pcbnew/initpcb.cpp
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <pcb_edit_frame.h>
 #include <project.h>
diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp
index a20b6cc991..8dbc0225f0 100644
--- a/pcbnew/kicad_plugin.cpp
+++ b/pcbnew/kicad_plugin.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <build_version.h>      // LEGACY_BOARD_FILE_VERSION
 #include <wildcards_and_files_ext.h>
 #include <advanced_config.h>
diff --git a/pcbnew/netinfo_item.cpp b/pcbnew/netinfo_item.cpp
index 2c8518dc98..dd9a8af87e 100644
--- a/pcbnew/netinfo_item.cpp
+++ b/pcbnew/netinfo_item.cpp
@@ -27,7 +27,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_base_frame.h>
 #include <kicad_string.h>
 #include <msgpanel.h>
diff --git a/pcbnew/netinfo_list.cpp b/pcbnew/netinfo_list.cpp
index 6d08f00856..4ff70473cb 100644
--- a/pcbnew/netinfo_list.cpp
+++ b/pcbnew/netinfo_list.cpp
@@ -21,11 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-//#include <gr_basic.h>
-//#include <common.h>
-//#include <macros.h>
-//#include <pcbnew.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_pad.h>
diff --git a/pcbnew/pad_custom_shape_functions.cpp b/pcbnew/pad_custom_shape_functions.cpp
index 10a135a025..6aee4f2692 100644
--- a/pcbnew/pad_custom_shape_functions.cpp
+++ b/pcbnew/pad_custom_shape_functions.cpp
@@ -27,9 +27,6 @@
  * D_PAD functions specific to custom shaped pads.
  */
 
-#include <fctsys.h>
-#include <trigo.h>
-#include <pcbnew.h>
 #include <class_board.h>
 #include <class_board_item.h>
 #include <class_drawsegment.h>
diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp
index 3ed56dedfe..42be9141aa 100644
--- a/pcbnew/pcb_base_frame.cpp
+++ b/pcbnew/pcb_base_frame.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <confirm.h>
 #include <dialog_helpers.h>
@@ -33,7 +32,6 @@
 #include <msgpanel.h>
 #include <pgm_base.h>
 #include <3d_viewer/eda_3d_viewer.h>          // To include VIEWER3D_FRAMENAME
-#include <pcbnew.h>
 #include <footprint_editor_settings.h>
 #include <fp_lib_table.h>
 #include <pcbnew_id.h>
@@ -43,7 +41,7 @@
 #include <collectors.h>
 #include <pcb_draw_panel_gal.h>
 #include <math/vector2d.h>
-#include <trigo.h>
+
 #include <pcb_painter.h>
 #include <settings/settings_manager.h>
 #include <pcbnew_settings.h>
diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
index 024b4fc868..e5c8f70e4d 100644
--- a/pcbnew/pcbnew.cpp
+++ b/pcbnew/pcbnew.cpp
@@ -32,12 +32,10 @@
  #include <python_scripting.h>
  #include <pcbnew_scripting_helpers.h>
 #endif
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <kiface_ids.h>
 #include <confirm.h>
-#include <macros.h>
 #include <pcb_edit_frame.h>
 #include <eda_dde.h>
 #include <wx/file.h>
diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp
index 240d1f1327..88ee6ad25e 100644
--- a/pcbnew/pcbplot.cpp
+++ b/pcbnew/pcbplot.cpp
@@ -27,20 +27,16 @@
  * @file pcbnew/pcbplot.cpp
  */
 
-#include <fctsys.h>
 #include <plotter.h>
-#include <confirm.h>
 #include <pcb_edit_frame.h>
 #include <pcbplot.h>
 #include <base_units.h>
 #include <reporter.h>
 #include <class_board.h>
-#include <pcbnew.h>
 #include <plotcontroller.h>
 #include <pcb_plot_params.h>
 #include <wx/ffile.h>
 #include <dialog_plot.h>
-#include <macros.h>
 #include <build_version.h>
 #include <gbr_metadata.h>
 
diff --git a/pcbnew/plot_board_layers.cpp b/pcbnew/plot_board_layers.cpp
index 070a455adf..8434071a77 100644
--- a/pcbnew/plot_board_layers.cpp
+++ b/pcbnew/plot_board_layers.cpp
@@ -29,14 +29,10 @@
  */
 
 
-#include <fctsys.h>
 #include <base_struct.h>
-#include <gr_text.h>
 #include <geometry/geometry_utils.h>
 #include <geometry/shape_segment.h>
-#include <trigo.h>
 #include <pcb_base_frame.h>
-#include <macros.h>
 #include <math/util.h>      // for KiROUND
 
 #include <class_board.h>
@@ -49,7 +45,6 @@
 #include <class_pcb_target.h>
 #include <class_dimension.h>
 
-#include <pcbnew.h>
 #include <pcbplot.h>
 #include <pcb_painter.h>
 #include <gbr_metadata.h>
diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp
index 6c20ae99de..0a9edf20ba 100644
--- a/pcbnew/sel_layer.cpp
+++ b/pcbnew/sel_layer.cpp
@@ -23,8 +23,6 @@
  */
 
 
-#include <fctsys.h>
-#include <common.h>
 #include <confirm.h>
 #include <pcb_base_frame.h>
 #include <widgets/layer_box_selector.h>
diff --git a/pcbnew/zone_settings.cpp b/pcbnew/zone_settings.cpp
index d40b203a4b..aeba709539 100644
--- a/pcbnew/zone_settings.cpp
+++ b/pcbnew/zone_settings.cpp
@@ -29,8 +29,6 @@
 
 #include <zone_settings.h>
 
-#include <fctsys.h>
-
 #include <convert_to_biu.h>
 #include <pcbnew.h>
 #include <pcb_base_frame.h>