From ff7742c6b83de9dc841117d9d6d557667a64c965 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Wed, 27 Jan 2021 23:06:43 +0000
Subject: [PATCH] File naming and include cleanup.

---
 eeschema/CMakeLists.txt                                | 2 +-
 eeschema/dialogs/dialog_choose_symbol.cpp              | 1 -
 eeschema/dialogs/dialog_edit_one_field.cpp             | 1 -
 eeschema/dialogs/dialog_edit_one_field.h               | 1 -
 eeschema/dialogs/dialog_lib_edit_draw_item.cpp         | 1 -
 eeschema/dialogs/dialog_lib_symbol_properties.cpp      | 1 -
 eeschema/dialogs/dialog_pin_properties.cpp             | 1 -
 eeschema/dialogs/dialog_rescue_each.cpp                | 1 -
 eeschema/dialogs/panel_eeschema_color_settings.cpp     | 1 -
 eeschema/dialogs/panel_eeschema_display_options.cpp    | 1 -
 eeschema/dialogs/panel_setup_formatting.cpp            | 1 -
 eeschema/ee_collectors.h                               | 2 +-
 eeschema/generate_alias_info.cpp                       | 2 +-
 eeschema/lib_field.cpp                                 | 3 +--
 eeschema/{class_libentry.cpp => lib_part.cpp}          | 3 ---
 eeschema/{class_libentry.h => lib_part.h}              | 0
 eeschema/lib_pin.cpp                                   | 4 ----
 eeschema/lib_pin.h                                     | 2 +-
 eeschema/netlist_exporters/netlist_exporter_base.h     | 1 -
 eeschema/project_rescue.h                              | 2 +-
 eeschema/sch_painter.cpp                               | 1 -
 eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp        | 5 -----
 eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp        | 3 ---
 eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp        | 1 -
 eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp      | 1 -
 eeschema/sch_reference_list.h                          | 7 ++-----
 eeschema/sch_screen.cpp                                | 2 --
 eeschema/schematic_settings.cpp                        | 2 +-
 eeschema/symbol_editor/symbol_editor.cpp               | 1 -
 eeschema/symbol_editor/symbol_editor_import_export.cpp | 1 -
 eeschema/symbol_editor/symbol_editor_plotter.cpp       | 2 --
 eeschema/symbol_editor/symbol_editor_undo_redo.cpp     | 1 -
 eeschema/symbol_editor/symbol_library_manager.cpp      | 1 -
 eeschema/symbol_lib_table.cpp                          | 2 +-
 eeschema/symbol_lib_table.h                            | 1 -
 eeschema/symbol_tree_model_adapter.cpp                 | 3 +--
 eeschema/symbol_tree_synchronizing_adapter.cpp         | 1 -
 eeschema/symbol_viewer_frame.cpp                       | 1 -
 eeschema/tools/ee_selection_tool.cpp                   | 1 -
 eeschema/tools/symbol_editor_drawing_tools.cpp         | 3 ---
 eeschema/widgets/symbol_preview_widget.cpp             | 4 ----
 qa/eeschema/lib_field_test_utils.h                     | 1 -
 qa/eeschema/test_lib_part.cpp                          | 1 -
 43 files changed, 11 insertions(+), 66 deletions(-)
 rename eeschema/{class_libentry.cpp => lib_part.cpp} (99%)
 rename eeschema/{class_libentry.h => lib_part.h} (100%)

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index b9699f8a22..1d0e6b12a0 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -162,7 +162,7 @@ set( EESCHEMA_SRCS
     autoplace_fields.cpp
     bus_alias.cpp
     bus-wire-junction.cpp
-    class_libentry.cpp
+    lib_part.cpp
     class_library.cpp
     cmp_library_lexer.cpp
     component_references_lister.cpp
diff --git a/eeschema/dialogs/dialog_choose_symbol.cpp b/eeschema/dialogs/dialog_choose_symbol.cpp
index 485bc625f0..35bdff2340 100644
--- a/eeschema/dialogs/dialog_choose_symbol.cpp
+++ b/eeschema/dialogs/dialog_choose_symbol.cpp
@@ -23,7 +23,6 @@
  */
 
 #include <algorithm>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <dialog_choose_symbol.h>
 #include <eeschema_settings.h>
diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index 0652582845..5fb889ae39 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -30,7 +30,6 @@
 #include <sch_edit_frame.h>
 #include <ee_collectors.h>
 #include <sch_component.h>
-#include <class_libentry.h>
 #include <lib_field.h>
 #include <template_fieldnames.h>
 #include <class_library.h>
diff --git a/eeschema/dialogs/dialog_edit_one_field.h b/eeschema/dialogs/dialog_edit_one_field.h
index 00e4a437d8..8c9ea56acf 100644
--- a/eeschema/dialogs/dialog_edit_one_field.h
+++ b/eeschema/dialogs/dialog_edit_one_field.h
@@ -30,7 +30,6 @@
 #include <dialog_lib_edit_text_base.h>
 #include <widgets/unit_binder.h>
 #include <lib_field.h>
-#include <class_libentry.h>
 #include <template_fieldnames.h>
 
 class SCH_BASE_FRAME;
diff --git a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
index 506b401b76..18fa9d7313 100644
--- a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp
@@ -26,7 +26,6 @@
  */
 
 #include <lib_item.h>
-#include <class_libentry.h>
 #include <dialog_lib_edit_draw_item.h>
 #include <symbol_edit_frame.h>
 
diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
index 40bd4f64b2..7ea62cea05 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@@ -22,7 +22,6 @@
  */
 
 #include <bitmaps.h>
-#include <class_libentry.h>
 #include <confirm.h>
 #include <dialogs/dialog_text_entry.h>
 #include <kiway.h>
diff --git a/eeschema/dialogs/dialog_pin_properties.cpp b/eeschema/dialogs/dialog_pin_properties.cpp
index a4be5e1fd1..0d71f4eff5 100644
--- a/eeschema/dialogs/dialog_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_pin_properties.cpp
@@ -25,7 +25,6 @@
 #include <bitmaps.h>
 #include <sch_painter.h>
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <lib_pin.h>
 #include <dialog_pin_properties.h>
 #include <confirm.h>
diff --git a/eeschema/dialogs/dialog_rescue_each.cpp b/eeschema/dialogs/dialog_rescue_each.cpp
index 5785575c81..7b3aeebe1b 100644
--- a/eeschema/dialogs/dialog_rescue_each.cpp
+++ b/eeschema/dialogs/dialog_rescue_each.cpp
@@ -22,7 +22,6 @@
  */
 
 #include <class_draw_panel_gal.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <dialog_rescue_each_base.h>
 #include <eeschema_settings.h>
diff --git a/eeschema/dialogs/panel_eeschema_color_settings.cpp b/eeschema/dialogs/panel_eeschema_color_settings.cpp
index 29505c025d..453fedf709 100644
--- a/eeschema/dialogs/panel_eeschema_color_settings.cpp
+++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp
@@ -24,7 +24,6 @@
 #include <eeschema_settings.h>
 #include <gal/gal_display_options.h>
 #include <layers_id_colors_and_visibility.h>
-#include <class_libentry.h>
 #include <lib_polyline.h>
 #include <page_info.h>
 #include <panel_eeschema_color_settings.h>
diff --git a/eeschema/dialogs/panel_eeschema_display_options.cpp b/eeschema/dialogs/panel_eeschema_display_options.cpp
index a754b92c69..4f048c45de 100644
--- a/eeschema/dialogs/panel_eeschema_display_options.cpp
+++ b/eeschema/dialogs/panel_eeschema_display_options.cpp
@@ -24,7 +24,6 @@
 
 #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>
diff --git a/eeschema/dialogs/panel_setup_formatting.cpp b/eeschema/dialogs/panel_setup_formatting.cpp
index a7c0c5a10d..1637393a91 100644
--- a/eeschema/dialogs/panel_setup_formatting.cpp
+++ b/eeschema/dialogs/panel_setup_formatting.cpp
@@ -23,7 +23,6 @@
 
 #include <sch_edit_frame.h>
 #include <sch_painter.h>
-#include <class_libentry.h>
 #include <eeschema_settings.h>
 #include <kiface_i.h>
 #include <panel_setup_formatting.h>
diff --git a/eeschema/ee_collectors.h b/eeschema/ee_collectors.h
index 743ed6471e..a7bf88c4c6 100644
--- a/eeschema/ee_collectors.h
+++ b/eeschema/ee_collectors.h
@@ -26,7 +26,7 @@
 #ifndef EE_COLLECTORS_H
 #define EE_COLLECTORS_H
 
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <collector.h>
 #include <dialogs/dialog_schematic_find.h>
 #include <sch_item.h>
diff --git a/eeschema/generate_alias_info.cpp b/eeschema/generate_alias_info.cpp
index 07d9174183..0aa12d4ae1 100644
--- a/eeschema/generate_alias_info.cpp
+++ b/eeschema/generate_alias_info.cpp
@@ -21,7 +21,7 @@
 #include <generate_alias_info.h>
 #include <kicad_string.h>
 #include <template_fieldnames.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <symbol_lib_table.h>
 
 
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index 20a7656bbc..929b17e8db 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -23,7 +23,6 @@
  */
 
 #include <pgm_base.h>
-#include <common.h>
 #include <eda_item.h>
 #include <gr_text.h>
 #include <kicad_string.h>
@@ -35,7 +34,7 @@
 #include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <general.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <transform.h>
 #include <lib_field.h>
 #include <template_fieldnames.h>
diff --git a/eeschema/class_libentry.cpp b/eeschema/lib_part.cpp
similarity index 99%
rename from eeschema/class_libentry.cpp
rename to eeschema/lib_part.cpp
index 3440ea180a..03b121d9aa 100644
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/lib_part.cpp
@@ -23,17 +23,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
 #include <sch_draw_panel.h>
 #include <plotter.h>
 #include <sch_screen.h>
 #include <richio.h>
-#include <trace_helpers.h>
 #include <general.h>
 #include <template_fieldnames.h>
 #include <transform.h>
 #include <class_library.h>
-#include <class_libentry.h>
 #include <lib_pin.h>
 #include <lib_arc.h>
 #include <settings/color_settings.h>
diff --git a/eeschema/class_libentry.h b/eeschema/lib_part.h
similarity index 100%
rename from eeschema/class_libentry.h
rename to eeschema/lib_part.h
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index 759b433808..178e7f21eb 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -26,11 +26,7 @@
 #include <pgm_base.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
-#include <base_units.h>
-#include <widgets/msgpanel.h>
-#include <general.h>
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <lib_pin.h>
 #include <settings/settings_manager.h>
 #include <symbol_editor/symbol_editor_settings.h>
diff --git a/eeschema/lib_pin.h b/eeschema/lib_pin.h
index d925ad2544..e306a06e31 100644
--- a/eeschema/lib_pin.h
+++ b/eeschema/lib_pin.h
@@ -32,7 +32,7 @@ class SCH_COMPONENT;
 #include <eda_rect.h>
 #include <lib_item.h>
 #include <pin_type.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 
 // Circle diameter drawn at the active end of pins:
 #define TARGET_PIN_RADIUS   Mils2iu( 15 )
diff --git a/eeschema/netlist_exporters/netlist_exporter_base.h b/eeschema/netlist_exporters/netlist_exporter_base.h
index f0158e0a96..4ba369956d 100644
--- a/eeschema/netlist_exporters/netlist_exporter_base.h
+++ b/eeschema/netlist_exporters/netlist_exporter_base.h
@@ -26,7 +26,6 @@
 #ifndef NETLIST_EXPORTER_H
 #define NETLIST_EXPORTER_H
 
-#include <class_libentry.h>
 #include <lib_pin.h>
 #include <sch_component.h>
 #include <sch_text.h>
diff --git a/eeschema/project_rescue.h b/eeschema/project_rescue.h
index 7906a618e4..ae8896f985 100644
--- a/eeschema/project_rescue.h
+++ b/eeschema/project_rescue.h
@@ -42,7 +42,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 
 #include <properties.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <class_draw_panel_gal.h>
 
diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 856a49c63c..8f8f1b2da9 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -28,7 +28,6 @@
 #include <sch_item.h>
 
 #include <bezier_curves.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <connection_graph.h>
 #include <gal/graphics_abstraction_layer.h>
diff --git a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
index 871157ec38..9d04d4690d 100644
--- a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
+++ b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
@@ -24,7 +24,6 @@
 
 #include <sch_plugins/eagle/sch_eagle_plugin.h>
 
-#include <kiway.h>
 #include <locale_io.h>
 #include <properties.h>
 
@@ -33,10 +32,8 @@
 #include <wx/filename.h>
 #include <wx/tokenzr.h>
 
-#include <class_libentry.h>
 #include <class_library.h>
 #include <plugins/eagle/eagle_parser.h>
-#include <gr_text.h>
 #include <lib_arc.h>
 #include <lib_circle.h>
 #include <lib_id.h>
@@ -45,7 +42,6 @@
 #include <lib_polyline.h>
 #include <lib_rectangle.h>
 #include <lib_text.h>
-#include <macros.h>
 #include <project.h>
 #include <sch_bus_entry.h>
 #include <sch_component.h>
@@ -60,7 +56,6 @@
 #include <sch_text.h>
 #include <schematic.h>
 #include <symbol_lib_table.h>
-#include <template_fieldnames.h>
 #include <wildcards_and_files_ext.h>
 #include <page_layout/ws_draw_item.h>
 
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
index 077c42442e..bcb4bfeb1b 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
@@ -31,10 +31,7 @@
 #include <wx/mstream.h>
 #include <wx/tokenzr.h>
 
-#include <common.h>
 #include <lib_id.h>
-
-#include <class_libentry.h>
 #include <lib_arc.h>
 #include <lib_bezier.h>
 #include <lib_circle.h>
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
index 47ad8bda9a..977de480ba 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@@ -42,7 +42,6 @@
 #include <schematic.h>
 #include <sch_plugins/kicad/sch_sexpr_plugin.h>
 #include <sch_screen.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <lib_arc.h>
 #include <lib_bezier.h>
diff --git a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
index c1bd40727a..d7023dc3bc 100644
--- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
+++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
@@ -55,7 +55,6 @@
 #include <template_fieldnames.h>
 #include <sch_screen.h>
 #include <schematic.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <lib_arc.h>
 #include <lib_bezier.h>
diff --git a/eeschema/sch_reference_list.h b/eeschema/sch_reference_list.h
index 6a65317868..593b8f9d22 100644
--- a/eeschema/sch_reference_list.h
+++ b/eeschema/sch_reference_list.h
@@ -26,17 +26,14 @@
 #ifndef _SCH_REFERENCE_LIST_H_
 #define _SCH_REFERENCE_LIST_H_
 
+#include <map>
 
-#include <macros.h>
-
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <sch_sheet_path.h>
 #include <sch_component.h>
 #include <sch_text.h>
 #include <erc_settings.h>
 
-#include <map>
-
 /**
  * A helper to define a symbol's reference designator in a schematic.
  *
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 7928479d1d..e1e0b4087b 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -30,7 +30,6 @@
  */
 
 #include <eda_rect.h>
-//#include <gr_text.h>
 #include <id.h>
 #include <kicad_string.h>
 #include <kiway.h>
@@ -43,7 +42,6 @@
 #include <sch_item.h>
 
 #include <class_library.h>
-#include <class_libentry.h>
 #include <connection_graph.h>
 #include <lib_pin.h>
 #include <sch_component.h>
diff --git a/eeschema/schematic_settings.cpp b/eeschema/schematic_settings.cpp
index cab3caa576..17db4083b0 100644
--- a/eeschema/schematic_settings.cpp
+++ b/eeschema/schematic_settings.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <base_screen.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <convert_to_biu.h>
 #include <default_values.h>
 #include <eda_text.h>
diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp
index 6d8e68f267..2cd68db44e 100644
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@@ -30,7 +30,6 @@
 #include <tools/ee_actions.h>
 #include <tools/symbol_editor_drawing_tools.h>
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <template_fieldnames.h>
 #include <wildcards_and_files_ext.h>
diff --git a/eeschema/symbol_editor/symbol_editor_import_export.cpp b/eeschema/symbol_editor/symbol_editor_import_export.cpp
index c432704fec..4dc0e3d963 100644
--- a/eeschema/symbol_editor/symbol_editor_import_export.cpp
+++ b/eeschema/symbol_editor/symbol_editor_import_export.cpp
@@ -26,7 +26,6 @@
 #include <confirm.h>
 #include <symbol_lib_table.h>
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <wildcards_and_files_ext.h>
 #include <symbol_library_manager.h>
diff --git a/eeschema/symbol_editor/symbol_editor_plotter.cpp b/eeschema/symbol_editor/symbol_editor_plotter.cpp
index c233be7411..24114f9f86 100644
--- a/eeschema/symbol_editor/symbol_editor_plotter.cpp
+++ b/eeschema/symbol_editor/symbol_editor_plotter.cpp
@@ -25,8 +25,6 @@
 #include <sch_painter.h>
 #include <symbol_edit_frame.h>
 #include <locale_io.h>
-#include <class_libentry.h>
-#include <class_library.h>
 #include <plotters_specific.h>
 
 void SYMBOL_EDIT_FRAME::SVGPlotSymbol( const wxString& aFullFileName )
diff --git a/eeschema/symbol_editor/symbol_editor_undo_redo.cpp b/eeschema/symbol_editor/symbol_editor_undo_redo.cpp
index efdbb4d8dd..c8e6c5a550 100644
--- a/eeschema/symbol_editor/symbol_editor_undo_redo.cpp
+++ b/eeschema/symbol_editor/symbol_editor_undo_redo.cpp
@@ -23,7 +23,6 @@
  */
 
 #include <symbol_edit_frame.h>
-#include <class_libentry.h>
 #include <symbol_library_manager.h>
 #include <widgets/lib_tree.h>
 #include <symbol_tree_pane.h>
diff --git a/eeschema/symbol_editor/symbol_library_manager.cpp b/eeschema/symbol_editor/symbol_library_manager.cpp
index b9609b83d0..f8eb9afdd1 100644
--- a/eeschema/symbol_editor/symbol_library_manager.cpp
+++ b/eeschema/symbol_editor/symbol_library_manager.cpp
@@ -24,7 +24,6 @@
  */
 
 #include <symbol_library_manager.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <symbol_edit_frame.h>
 #include <env_paths.h>
diff --git a/eeschema/symbol_lib_table.cpp b/eeschema/symbol_lib_table.cpp
index 543b36f6ea..533da4d3e2 100644
--- a/eeschema/symbol_lib_table.cpp
+++ b/eeschema/symbol_lib_table.cpp
@@ -30,7 +30,7 @@
 #include <settings/settings_manager.h>
 #include <systemdirsappend.h>
 #include <symbol_lib_table.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 
 #define OPT_SEP     '|'         ///< options separator character
 
diff --git a/eeschema/symbol_lib_table.h b/eeschema/symbol_lib_table.h
index beff5bbd78..c30c9ea9f8 100644
--- a/eeschema/symbol_lib_table.h
+++ b/eeschema/symbol_lib_table.h
@@ -28,7 +28,6 @@
 #include <lib_table_base.h>
 #include <sch_io_mgr.h>
 #include <lib_id.h>
-#include <class_libentry.h>
 
 //class LIB_PART;
 class SYMBOL_LIB_TABLE_GRID;
diff --git a/eeschema/symbol_tree_model_adapter.cpp b/eeschema/symbol_tree_model_adapter.cpp
index 4ead37f02e..d324263cf5 100644
--- a/eeschema/symbol_tree_model_adapter.cpp
+++ b/eeschema/symbol_tree_model_adapter.cpp
@@ -25,9 +25,8 @@
 
 #include <eda_pattern_match.h>
 #include <symbol_lib_table.h>
-#include <class_libentry.h>
+#include <lib_part.h>
 #include <generate_alias_info.h>
-
 #include <symbol_tree_model_adapter.h>
 
 
diff --git a/eeschema/symbol_tree_synchronizing_adapter.cpp b/eeschema/symbol_tree_synchronizing_adapter.cpp
index b42510aac3..7728c42ef4 100644
--- a/eeschema/symbol_tree_synchronizing_adapter.cpp
+++ b/eeschema/symbol_tree_synchronizing_adapter.cpp
@@ -26,7 +26,6 @@
 #include <symbol_tree_synchronizing_adapter.h>
 #include <symbol_library_manager.h>
 #include <symbol_lib_table.h>
-#include <class_libentry.h>
 #include <tools/symbol_editor_control.h>
 
 
diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp
index 008db8a39b..bd0621b057 100644
--- a/eeschema/symbol_viewer_frame.cpp
+++ b/eeschema/symbol_viewer_frame.cpp
@@ -24,7 +24,6 @@
  */
 
 #include <bitmaps.h>
-#include <class_libentry.h>
 #include <class_library.h>
 #include <confirm.h>
 #include <dialog_helpers.h>
diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 4e5ea0f267..15b32163ac 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -23,7 +23,6 @@
  */
 
 
-#include <class_libentry.h>
 #include <core/typeinfo.h>
 #include <ee_actions.h>
 #include <ee_collectors.h>
diff --git a/eeschema/tools/symbol_editor_drawing_tools.cpp b/eeschema/tools/symbol_editor_drawing_tools.cpp
index f9aac62a9e..8f14b9f946 100644
--- a/eeschema/tools/symbol_editor_drawing_tools.cpp
+++ b/eeschema/tools/symbol_editor_drawing_tools.cpp
@@ -24,11 +24,8 @@
 
 #include <ee_actions.h>
 #include <symbol_edit_frame.h>
-#include <view/view_controls.h>
-#include <tool/tool_manager.h>
 #include <tools/symbol_editor_drawing_tools.h>
 #include <tools/symbol_editor_pin_tool.h>
-#include <class_libentry.h>
 #include <bitmaps.h>
 #include <lib_text.h>
 #include <dialogs/dialog_lib_edit_text.h>
diff --git a/eeschema/widgets/symbol_preview_widget.cpp b/eeschema/widgets/symbol_preview_widget.cpp
index 9abd3a28d6..98d5b68625 100644
--- a/eeschema/widgets/symbol_preview_widget.cpp
+++ b/eeschema/widgets/symbol_preview_widget.cpp
@@ -18,12 +18,8 @@
  */
 
 #include "symbol_preview_widget.h"
-#include <wx/stattext.h>
-#include <wx/sizer.h>
-#include <kiway.h>
 #include <sch_view.h>
 #include <gal/gal_display_options.h>
-#include <class_libentry.h>
 #include <symbol_lib_table.h>
 #include <sch_preview_panel.h>
 #include <pgm_base.h>
diff --git a/qa/eeschema/lib_field_test_utils.h b/qa/eeschema/lib_field_test_utils.h
index cd374216f2..7c559c6e9d 100644
--- a/qa/eeschema/lib_field_test_utils.h
+++ b/qa/eeschema/lib_field_test_utils.h
@@ -31,7 +31,6 @@
 
 #include <unit_test_utils/unit_test_utils.h>
 
-#include <class_libentry.h>
 #include <template_fieldnames.h>
 
 
diff --git a/qa/eeschema/test_lib_part.cpp b/qa/eeschema/test_lib_part.cpp
index 53ae04aa37..00284ee5b6 100644
--- a/qa/eeschema/test_lib_part.cpp
+++ b/qa/eeschema/test_lib_part.cpp
@@ -29,7 +29,6 @@
 #include <unit_test_utils/unit_test_utils.h>
 
 // Code under test
-#include <class_libentry.h>
 #include <lib_rectangle.h>
 #include <lib_arc.h>
 #include <lib_pin.h>