diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp
index 7efcfa0886..4f6e2fb7ef 100644
--- a/3d-viewer/3d_viewer/3d_menubar.cpp
+++ b/3d-viewer/3d_viewer/3d_menubar.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <tool/conditional_menu.h>
 #include <eda_3d_viewer.h>
 #include <menus_helpers.h>
diff --git a/3d-viewer/3d_viewer/3d_toolbar.cpp b/3d-viewer/3d_viewer/3d_toolbar.cpp
index ee5340d59d..45cc2bd38b 100644
--- a/3d-viewer/3d_viewer/3d_toolbar.cpp
+++ b/3d-viewer/3d_viewer/3d_toolbar.cpp
@@ -28,7 +28,6 @@
  * @file 3d_toolbar.cpp
  */
 
-#include <fctsys.h>
 #include <wx/wupdlock.h>
 #include <eda_3d_viewer.h>
 #include <menus_helpers.h>
diff --git a/3d-viewer/common_ogl/cogl_att_list.cpp b/3d-viewer/common_ogl/cogl_att_list.cpp
index 469268b250..52ee9994d0 100644
--- a/3d-viewer/common_ogl/cogl_att_list.cpp
+++ b/3d-viewer/common_ogl/cogl_att_list.cpp
@@ -30,7 +30,6 @@
 #include "cogl_att_list.h"
 #include <macros.h>
 #include <wx/glcanvas.h>
-#include <fctsys.h>
 #include <wx/debug.h>
 
 /**
diff --git a/common/page_layout/ws_data_model_io.cpp b/common/page_layout/ws_data_model_io.cpp
index 79c5296687..86019523df 100644
--- a/common/page_layout/ws_data_model_io.cpp
+++ b/common/page_layout/ws_data_model_io.cpp
@@ -30,14 +30,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <base_struct.h>
 #include <ws_painter.h>
 #include <ws_draw_item.h>
 #include <ws_data_model.h>
 #include <math/vector2d.h>
 #include <page_layout/page_layout_reader_lexer.h>
-#include <macros.h>
 #include <convert_to_biu.h>
 
 
diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp
index 5006a1bd95..647713f580 100644
--- a/eeschema/dialogs/dialog_annotate.cpp
+++ b/eeschema/dialogs/dialog_annotate.cpp
@@ -23,7 +23,6 @@
  */
 
 
-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <bitmaps.h>
 #include <confirm.h>
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index f872dbcd28..f8d09598db 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@@ -33,7 +33,6 @@
 #include <dialog_bom_base.h>
 #include <dialog_helpers.h>
 #include <eeschema_settings.h>
-#include <fctsys.h>
 #include <gestfich.h>
 #include <html_messagebox.h>
 #include <i18n_utility.h> // for _HKI definition used in dialog_bom_help_md.h
diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp
index 027dce6bc9..ad1e4a4cd3 100644
--- a/eeschema/dialogs/dialog_change_symbols.cpp
+++ b/eeschema/dialogs/dialog_change_symbols.cpp
@@ -21,7 +21,6 @@
 
 #include <algorithm>
 
-#include <fctsys.h>
 #include <bitmaps.h>
 #include <kicad_string.h>   // WildCompareString
 #include <kiway.h>
diff --git a/eeschema/dialogs/dialog_edit_component_in_lib.cpp b/eeschema/dialogs/dialog_edit_component_in_lib.cpp
index e141bb05cc..34306e98fe 100644
--- a/eeschema/dialogs/dialog_edit_component_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_lib.cpp
@@ -25,7 +25,6 @@
 #include <class_libentry.h>
 #include <confirm.h>
 #include <dialog_text_entry.h>
-#include <fctsys.h>
 #include <kiway.h>
 #include <lib_edit_frame.h>
 #include <lib_manager.h>
diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp
index 6257b72700..db35c5d1e7 100644
--- a/eeschema/dialogs/dialog_edit_components_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_components_libid.cpp
@@ -28,7 +28,6 @@
  */
 
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <sch_edit_frame.h>
 #include <sch_draw_panel.h>
diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp
index 768c2dfed6..21284809d7 100644
--- a/eeschema/dialogs/dialog_edit_label.cpp
+++ b/eeschema/dialogs/dialog_edit_label.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
 #include <sch_validators.h>
diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index 15799c8a20..72801920bb 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <common.h>
 #include <kiway.h>
 #include <confirm.h>
 #include <kicad_string.h>
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 2a00763ef3..a04169f035 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <gestfich.h>
 #include <pgm_base.h>
 #include <sch_screen.h>
diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
index bab0db4683..8f92454900 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -23,7 +23,6 @@
 
 #include <connection_graph.h>
 #include <dialog_global_edit_text_and_graphics_base.h>
-#include <fctsys.h>
 #include <kicad_string.h>
 #include <sch_component.h>
 #include <sch_connection.h>
diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp
index c5829923de..3b8f188e37 100644
--- a/eeschema/dialogs/dialog_lib_edit_text.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_text.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <lib_edit_frame.h>
 #include <lib_text.h>
 #include <settings/settings_manager.h>
diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp
index a8155fc933..4ecf8c3443 100644
--- a/eeschema/dialogs/dialog_netlist.cpp
+++ b/eeschema/dialogs/dialog_netlist.cpp
@@ -33,7 +33,6 @@
  * referred to as plugins, but they are really just external binaries.
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <gestfich.h>
diff --git a/eeschema/dialogs/dialog_pin_properties.cpp b/eeschema/dialogs/dialog_pin_properties.cpp
index 1cf48bb138..fce5a3105b 100644
--- a/eeschema/dialogs/dialog_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_pin_properties.cpp
@@ -22,8 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
 #include <bitmaps.h>
 #include <sch_painter.h>
 #include <lib_edit_frame.h>
diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp
index 0a1187463e..bd9dd8846a 100644
--- a/eeschema/dialogs/dialog_print_using_printer.cpp
+++ b/eeschema/dialogs/dialog_print_using_printer.cpp
@@ -22,14 +22,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
-#include <gr_basic.h>
 #include <confirm.h>
 #include <sch_screen.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
-#include <general.h>
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>
 #include <sch_sheet.h>
diff --git a/eeschema/dialogs/panel_eeschema_display_options.cpp b/eeschema/dialogs/panel_eeschema_display_options.cpp
index bb4f3ba445..a754b92c69 100644
--- a/eeschema/dialogs/panel_eeschema_display_options.cpp
+++ b/eeschema/dialogs/panel_eeschema_display_options.cpp
@@ -22,14 +22,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <sch_painter.h>
 #include <class_libentry.h>
 #include <panel_eeschema_display_options.h>
 #include <widgets/gal_options_panel.h>
 #include <sch_junction.h>
-#include <gr_text.h>
 
 PANEL_EESCHEMA_DISPLAY_OPTIONS::PANEL_EESCHEMA_DISPLAY_OPTIONS( SCH_EDIT_FRAME* aFrame,
                                                                 wxWindow* aWindow ) :
diff --git a/eeschema/dialogs/panel_eeschema_settings.cpp b/eeschema/dialogs/panel_eeschema_settings.cpp
index 726ffd20df..bdf169a169 100644
--- a/eeschema/dialogs/panel_eeschema_settings.cpp
+++ b/eeschema/dialogs/panel_eeschema_settings.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <settings/settings_manager.h>
 #include <settings/color_settings.h>
diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
index f858a279f2..2851a76244 100644
--- a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
+++ b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <widgets/wx_grid.h>
 #include <template_fieldnames.h>
 #include <grid_tricks.h>
diff --git a/eeschema/dialogs/panel_libedit_color_settings.cpp b/eeschema/dialogs/panel_libedit_color_settings.cpp
index 83e632a29d..0d48a24092 100644
--- a/eeschema/dialogs/panel_libedit_color_settings.cpp
+++ b/eeschema/dialogs/panel_libedit_color_settings.cpp
@@ -21,7 +21,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
-#include <fctsys.h>
 #include <eeschema_settings.h>
 #include <lib_edit_frame.h>
 #include <libedit_settings.h>
