From 7865d8de433acc7bfb74ffe4d6c9db6d6b123141 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Fri, 2 Oct 2020 15:50:46 +0200
Subject: [PATCH] more cleanup about removing useless include

---
 eeschema/annotate.cpp                    | 1 -
 eeschema/bus-wire-junction.cpp           | 2 --
 eeschema/class_libentry.cpp              | 3 ---
 eeschema/class_library.cpp               | 3 ---
 eeschema/component_references_lister.cpp | 1 -
 eeschema/cross-probing.cpp               | 3 +--
 eeschema/eeschema.cpp                    | 1 +
 eeschema/eeschema_config.cpp             | 1 -
 eeschema/erc.cpp                         | 1 -
 eeschema/getpart.cpp                     | 1 -
 eeschema/hierarch.cpp                    | 2 --
 eeschema/lib_arc.cpp                     | 3 ---
 eeschema/lib_bezier.cpp                  | 3 ---
 eeschema/lib_circle.cpp                  | 3 ---
 eeschema/lib_field.cpp                   | 2 --
 eeschema/lib_item.cpp                    | 2 --
 eeschema/lib_pin.cpp                     | 3 +--
 eeschema/lib_polyline.cpp                | 3 ---
 eeschema/lib_rectangle.cpp               | 3 ---
 eeschema/lib_text.cpp                    | 3 ---
 eeschema/lib_view_frame.cpp              | 1 -
 eeschema/libarch.cpp                     | 1 -
 eeschema/netlist_generator.cpp           | 1 -
 eeschema/plot_schematic_DXF.cpp          | 1 -
 eeschema/plot_schematic_HPGL.cpp         | 1 -
 eeschema/plot_schematic_PDF.cpp          | 1 -
 eeschema/plot_schematic_PS.cpp           | 1 -
 eeschema/plot_schematic_SVG.cpp          | 1 -
 eeschema/sch_bitmap.cpp                  | 3 ---
 eeschema/sch_bus_entry.cpp               | 1 -
 eeschema/sch_component.cpp               | 1 -
 eeschema/sch_field.cpp                   | 3 ---
 eeschema/sch_item.cpp                    | 3 ---
 eeschema/sch_junction.cpp                | 4 ----
 eeschema/sch_line.cpp                    | 1 -
 eeschema/sch_marker.cpp                  | 1 -
 eeschema/sch_no_connect.cpp              | 4 ----
 eeschema/sch_screen.cpp                  | 4 +---
 eeschema/sch_sheet.cpp                   | 1 -
 eeschema/sch_sheet_path.cpp              | 2 --
 eeschema/sch_sheet_pin.cpp               | 2 --
 eeschema/sch_text.cpp                    | 1 -
 eeschema/schematic_undo_redo.cpp         | 1 -
 eeschema/sheet.cpp                       | 1 -
 eeschema/symbol_lib_table.cpp            | 3 ---
 eeschema/toolbars_sch_editor.cpp         | 1 -
 46 files changed, 4 insertions(+), 85 deletions(-)

diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index 05d5444aeb..81182155f2 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -23,7 +23,6 @@
 
 #include <algorithm>
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <confirm.h>
 #include <reporter.h>
diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp
index 79542ac533..7c3e89c121 100644
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@@ -22,8 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-
 #include <core/kicad_algo.h>
 #include <eeschema_id.h>
 #include <general.h>
diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp
index a5e0c7a6d6..e8e5cdb711 100644
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@@ -23,12 +23,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <macros.h>
 #include <kicad_string.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
-#include <gr_basic.h>
 #include <sch_screen.h>
 #include <richio.h>
 #include <trace_helpers.h>
diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index b9c99db2d9..31be0c2d39 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -28,10 +28,7 @@
  */
 
 #include <algorithm>
-#include <fctsys.h>
 #include <kiface_i.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <eda_base_frame.h>
 #include <kicad_string.h>
 #include <gestfich.h>
diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp
index 3755c07b0d..1eef5da909 100644
--- a/eeschema/component_references_lister.cpp
+++ b/eeschema/component_references_lister.cpp
@@ -35,7 +35,6 @@
 #include <vector>
 #include <unordered_set>
 
-#include <fctsys.h>
 #include <refdes_utils.h>
 #include <reporter.h>
 
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index f61229b7f8..baf15ec56c 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <kiway_express.h>
 #include <eda_dde.h>
