diff --git a/eeschema/schematic_settings.cpp b/eeschema/schematic_settings.cpp
index a812d15dca..702ca0afc0 100644
--- a/eeschema/schematic_settings.cpp
+++ b/eeschema/schematic_settings.cpp
@@ -41,11 +41,11 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin
         m_TextOffsetRatio( 0.08 ),
         m_PinSymbolSize( DEFAULT_TEXT_SIZE * IU_PER_MILS / 2 ),
         m_JunctionSize( DEFAULT_JUNCTION_DIAM * IU_PER_MILS ),
-        m_SpiceAdjustPassiveValues( false ),
         m_IntersheetsRefShow ( false ),
         m_IntersheetsRefFormatShort (false ),
         m_IntersheetsRefPrefix ( DEFAULT_IREF_PREFIX ),
-        m_IntersheetsRefSuffix ( DEFAULT_IREF_SUFFIX )
+        m_IntersheetsRefSuffix ( DEFAULT_IREF_SUFFIX ),
+        m_SpiceAdjustPassiveValues( false )
 {
     EESCHEMA_SETTINGS* appSettings = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
 
diff --git a/gerbview/dialogs/dialog_print_gerbview.cpp b/gerbview/dialogs/dialog_print_gerbview.cpp
index 21458ec1f0..24a5e3bbe9 100644
--- a/gerbview/dialogs/dialog_print_gerbview.cpp
+++ b/gerbview/dialogs/dialog_print_gerbview.cpp
@@ -24,9 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
-#include <common.h>
 #include <confirm.h>
 #include <dialogs/dialog_print_generic.h>
 #include <gerbview_printout.h>
diff --git a/gerbview/dialogs/dialog_select_one_pcb_layer.cpp b/gerbview/dialogs/dialog_select_one_pcb_layer.cpp
index 5827476d91..19802d02e4 100644
--- a/gerbview/dialogs/dialog_select_one_pcb_layer.cpp
+++ b/gerbview/dialogs/dialog_select_one_pcb_layer.cpp
@@ -27,7 +27,6 @@
  * @brief Set up a dialog to choose a PCB Layer.
  */
 
-#include <fctsys.h>
 #include <gerbview_frame.h>
 #include <select_layers_to_pcb.h>
 
diff --git a/gerbview/dialogs/panel_gerbview_display_options.cpp b/gerbview/dialogs/panel_gerbview_display_options.cpp
index 14b0e64218..f406ae7aab 100644
--- a/gerbview/dialogs/panel_gerbview_display_options.cpp
+++ b/gerbview/dialogs/panel_gerbview_display_options.cpp
@@ -18,8 +18,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fctsys.h>
-#include <common.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>
 #include <class_draw_panel_gal.h>
diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem.cpp b/pagelayout_editor/dialogs/dialog_new_dataitem.cpp
index 61384c7cbd..918e899b6e 100644
--- a/pagelayout_editor/dialogs/dialog_new_dataitem.cpp
+++ b/pagelayout_editor/dialogs/dialog_new_dataitem.cpp
@@ -22,8 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <common.h>
 #include <pl_editor_frame.h>
 #include <ws_data_item.h>
 #include <dialog_new_dataitem_base.h>
diff --git a/pagelayout_editor/dialogs/dialogs_for_printing.cpp b/pagelayout_editor/dialogs/dialogs_for_printing.cpp
index cb568f7ef2..afa91548cb 100644
--- a/pagelayout_editor/dialogs/dialogs_for_printing.cpp
+++ b/pagelayout_editor/dialogs/dialogs_for_printing.cpp
@@ -26,7 +26,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <base_units.h>
 #include <pl_editor_frame.h>
 #include <pl_editor_id.h>
diff --git a/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp b/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp
index 218f51f0f6..2e3a2df8fb 100644
--- a/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp
+++ b/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp
@@ -17,7 +17,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fctsys.h>
 #include <pl_editor_settings.h>
 #include <pl_editor_frame.h>
 #include <pgm_base.h>
diff --git a/pagelayout_editor/tools/pl_editor_control.cpp b/pagelayout_editor/tools/pl_editor_control.cpp
index 2317df91e3..f1f919b685 100644
--- a/pagelayout_editor/tools/pl_editor_control.cpp
+++ b/pagelayout_editor/tools/pl_editor_control.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiway.h>
 #include <view/view.h>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/autorouter/ar_autoplacer.cpp b/pcbnew/autorouter/ar_autoplacer.cpp
index 313027cf37..1021286498 100644
--- a/pcbnew/autorouter/ar_autoplacer.cpp
+++ b/pcbnew/autorouter/ar_autoplacer.cpp
@@ -25,11 +25,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <gr_basic.h>
 #include <msgpanel.h>
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/autorouter/spread_footprints.cpp b/pcbnew/autorouter/spread_footprints.cpp
index 8e7129d8ff..a92353374b 100644
--- a/pcbnew/autorouter/spread_footprints.cpp
+++ b/pcbnew/autorouter/spread_footprints.cpp
@@ -35,7 +35,6 @@
  */
 
 #include <algorithm>
-#include <fctsys.h>
 #include <convert_to_biu.h>
 #include <confirm.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/drc/drc_engine.cpp b/pcbnew/drc/drc_engine.cpp
index fa809ea09a..61476dad28 100644
--- a/pcbnew/drc/drc_engine.cpp
+++ b/pcbnew/drc/drc_engine.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <reporter.h>
 #include <widgets/progress_reporter.h>
 #include <drc/drc_engine.h>
diff --git a/pcbnew/drc/drc_item.cpp b/pcbnew/drc/drc_item.cpp
index ee2e9a8d8b..397747abfd 100644
--- a/pcbnew/drc/drc_item.cpp
+++ b/pcbnew/drc/drc_item.cpp
@@ -23,8 +23,6 @@
  */
 
 
-#include <fctsys.h>
-#include <common.h>
 #include "wx/html/m_templ.h"
 #include "wx/html/styleparams.h"
 #include <drc/drc_item.h>
diff --git a/pcbnew/drc/drc_rule.cpp b/pcbnew/drc/drc_rule.cpp
index af5aeeb1e6..7419d959fa 100644
--- a/pcbnew/drc/drc_rule.cpp
+++ b/pcbnew/drc/drc_rule.cpp
@@ -22,7 +22,6 @@
  */
 
 
-#include <fctsys.h>
 #include <class_board.h>
 #include <class_board_item.h>
 #include <drc/drc_rule.h>
diff --git a/pcbnew/drc/drc_rule_parser.cpp b/pcbnew/drc/drc_rule_parser.cpp
index 5daf1ccc27..045bcdbef5 100644
--- a/pcbnew/drc/drc_rule_parser.cpp
+++ b/pcbnew/drc/drc_rule_parser.cpp
@@ -22,7 +22,6 @@
  */
 
 
-#include <fctsys.h>
 #include <class_board.h>
 #include <drc/drc_rule_parser.h>
 #include <drc/drc_rule_condition.h>
diff --git a/pcbnew/exporters/export_d356.cpp b/pcbnew/exporters/export_d356.cpp
index 848256cc10..584d7ef3e5 100644
--- a/pcbnew/exporters/export_d356.cpp
+++ b/pcbnew/exporters/export_d356.cpp
@@ -27,7 +27,6 @@
  * @brief Export IPC-D-356 test format
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <gestfich.h>
 #include <kiface_i.h>
diff --git a/pcbnew/exporters/export_footprint_associations.cpp b/pcbnew/exporters/export_footprint_associations.cpp
index 3d3ac94d98..856b4b720c 100644
--- a/pcbnew/exporters/export_footprint_associations.cpp
+++ b/pcbnew/exporters/export_footprint_associations.cpp
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <kicad_string.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/exporters/export_footprints_placefile.cpp b/pcbnew/exporters/export_footprints_placefile.cpp
index 9b16488d24..f29e3522b7 100644
--- a/pcbnew/exporters/export_footprints_placefile.cpp
+++ b/pcbnew/exporters/export_footprints_placefile.cpp
@@ -26,10 +26,8 @@
  *  2 - create a module report (pos and module descr) (ascii file)
  */
 
-#include <fctsys.h>
 #include <kicad_string.h>
 #include <build_version.h>
-#include <macros.h>
 #include <export_footprints_placefile.h>
 
 
diff --git a/pcbnew/exporters/export_gencad.cpp b/pcbnew/exporters/export_gencad.cpp
index 069107db78..e0f08f08cd 100644
--- a/pcbnew/exporters/export_gencad.cpp
+++ b/pcbnew/exporters/export_gencad.cpp
@@ -36,7 +36,6 @@
 #include <class_track.h>
 #include <confirm.h>
 #include <dialogs/dialog_gencad_export_options.h>
-#include <fctsys.h>
 #include <hash_eda.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
diff --git a/pcbnew/exporters/export_idf.cpp b/pcbnew/exporters/export_idf.cpp
index 941c1be157..37b4af80bb 100644
--- a/pcbnew/exporters/export_idf.cpp
+++ b/pcbnew/exporters/export_idf.cpp
@@ -28,7 +28,6 @@
 
 #include <list>
 #include <pcb_edit_frame.h>
-#include <macros.h>
 #include <pcbnew.h>
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp
index 48e7ecbb4a..d47668c141 100644
--- a/pcbnew/exporters/export_vrml.cpp
+++ b/pcbnew/exporters/export_vrml.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-//#include <cmath>
 #include <exception>
 #include <fstream>
 #include <iomanip>
@@ -41,7 +40,6 @@
 #include "class_zone.h"
 #include "convert_to_biu.h"
 #include <filename_resolver.h>
-#include "gr_text.h"
 #include "plugins/3dapi/ifsg_all.h"
 #include "streamwrapper.h"
 #include "vrml_layer.h"
diff --git a/pcbnew/exporters/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp
index 58cd4a6163..b1e525e5ef 100644
--- a/pcbnew/exporters/gen_drill_report_files.cpp
+++ b/pcbnew/exporters/gen_drill_report_files.cpp
@@ -27,14 +27,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <common.h>
 #include <plotter.h>
 #include <base_struct.h>
 #include <gr_text.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <macros.h>
 #include <math/util.h>      // for KiROUND
 
 #include <class_board.h>
diff --git a/pcbnew/exporters/gen_footprints_placefile.cpp b/pcbnew/exporters/gen_footprints_placefile.cpp
index 01108ae568..054daf7086 100644
--- a/pcbnew/exporters/gen_footprints_placefile.cpp
+++ b/pcbnew/exporters/gen_footprints_placefile.cpp
@@ -26,7 +26,6 @@
  *  2 - create a module report (pos and module descr) (ascii file)
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
@@ -34,7 +33,6 @@
 #include <pcbnew_settings.h>
 #include <pgm_base.h>
 #include <bitmaps.h>
-#include <macros.h>
 #include <reporter.h>
 #include <tools/pcb_editor_control.h>
 #include <class_board.h>
diff --git a/pcbnew/exporters/gendrill_Excellon_writer.cpp b/pcbnew/exporters/gendrill_Excellon_writer.cpp
index 032565c82d..5d4cc2b93a 100644
--- a/pcbnew/exporters/gendrill_Excellon_writer.cpp
+++ b/pcbnew/exporters/gendrill_Excellon_writer.cpp
@@ -35,8 +35,6 @@
  * and the CNC-7 manual.
  */
 
-#include <fctsys.h>
-
 #include <plotter.h>
 #include <kicad_string.h>
 #include <pcb_edit_frame.h>
@@ -45,7 +43,6 @@
 #include <math/util.h>      // for KiROUND
 
 #include <pcbplot.h>
-#include <pcbnew.h>
 #include <class_board.h>
 #include <gendrill_Excellon_writer.h>
 #include <wildcards_and_files_ext.h>
diff --git a/pcbnew/exporters/gendrill_file_writer_base.cpp b/pcbnew/exporters/gendrill_file_writer_base.cpp
index 4ed3703555..7f4348a43e 100644
--- a/pcbnew/exporters/gendrill_file_writer_base.cpp
+++ b/pcbnew/exporters/gendrill_file_writer_base.cpp
@@ -22,7 +22,6 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-#include <fctsys.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/exporters/gendrill_gerber_writer.cpp b/pcbnew/exporters/gendrill_gerber_writer.cpp
index b8f4ccb4f5..32c9040d21 100644
--- a/pcbnew/exporters/gendrill_gerber_writer.cpp
+++ b/pcbnew/exporters/gendrill_gerber_writer.cpp
@@ -27,8 +27,6 @@
  * @brief Functions to create drill files in gerber X2 format.
  */
 
-#include <fctsys.h>
-
 #include <vector>
 
 #include <plotter.h>
@@ -41,7 +39,6 @@
 #include <class_track.h>
 
 #include <pcbplot.h>
-#include <pcbnew.h>
 #include <gendrill_gerber_writer.h>
 #include <wildcards_and_files_ext.h>
 #include <reporter.h>
diff --git a/pcbnew/exporters/gerber_jobfile_writer.cpp b/pcbnew/exporters/gerber_jobfile_writer.cpp
index 49f674be06..9cc9191c4f 100644
--- a/pcbnew/exporters/gerber_jobfile_writer.cpp
+++ b/pcbnew/exporters/gerber_jobfile_writer.cpp
@@ -27,8 +27,6 @@
  * @brief Functions to create the Gerber job file in JSON format.
  */
 
-#include <fctsys.h>
-
 #include <fstream>
 #include <iomanip>
 #include <vector>
@@ -45,7 +43,6 @@
 #include <board_stackup_manager/stackup_predefined_prms.h>
 #include <gbr_metadata.h>
 #include <gerber_jobfile_writer.h>
-#include <pcbnew.h>
 #include <pcbplot.h>
 #include <reporter.h>
 #include <wildcards_and_files_ext.h>
diff --git a/pcbnew/exporters/gerber_placefile_writer.cpp b/pcbnew/exporters/gerber_placefile_writer.cpp
index 16ee73f34a..cd562d2ead 100644
--- a/pcbnew/exporters/gerber_placefile_writer.cpp
+++ b/pcbnew/exporters/gerber_placefile_writer.cpp
@@ -23,7 +23,6 @@
  * @brief Functions to create place files in gerber X2 format.
  */
 
-#include <fctsys.h>
 #include "gerber_placefile_writer.h"
 
 #include <vector>
@@ -36,7 +35,6 @@
 #include <class_board.h>
 
 #include <pcbplot.h>
-#include <pcbnew.h>
 #include <wildcards_and_files_ext.h>
 #include <reporter.h>
 #include <gbr_metadata.h>
diff --git a/pcbnew/exporters/gerber_placefile_writer.h b/pcbnew/exporters/gerber_placefile_writer.h
index 5e721050d3..b5ec287b58 100644
--- a/pcbnew/exporters/gerber_placefile_writer.h
+++ b/pcbnew/exporters/gerber_placefile_writer.h
@@ -27,6 +27,7 @@
 #define PLACEFILE_GERBER_WRITER_H
 
 #include <layers_id_colors_and_visibility.h>
+#include <wx/gdicmn.h>
 
 class BOARD;
 class MODULE;
diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp
index 041fdb90d3..3d8fb0090b 100644
--- a/pcbnew/github/github_plugin.cpp
+++ b/pcbnew/github/github_plugin.cpp
@@ -79,15 +79,12 @@ Vary: Accept-Encoding
 #include <wx/mstream.h>
 #include <wx/uri.h>
 
-#include <fctsys.h>
-
 #include <io_mgr.h>
 #include <richio.h>
 #include <pcb_parser.h>
 #include <class_board.h>
 #include <github_plugin.h>
 #include <class_module.h>
-#include <macros.h>
 #include <fp_lib_table.h>       // ExpandSubstitutions()
 
 
diff --git a/pcbnew/microwave/microwave_polygon.cpp b/pcbnew/microwave/microwave_polygon.cpp
index 2a5d99cd39..5d70afe477 100644
--- a/pcbnew/microwave/microwave_polygon.cpp
+++ b/pcbnew/microwave/microwave_polygon.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <trigo.h>
 #include <kicad_string.h>
diff --git a/pcbnew/netlist_reader/legacy_netlist_reader.cpp b/pcbnew/netlist_reader/legacy_netlist_reader.cpp
index 8e7e4800ee..0b12159100 100644
--- a/pcbnew/netlist_reader/legacy_netlist_reader.cpp
+++ b/pcbnew/netlist_reader/legacy_netlist_reader.cpp
@@ -27,7 +27,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <richio.h>
 #include <kicad_string.h>
 
diff --git a/pcbnew/netlist_reader/netlist.cpp b/pcbnew/netlist_reader/netlist.cpp
index adcef7e6f8..2bd6eae810 100644
--- a/pcbnew/netlist_reader/netlist.cpp
+++ b/pcbnew/netlist_reader/netlist.cpp
@@ -30,7 +30,6 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include <fctsys.h>
 #include <kiway.h>
 #include <pcb_edit_frame.h>
 #include <netlist_reader/pcb_netlist.h>
@@ -47,7 +46,7 @@ using namespace std::placeholders;
 #include <tools/pcb_actions.h>
 #include <tools/selection_tool.h>
 #include <project/project_file.h>  // LAST_PATH_TYPE
-//#include <view/view.h>
+
 
 extern void SpreadFootprints( std::vector<MODULE*>* aFootprints, wxPoint aSpreadAreaPosition );
 
diff --git a/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.cpp b/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.cpp
index 813fb23eef..3d8a6fb886 100644
--- a/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.cpp
+++ b/pcbnew/pcad2kicadpcb_plugin/pcad_plugin.cpp
@@ -37,10 +37,6 @@
 #include <s_expr_loader.h>
 #include <pcb.h>
 
-#include <common.h>
-#include <macros.h>
-#include <fctsys.h>
-
 using namespace PCAD2KICAD;
 
 PCAD_PLUGIN::PCAD_PLUGIN()
diff --git a/pcbnew/ratsnest/ratsnest.cpp b/pcbnew/ratsnest/ratsnest.cpp
index e57bbf7cdf..d91ed2f35e 100644
--- a/pcbnew/ratsnest/ratsnest.cpp
+++ b/pcbnew/ratsnest/ratsnest.cpp
@@ -22,9 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <common.h>
 #include <pcb_edit_frame.h>
 #include <macros.h>
 #include <class_board.h>
diff --git a/pcbnew/swig/python_scripting.cpp b/pcbnew/swig/python_scripting.cpp
index c519094597..cf4471f393 100644
--- a/pcbnew/swig/python_scripting.cpp
+++ b/pcbnew/swig/python_scripting.cpp
@@ -32,11 +32,8 @@
 #include <python_scripting.h>
 #include <sstream>
 
-#include <fctsys.h>
 #include <eda_base_frame.h>
-#include <common.h>
 #include <gal/color4d.h>
-#include <macros.h>
 #include <trace_helpers.h>
 
 #include <pgm_base.h>
diff --git a/pcbnew/tools/drc_tool.cpp b/pcbnew/tools/drc_tool.cpp
index 3aa36de182..e5b8504125 100644
--- a/pcbnew/tools/drc_tool.cpp
+++ b/pcbnew/tools/drc_tool.cpp
@@ -21,7 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pcb_edit_frame.h>
 #include <bitmaps.h>
 #include <tool/tool_manager.h>