diff --git a/eeschema/dialogs/panel_libedit_settings.cpp b/eeschema/dialogs/panel_libedit_settings.cpp
index d9860b5121..305a473044 100644
--- a/eeschema/dialogs/panel_libedit_settings.cpp
+++ b/eeschema/dialogs/panel_libedit_settings.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <lib_edit_frame.h>
 #include <sch_painter.h>
 #include <pgm_base.h>
diff --git a/eeschema/dialogs/panel_setup_formatting.cpp b/eeschema/dialogs/panel_setup_formatting.cpp
index aadd319dbb..f46ff2f4f6 100644
--- a/eeschema/dialogs/panel_setup_formatting.cpp
+++ b/eeschema/dialogs/panel_setup_formatting.cpp
@@ -21,13 +21,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <sch_painter.h>
 #include <class_libentry.h>
 #include <panel_setup_formatting.h>
 #include <sch_junction.h>
-#include <gr_text.h>
 #include <schematic.h>
 #include <schematic_settings.h>
 
diff --git a/eeschema/dialogs/panel_setup_pinmap.cpp b/eeschema/dialogs/panel_setup_pinmap.cpp
index e7b5bcdb5c..2e01003bd7 100644
--- a/eeschema/dialogs/panel_setup_pinmap.cpp
+++ b/eeschema/dialogs/panel_setup_pinmap.cpp
@@ -21,8 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gestfich.h>
 #include <pgm_base.h>
 #include <sch_edit_frame.h>
 #include <kiface_i.h>
diff --git a/eeschema/dialogs/panel_sym_lib_table.cpp b/eeschema/dialogs/panel_sym_lib_table.cpp
index 93af0039ea..54c3aa2dda 100644
--- a/eeschema/dialogs/panel_sym_lib_table.cpp
+++ b/eeschema/dialogs/panel_sym_lib_table.cpp
@@ -21,7 +21,6 @@
 #include <set>
 #include <wx/regex.h>
 
-#include <fctsys.h>
 #include <project.h>
 #include <panel_sym_lib_table.h>
 #include <lib_id.h>
diff --git a/eeschema/libedit/lib_edit_frame.cpp b/eeschema/libedit/lib_edit_frame.cpp
index 9c69eb080e..5ea22eafc2 100644
--- a/eeschema/libedit/lib_edit_frame.cpp
+++ b/eeschema/libedit/lib_edit_frame.cpp
@@ -28,8 +28,7 @@
 #include <confirm.h>
 #include <eeschema_id.h>
 #include <eeschema_settings.h>
-#include <fctsys.h>
-#include <general.h>
+//#include <general.h>
 #include <kiface_i.h>
 #include <kiplatform/app.h>
 #include <kiway_express.h>
diff --git a/eeschema/libedit/lib_export.cpp b/eeschema/libedit/lib_export.cpp
index 1c9690ec5c..812ebf299f 100644
--- a/eeschema/libedit/lib_export.cpp
+++ b/eeschema/libedit/lib_export.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <symbol_lib_table.h>
 #include <lib_edit_frame.h>
diff --git a/eeschema/libedit/libedit.cpp b/eeschema/libedit/libedit.cpp
index c6b8667c0e..f5c7e01396 100644
--- a/eeschema/libedit/libedit.cpp
+++ b/eeschema/libedit/libedit.cpp
@@ -23,10 +23,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <confirm.h>
-#include <gestfich.h>
+//#include <gestfich.h>
 #include <widgets/infobar.h>
 #include <tools/ee_actions.h>
 #include <tools/lib_drawing_tools.h>
diff --git a/eeschema/libedit/libedit_plot_component.cpp b/eeschema/libedit/libedit_plot_component.cpp
index b1a1d3846e..42639a9932 100644
--- a/eeschema/libedit/libedit_plot_component.cpp
+++ b/eeschema/libedit/libedit_plot_component.cpp
@@ -22,7 +22,6 @@
  */
 
 
-#include <fctsys.h>
 #include <sch_painter.h>
 #include <lib_edit_frame.h>
 #include <class_libentry.h>