@@ -217,7 +216,7 @@ SCH_ITEM* SCH_EDITOR_CONTROL::FindComponentAndItem( const wxString& aReference,
                 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 ),
-                                              fabs( bbSize.y / screenSize.y ) ); 
+                                              fabs( bbSize.y / screenSize.y ) );
 
                 // If the width of the part we're probing is bigger than what the screen width will be
                 // after the zoom, then punt and use the KiCad zoom algorithm since it guarantees the
diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index 1aa17a211e..24ee5e84c7 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -24,6 +24,7 @@
  */
 
 #include <fctsys.h>
+
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <confirm.h>
diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp
index 646b8d38ad..f9396e4b8e 100644
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@@ -31,7 +31,6 @@
 #include <dialogs/panel_libedit_settings.h>
 #include <dialogs/dialog_schematic_setup.h>
 #include <eeschema_config.h>
-#include <fctsys.h>
 #include <kiway.h>
 #include <lib_edit_frame.h>
 #include <panel_gal_display_options.h>
diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index a2f6a1266a..3d5943391a 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -30,7 +30,6 @@
 
 #include "connection_graph.h"
 #include <erc.h>
-#include <fctsys.h>
 #include <kicad_string.h>
 #include <lib_pin.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index ce49cdf574..46e500c33b 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -27,7 +27,6 @@
 #include <class_library.h>
 #include <confirm.h>
 #include <eeschema_id.h>
-#include <fctsys.h>
 #include <general.h>
 #include <kiway.h>
 #include <lib_edit_frame.h>
diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp
index ef410fd8ea..5e6aeccd45 100644
--- a/eeschema/hierarch.cpp
+++ b/eeschema/hierarch.cpp
@@ -23,14 +23,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <confirm.h>
 #include <id.h>
 #include <bitmaps.h>
 #include <dialog_shim.h>
 #include <sch_edit_frame.h>
-#include <general.h>
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
 #include <schematic.h>
diff --git a/eeschema/lib_arc.cpp b/eeschema/lib_arc.cpp
index b2b89840a0..fb4b67998e 100644
--- a/eeschema/lib_arc.cpp
+++ b/eeschema/lib_arc.cpp
@@ -23,9 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <trigo.h>
diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp
index 3095b8326b..4241886a5a 100644
--- a/eeschema/lib_bezier.cpp
+++ b/eeschema/lib_bezier.cpp
@@ -21,9 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <trigo.h>
diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp
index e5bc9a3058..22219de5c8 100644
--- a/eeschema/lib_circle.cpp
+++ b/eeschema/lib_circle.cpp
@@ -22,9 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <trigo.h>
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index 590b2ff114..bf77767aef 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -22,9 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
-#include <gr_basic.h>
 #include <base_struct.h>
 #include <gr_text.h>
 #include <kicad_string.h>
diff --git a/eeschema/lib_item.cpp b/eeschema/lib_item.cpp
index ec1ef93196..14f15346ff 100644
--- a/eeschema/lib_item.cpp
+++ b/eeschema/lib_item.cpp
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
 #include <sch_draw_panel.h>
 #include <msgpanel.h>
 
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index 7336af7327..3251263d4a 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
@@ -122,7 +121,7 @@ LIB_PIN::LIB_PIN( LIB_PART* aParent ) :
 
 LIB_PIN::LIB_PIN( LIB_PART* aParent, const wxString& aName, const wxString& aNumber,
         int aOrientation, ELECTRICAL_PINTYPE aPinType, int aLength, int aNameTextSize,
-        int aNumTextSize, int aConvert, const wxPoint& aPos, int aUnit ) : 
+        int aNumTextSize, int aConvert, const wxPoint& aPos, int aUnit ) :
         LIB_ITEM( LIB_PIN_T, aParent ),
         m_position( aPos ),
         m_length( aLength ),
diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp
index c74d124961..67cb5b723a 100644
--- a/eeschema/lib_polyline.cpp
+++ b/eeschema/lib_polyline.cpp
@@ -22,9 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <eda_draw_frame.h>
 #include <plotter.h>
diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp
index f78bd5d095..f4f5859f09 100644
--- a/eeschema/lib_rectangle.cpp
+++ b/eeschema/lib_rectangle.cpp
@@ -22,9 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <trigo.h>
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index f7eb7adcb9..306a526c2d 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -25,9 +25,6 @@
  * @file lib_text.cpp
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <gr_text.h>
diff --git a/eeschema/lib_view_frame.cpp b/eeschema/lib_view_frame.cpp
index 4aee0872ae..2869783ec2 100644
--- a/eeschema/lib_view_frame.cpp
+++ b/eeschema/lib_view_frame.cpp
@@ -31,7 +31,6 @@
 #include <dialog_choose_component.h>
 #include <eeschema_id.h>
 #include <eeschema_settings.h>
-#include <fctsys.h>
 #include <kiface_i.h>
 #include <kiway.h>
 #include <lib_view_frame.h>
diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 154bed3b78..28601be57c 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -28,7 +28,6 @@
  * @brief Module for generation of component archive files.
  */
 
-#include <fctsys.h>
 #include <confirm.h>
 #include <wildcards_and_files_ext.h>
 
diff --git a/eeschema/netlist_generator.cpp b/eeschema/netlist_generator.cpp
index 2f725d906f..167c32129e 100644
--- a/eeschema/netlist_generator.cpp
+++ b/eeschema/netlist_generator.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <pgm_base.h>
diff --git a/eeschema/plot_schematic_DXF.cpp b/eeschema/plot_schematic_DXF.cpp
index 6a605f1a99..ac962891cc 100644
--- a/eeschema/plot_schematic_DXF.cpp
+++ b/eeschema/plot_schematic_DXF.cpp
@@ -25,7 +25,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <plotters_specific.h>
 #include <sch_edit_frame.h>
 #include <sch_sheet_path.h>
diff --git a/eeschema/plot_schematic_HPGL.cpp b/eeschema/plot_schematic_HPGL.cpp
index 3225439942..7d15faa925 100644
--- a/eeschema/plot_schematic_HPGL.cpp
+++ b/eeschema/plot_schematic_HPGL.cpp
@@ -25,7 +25,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <plotters_specific.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
diff --git a/eeschema/plot_schematic_PDF.cpp b/eeschema/plot_schematic_PDF.cpp
index c0ea7ca70c..f2772af7b7 100644
--- a/eeschema/plot_schematic_PDF.cpp
+++ b/eeschema/plot_schematic_PDF.cpp
@@ -25,7 +25,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <plotters_specific.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
diff --git a/eeschema/plot_schematic_PS.cpp b/eeschema/plot_schematic_PS.cpp
index 4973aaa327..23b1f918df 100644
--- a/eeschema/plot_schematic_PS.cpp
+++ b/eeschema/plot_schematic_PS.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <plotters_specific.h>
 #include <sch_edit_frame.h>
 #include <base_units.h>
diff --git a/eeschema/plot_schematic_SVG.cpp b/eeschema/plot_schematic_SVG.cpp
index 1bd068f842..1a934b3ef2 100644
--- a/eeschema/plot_schematic_SVG.cpp
+++ b/eeschema/plot_schematic_SVG.cpp
@@ -27,7 +27,6 @@
  * @file plot_schematic_SVG.cpp
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/sch_bitmap.cpp b/eeschema/sch_bitmap.cpp
index ee9f0d1f2a..20fef2e93c 100644
--- a/eeschema/sch_bitmap.cpp
+++ b/eeschema/sch_bitmap.cpp
@@ -26,12 +26,9 @@
  * @file sch_bitmap.cpp
  */
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <settings/color_settings.h>
-#include <trigo.h>
-#include <macros.h>
 #include <bitmaps.h>
 #include <base_units.h>
 #include <eda_draw_frame.h>
diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index 3965a501e3..cfb4e94a6f 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <bitmaps.h>
 #include <schematic.h>
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index e6cba9a827..8cb64150b6 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index cdc1d4732b..cd4e5519fc 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -30,11 +30,8 @@
  * They can be renamed and can appear in reports
  */
 
-#include <fctsys.h>
 #include <base_struct.h>
-#include <gr_basic.h>
 #include <gr_text.h>
-#include <macros.h>
 #include <sch_edit_frame.h>
 #include <plotter.h>
 #include <bitmaps.h>