diff --git a/eeschema/libedit/libedit_undo_redo.cpp b/eeschema/libedit/libedit_undo_redo.cpp
index 24ad8897ca..d7db5c7fc2 100644
--- a/eeschema/libedit/libedit_undo_redo.cpp
+++ b/eeschema/libedit/libedit_undo_redo.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 
 #include <lib_edit_frame.h>
diff --git a/eeschema/libedit/symbedit.cpp b/eeschema/libedit/symbedit.cpp
index 4e8a74dc35..9dbc3715a4 100644
--- a/eeschema/libedit/symbedit.cpp
+++ b/eeschema/libedit/symbedit.cpp
@@ -23,13 +23,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiway.h>
 #include <pgm_base.h>
 #include <sch_draw_panel.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <gestfich.h>
+//#include <gestfich.h>
 #include <lib_pin.h>
 #include <lib_edit_frame.h>
 #include <class_libentry.h>
diff --git a/eeschema/libedit/toolbars_libedit.cpp b/eeschema/libedit/toolbars_libedit.cpp
index ede9a2d4c3..076e3e5014 100644
--- a/eeschema/libedit/toolbars_libedit.cpp
+++ b/eeschema/libedit/toolbars_libedit.cpp
@@ -23,9 +23,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <eeschema_id.h>
-#include <general.h>
+//#include <general.h>
 #include <lib_edit_frame.h>
 #include <sch_painter.h>
 #include <dialog_helpers.h>
diff --git a/eeschema/netlist_exporters/netlist_exporter.cpp b/eeschema/netlist_exporters/netlist_exporter.cpp
index 542e4957cf..b2c79ca4ce 100644
--- a/eeschema/netlist_exporters/netlist_exporter.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter.cpp
@@ -26,8 +26,6 @@
 #include <netlist_exporter.h>
 
 #include <confirm.h>
-#include <fctsys.h>
-#include <gestfich.h>
 #include <pgm_base.h>
 #include <refdes_utils.h>
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp b/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
index a160de9eec..66c7ac7172 100644
--- a/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <build_version.h>
 #include <confirm.h>
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_kicad.cpp b/eeschema/netlist_exporters/netlist_exporter_kicad.cpp
index a2d839a873..2a66ac042e 100644
--- a/eeschema/netlist_exporters/netlist_exporter_kicad.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_kicad.cpp
@@ -25,7 +25,6 @@
 
 
 #include <algorithm>
-#include <fctsys.h>
 #include <build_version.h>
 #include <confirm.h>
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
index c0c6f618c2..98f5a8e077 100644
--- a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <refdes_utils.h>
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index deebf04325..d37002c9ef 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -24,7 +24,6 @@
  */
 
 #include "netlist_exporter_pspice.h"
-#include <fctsys.h>
 #include <build_version.h>
 #include <confirm.h>
 
diff --git a/eeschema/tools/backanno.cpp b/eeschema/tools/backanno.cpp
index b57dab411b..3bceef60d5 100644
--- a/eeschema/tools/backanno.cpp
+++ b/eeschema/tools/backanno.cpp
@@ -23,15 +23,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <gestfich.h>
 #include <kiface_i.h>
 #include <sch_edit_frame.h>
 #include <build_version.h>
 #include <wildcards_and_files_ext.h>
-#include <general.h>
 #include <sch_sheet_path.h>
 #include <sch_component.h>
 #include <sch_reference_list.h>
diff --git a/eeschema/tools/lib_control.cpp b/eeschema/tools/lib_control.cpp
index 32b43b0896..4ccf371f68 100644
--- a/eeschema/tools/lib_control.cpp
+++ b/eeschema/tools/lib_control.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiway.h>
 #include <sch_painter.h>
 #include <tool/tool_manager.h>
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index 0d2c613b39..d63a9d7cde 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -33,7 +33,6 @@
 #include <dialogs/dialog_symbol_remap.h>
 #include <project_rescue.h>
 #include <erc.h>
-#include <fctsys.h>
 #include <invoke_sch_dialog.h>
 #include <kiway.h>
 #include <netlist_exporters/netlist_exporter_pspice.h>