diff --git a/eeschema/sch_item.cpp b/eeschema/sch_item.cpp
index c3cb73d0a7..3748ccc8d0 100644
--- a/eeschema/sch_item.cpp
+++ b/eeschema/sch_item.cpp
@@ -22,9 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <common.h>
-#include <gr_basic.h>
 #include <base_struct.h>
 #include <trace_helpers.h>
 #include <sch_item.h>
diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp
index de5342e452..8b4381fa02 100644
--- a/eeschema/sch_junction.cpp
+++ b/eeschema/sch_junction.cpp
@@ -26,12 +26,8 @@
  * @file sch_junction.cpp
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
 #include <trigo.h>
-#include <common.h>
 #include <plotter.h>
 #include <bitmaps.h>
 
diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index fa5c7d1497..f7fd387b85 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_painter.h>
 #include <plotter.h>
 #include <sch_line.h>
diff --git a/eeschema/sch_marker.cpp b/eeschema/sch_marker.cpp
index 2094960258..e4feaacb7f 100644
--- a/eeschema/sch_marker.cpp
+++ b/eeschema/sch_marker.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <trigo.h>
 #include <msgpanel.h>
diff --git a/eeschema/sch_no_connect.cpp b/eeschema/sch_no_connect.cpp
index 48cfdd59ec..a8b5a070dc 100644
--- a/eeschema/sch_no_connect.cpp
+++ b/eeschema/sch_no_connect.cpp
@@ -27,11 +27,7 @@
  * @brief Class SCH_NO_CONNECT implementation.
  */
 
-#include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <sch_draw_panel.h>
-#include <common.h>
 #include <plotter.h>
 #include <bitmaps.h>
 #include <schematic.h>
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 6fabd036c9..bf270e56a5 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -29,10 +29,8 @@
  * @brief Implementation of SCH_SCREEN and SCH_SCREENS classes.
  */
 
-#include <common.h>
 #include <eda_rect.h>
-#include <fctsys.h>
-#include <gr_text.h>
+//#include <gr_text.h>
 #include <id.h>
 #include <kicad_string.h>
 #include <kiway.h>
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index bb2c442a0e..02d7c26f7d 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <gr_text.h>
 #include <trigo.h>
diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp
index 9f04460daa..a75bd1ecf9 100644
--- a/eeschema/sch_sheet_path.cpp
+++ b/eeschema/sch_sheet_path.cpp
@@ -23,8 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-
 #include <sch_screen.h>
 #include <sch_item.h>
 #include <sch_marker.h>
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index 82050f3f2e..b5002daec6 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -25,10 +25,8 @@
 #include <algorithm>
 
 #include <bitmaps.h>
-#include <fctsys.h>
 #include <general.h>
 #include <geometry/shape_line_chain.h>
-#include <gr_basic.h>
 #include <gr_text.h>
 #include <kicad_string.h>
 #include <plotter.h>
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 960e4ce9a7..d9df9214f2 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -28,7 +28,6 @@
  * @brief Code for handling schematic texts (texts, labels, hlabels and global labels).
  */
 
-#include <fctsys.h>
 #include <sch_component.h>
 #include <sch_edit_frame.h>
 #include <plotter.h>
diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp
index b95076c040..2ded0c18db 100644
--- a/eeschema/schematic_undo_redo.cpp
+++ b/eeschema/schematic_undo_redo.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_edit_frame.h>
 #include <tool/tool_manager.h>
 #include <sch_bus_entry.h>
diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index 47f0faba7e..f4a9b928ca 100644
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <confirm.h>
 #include <kiface_i.h>
diff --git a/eeschema/symbol_lib_table.cpp b/eeschema/symbol_lib_table.cpp
index 3003062ff1..e7f2085919 100644
--- a/eeschema/symbol_lib_table.cpp
+++ b/eeschema/symbol_lib_table.cpp
@@ -23,9 +23,6 @@
  */
 
 
-#include <fctsys.h>
-#include <common.h>
-#include <macros.h>
 #include <lib_id.h>
 #include <lib_table_lexer.h>
 #include <pgm_base.h>
diff --git a/eeschema/toolbars_sch_editor.cpp b/eeschema/toolbars_sch_editor.cpp
index 61aa8c91dc..5ac9c7fa01 100644
--- a/eeschema/toolbars_sch_editor.cpp
+++ b/eeschema/toolbars_sch_editor.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
 #include <kiface_i.h>