From ff099453c8d0add550f895dd61a1dc4e90ecf81b Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@gmail.com>
Date: Tue, 15 Jun 2021 09:24:55 -0400
Subject: [PATCH] Rename class_library.[h|cpp] to symbol_library.[h|cpp].

---
 eeschema/CMakeLists.txt                                   | 2 +-
 eeschema/annotate.cpp                                     | 2 +-
 eeschema/dialogs/dialog_choose_symbol.cpp                 | 2 +-
 eeschema/dialogs/dialog_edit_one_field.cpp                | 2 +-
 eeschema/dialogs/dialog_fields_editor_global.cpp          | 2 +-
 eeschema/dialogs/dialog_lib_edit_pin_table.h              | 2 +-
 eeschema/dialogs/dialog_rescue_each.cpp                   | 2 +-
 eeschema/dialogs/dialog_symbol_properties.cpp             | 2 +-
 eeschema/dialogs/dialog_symbol_remap.cpp                  | 2 +-
 eeschema/eeschema_config.cpp                              | 2 +-
 eeschema/fields_grid_table.cpp                            | 2 +-
 eeschema/files-io.cpp                                     | 2 +-
 eeschema/getpart.cpp                                      | 2 +-
 eeschema/lib_symbol.cpp                                   | 2 +-
 eeschema/libarch.cpp                                      | 2 +-
 eeschema/netlist_exporters/netlist_exporter_base.cpp      | 2 +-
 eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp | 2 +-
 eeschema/netlist_exporters/netlist_exporter_xml.cpp       | 2 +-
 eeschema/project_rescue.cpp                               | 2 +-
 eeschema/sch_base_frame.cpp                               | 2 +-
 eeschema/sch_edit_frame.cpp                               | 2 +-
 eeschema/sch_field.cpp                                    | 2 +-
 eeschema/sch_painter.cpp                                  | 2 +-
 eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp           | 2 +-
 eeschema/sch_plugins/kicad/sch_sexpr_parser.h             | 2 +-
 eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp           | 2 +-
 eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp         | 2 +-
 eeschema/sch_screen.cpp                                   | 2 +-
 eeschema/sch_sheet_path.cpp                               | 2 +-
 eeschema/symbol_editor/symbol_edit_frame.cpp              | 2 +-
 eeschema/symbol_editor/symbol_editor.cpp                  | 2 +-
 eeschema/symbol_editor/symbol_editor_import_export.cpp    | 2 +-
 eeschema/symbol_editor/symbol_library_manager.cpp         | 2 +-
 eeschema/{class_library.cpp => symbol_library.cpp}        | 2 +-
 eeschema/{class_library.h => symbol_library.h}            | 8 ++++----
 eeschema/symbol_viewer_frame.cpp                          | 2 +-
 eeschema/toolbars_symbol_viewer.cpp                       | 4 ++--
 eeschema/tools/sch_drawing_tools.cpp                      | 2 +-
 eeschema/tools/sch_editor_control.cpp                     | 2 +-
 39 files changed, 43 insertions(+), 43 deletions(-)
 rename eeschema/{class_library.cpp => symbol_library.cpp} (99%)
 rename eeschema/{class_library.h => symbol_library.h} (99%)

diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 6cbf52a980..003987ae52 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -163,7 +163,6 @@ set( EESCHEMA_SRCS
     autoplace_fields.cpp
     bus_alias.cpp
     bus-wire-junction.cpp
-    class_library.cpp
     cmp_library_lexer.cpp
     component_references_lister.cpp
     connection_graph.cpp
@@ -228,6 +227,7 @@ set( EESCHEMA_SRCS
     sheet.cpp
     symbol_async_loader.cpp
     symbol_lib_table.cpp
+    symbol_library.cpp
     symbol_tree_model_adapter.cpp
     symbol_tree_synchronizing_adapter.cpp
     toolbars_symbol_viewer.cpp
diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index 36bc537f3c..0554424a59 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -29,7 +29,7 @@
 #include <schematic.h>
 #include <erc_settings.h>
 #include <sch_reference_list.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <tools/ee_selection.h>
 #include <tools/ee_selection_tool.h>
 #include <tool/tool_manager.h>
diff --git a/eeschema/dialogs/dialog_choose_symbol.cpp b/eeschema/dialogs/dialog_choose_symbol.cpp
index 37810ab290..368dfde325 100644
--- a/eeschema/dialogs/dialog_choose_symbol.cpp
+++ b/eeschema/dialogs/dialog_choose_symbol.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <algorithm>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <dialog_choose_symbol.h>
 #include <eeschema_settings.h>
 #include <kiface_i.h>
diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index 2458fdc7aa..df216009d2 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -33,7 +33,7 @@
 #include <sch_symbol.h>
 #include <lib_field.h>
 #include <template_fieldnames.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <sch_validators.h>
 #include <schematic.h>
 #include <dialog_edit_one_field.h>
diff --git a/eeschema/dialogs/dialog_fields_editor_global.cpp b/eeschema/dialogs/dialog_fields_editor_global.cpp
index dd2b1bafcf..e0201d53e1 100644
--- a/eeschema/dialogs/dialog_fields_editor_global.cpp
+++ b/eeschema/dialogs/dialog_fields_editor_global.cpp
@@ -25,7 +25,7 @@
 
 #include <base_units.h>
 #include <bitmaps.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <eda_doc.h>
 #include <eeschema_settings.h>
diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.h b/eeschema/dialogs/dialog_lib_edit_pin_table.h
index 1838f5e7da..97fbb03884 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin_table.h
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table.h
@@ -24,7 +24,7 @@
 #include "dialog_lib_edit_pin_table_base.h"
 
 #include <lib_item.h>
-#include <class_library.h>
+#include <symbol_library.h>
 
 enum COL_ORDER
 {
diff --git a/eeschema/dialogs/dialog_rescue_each.cpp b/eeschema/dialogs/dialog_rescue_each.cpp
index e6e684890d..078b82066a 100644
--- a/eeschema/dialogs/dialog_rescue_each.cpp
+++ b/eeschema/dialogs/dialog_rescue_each.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <class_draw_panel_gal.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <dialog_rescue_each_base.h>
 #include <eeschema_settings.h>
 #include <invoke_sch_dialog.h>
diff --git a/eeschema/dialogs/dialog_symbol_properties.cpp b/eeschema/dialogs/dialog_symbol_properties.cpp
index bdedc6d726..df0bdf6800 100644
--- a/eeschema/dialogs/dialog_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_symbol_properties.cpp
@@ -36,7 +36,7 @@
 #include <widgets/wx_grid.h>
 #include <settings/settings_manager.h>
 #include <ee_collectors.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <fields_grid_table.h>
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
diff --git a/eeschema/dialogs/dialog_symbol_remap.cpp b/eeschema/dialogs/dialog_symbol_remap.cpp
index 61f10e3e97..2738a391f7 100644
--- a/eeschema/dialogs/dialog_symbol_remap.cpp
+++ b/eeschema/dialogs/dialog_symbol_remap.cpp
@@ -31,7 +31,7 @@
 #include <wildcards_and_files_ext.h>
 #include <wx_html_report_panel.h>
 
-#include <class_library.h>
+#include <symbol_library.h>
 #include <core/kicad_algo.h>
 #include <symbol_viewer_frame.h>
 #include <project_rescue.h>
diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp
index beacda1050..648818adf8 100644
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@@ -23,7 +23,7 @@
 
 #include <mutex>
 
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <dialogs/panel_eeschema_color_settings.h>
 #include <dialogs/panel_eeschema_display_options.h>
diff --git a/eeschema/fields_grid_table.cpp b/eeschema/fields_grid_table.cpp
index beb31d854c..d25134de29 100644
--- a/eeschema/fields_grid_table.cpp
+++ b/eeschema/fields_grid_table.cpp
@@ -29,7 +29,7 @@
 #include <sch_field.h>
 #include <sch_validators.h>
 #include <validators.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <template_fieldnames.h>
 #include <widgets/grid_text_button_helpers.h>
 #include <wildcards_and_files_ext.h>
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 5761756fad..c331410c00 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -24,7 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <connection_graph.h>
 #include <dialog_migrate_buses.h>
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 8f8fd533d7..3487606460 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <algorithm>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <eeschema_id.h>
 #include <general.h>
diff --git a/eeschema/lib_symbol.cpp b/eeschema/lib_symbol.cpp
index 85ec62a5e1..199f0f51ef 100644
--- a/eeschema/lib_symbol.cpp
+++ b/eeschema/lib_symbol.cpp
@@ -30,7 +30,7 @@
 #include <general.h>
 #include <template_fieldnames.h>
 #include <transform.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <lib_pin.h>
 #include <lib_arc.h>
 #include <settings/color_settings.h>
diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 28ef693aa9..ed1e46580f 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -33,7 +33,7 @@
 
 #include <sch_edit_frame.h>
 #include <symbol_lib_table.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <sch_symbol.h>
 #include <sch_sheet.h>
 #include <schematic.h>
diff --git a/eeschema/netlist_exporters/netlist_exporter_base.cpp b/eeschema/netlist_exporters/netlist_exporter_base.cpp
index 8b61ecc518..e633e97561 100644
--- a/eeschema/netlist_exporters/netlist_exporter_base.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_base.cpp
@@ -27,7 +27,7 @@
 
 #include <refdes_utils.h>
 
-#include <class_library.h>
+#include <symbol_library.h>
 #include <connection_graph.h>
 #include <sch_reference_list.h>
 #include <sch_screen.h>
diff --git a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
index b58dccdfb4..c82e562b9e 100644
--- a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
@@ -29,7 +29,7 @@
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
 #include <kicad_string.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <symbol_lib_table.h>
 
 #include <netlist.h>
diff --git a/eeschema/netlist_exporters/netlist_exporter_xml.cpp b/eeschema/netlist_exporters/netlist_exporter_xml.cpp
index 05497a99e3..e03afca13f 100644
--- a/eeschema/netlist_exporters/netlist_exporter_xml.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_xml.cpp
@@ -28,7 +28,7 @@
 #include <build_version.h>
 #include <common.h>     // for ExpandTextVars
 #include <sch_base_frame.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <kicad_string.h>
 #include <connection_graph.h>
 #include <refdes_utils.h>
diff --git a/eeschema/project_rescue.cpp b/eeschema/project_rescue.cpp
index 4db43fff42..8b148775ec 100644
--- a/eeschema/project_rescue.cpp
+++ b/eeschema/project_rescue.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <sch_draw_panel.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <connection_graph.h>
 #include <invoke_sch_dialog.h>
diff --git a/eeschema/sch_base_frame.cpp b/eeschema/sch_base_frame.cpp
index 780d028fdc..2e6f4018e3 100644
--- a/eeschema/sch_base_frame.cpp
+++ b/eeschema/sch_base_frame.cpp
@@ -33,7 +33,7 @@
 #include <settings/settings_manager.h>
 #include <confirm.h>
 #include <preview_items/selection_area.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <sch_base_frame.h>
 #include <symbol_lib_table.h>
 #include <tool/action_toolbar.h>
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index ccbca9ff2b..e28f5380be 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -24,7 +24,7 @@
 
 #include <base_units.h>
 #include <bitmaps.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <connection_graph.h>
 #include <dialogs/dialog_schematic_find.h>
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index bb0113b0dc..115a37d1ec 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -41,7 +41,7 @@
 #include <core/mirror.h>
 #include <kiway.h>
 #include <general.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <sch_symbol.h>
 #include <sch_field.h>
 #include <schematic.h>
diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index e44529e678..dbdf6bcac9 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -28,7 +28,7 @@
 #include <sch_item.h>
 
 #include <bezier_curves.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <connection_graph.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <geometry/geometry_utils.h>
diff --git a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
index fbc0478f54..a49d4ed381 100644
--- a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
+++ b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
@@ -34,7 +34,7 @@
 #include <wx/wfstream.h>
 #include <wx/xml/xml.h>
 
-#include <class_library.h>
+#include <symbol_library.h>
 #include <plugins/eagle/eagle_parser.h>
 #include <kicad_string.h>
 #include <lib_arc.h>
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_parser.h b/eeschema/sch_plugins/kicad/sch_sexpr_parser.h
index 04c498fb0b..b245b29517 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_parser.h
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_parser.h
@@ -34,7 +34,7 @@
 
 #include <convert_to_biu.h>                      // IU_PER_MM
 
-#include <class_library.h>
+#include <symbol_library.h>
 #include <schematic_lexer.h>
 #include <sch_file_versions.h>
 #include <default_values.h>    // For some default values
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
index 08eff3f0cb..0dbdc0236d 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@@ -44,7 +44,7 @@
 #include <schematic.h>
 #include <sch_plugins/kicad/sch_sexpr_plugin.h>
 #include <sch_screen.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <lib_arc.h>
 #include <lib_bezier.h>
 #include <lib_circle.h>
diff --git a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
index 62ca83a10d..6315c0f164 100644
--- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
+++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
@@ -59,7 +59,7 @@
 #include <template_fieldnames.h>
 #include <sch_screen.h>
 #include <schematic.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <lib_arc.h>
 #include <lib_bezier.h>
 #include <lib_circle.h>
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 414ef02a2a..8f9197a51c 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -43,7 +43,7 @@
 #include <sch_edit_frame.h>
 #include <sch_item.h>
 
-#include <class_library.h>
+#include <symbol_library.h>
 #include <connection_graph.h>
 #include <lib_pin.h>
 #include <sch_symbol.h>
diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp
index 2e2c39aa31..1455362a8e 100644
--- a/eeschema/sch_sheet_path.cpp
+++ b/eeschema/sch_sheet_path.cpp
@@ -27,7 +27,7 @@
 #include <sch_item.h>
 #include <sch_marker.h>
 #include <sch_reference_list.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <sch_sheet_path.h>
 #include <sch_symbol.h>
 #include <sch_sheet.h>
diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp
index a0262e8d7b..475cfb369d 100644
--- a/eeschema/symbol_editor/symbol_edit_frame.cpp
+++ b/eeschema/symbol_editor/symbol_edit_frame.cpp
@@ -26,7 +26,7 @@
 #include <bitmaps.h>
 #include <wx/hyperlink.h>
 #include <base_screen.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <core/kicad_algo.h>
 #include <eeschema_id.h>
diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp
index bcda9fc39d..5245c98c2d 100644
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@@ -29,7 +29,7 @@
 #include <tools/ee_actions.h>
 #include <tools/symbol_editor_drawing_tools.h>
 #include <symbol_edit_frame.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <template_fieldnames.h>
 #include <wildcards_and_files_ext.h>
 #include <symbol_lib_table.h>
diff --git a/eeschema/symbol_editor/symbol_editor_import_export.cpp b/eeschema/symbol_editor/symbol_editor_import_export.cpp
index 527229eb5d..179de53a92 100644
--- a/eeschema/symbol_editor/symbol_editor_import_export.cpp
+++ b/eeschema/symbol_editor/symbol_editor_import_export.cpp
@@ -26,7 +26,7 @@
 #include <confirm.h>
 #include <symbol_lib_table.h>
 #include <symbol_edit_frame.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <wildcards_and_files_ext.h>
 #include <symbol_library_manager.h>
 #include <wx/filename.h>
diff --git a/eeschema/symbol_editor/symbol_library_manager.cpp b/eeschema/symbol_editor/symbol_library_manager.cpp
index 6e5cf79ae2..fffd91cd4e 100644
--- a/eeschema/symbol_editor/symbol_library_manager.cpp
+++ b/eeschema/symbol_editor/symbol_library_manager.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <symbol_library_manager.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <dialogs/html_messagebox.h>
 #include <symbol_edit_frame.h>
 #include <env_paths.h>
diff --git a/eeschema/class_library.cpp b/eeschema/symbol_library.cpp
similarity index 99%
rename from eeschema/class_library.cpp
rename to eeschema/symbol_library.cpp
index 87c6ce24f0..fa9f76b0d9 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/symbol_library.cpp
@@ -41,7 +41,7 @@
 #include <widgets/app_progress_dialog.h>
 
 #include <general.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <sch_plugins/legacy/sch_legacy_plugin.h>
 
 #include <wx/log.h>
diff --git a/eeschema/class_library.h b/eeschema/symbol_library.h
similarity index 99%
rename from eeschema/class_library.h
rename to eeschema/symbol_library.h
index ec7cf6bb5e..4f75601f8f 100644
--- a/eeschema/class_library.h
+++ b/eeschema/symbol_library.h
@@ -24,12 +24,12 @@
  */
 
 /**
- * @file class_library.h
+ * @file symbol_library.h
  * @brief Definition for symbol library class.
  */
 
-#ifndef CLASS_LIBRARY_H
-#define CLASS_LIBRARY_H
+#ifndef SYMBOL_LIBRARY_H
+#define SYMBOL_LIBRARY_H
 
 #include <map>
 #include <mutex>
@@ -483,4 +483,4 @@ private:
 bool operator==( const SYMBOL_LIB& aLibrary, const wxString& aName );
 bool operator!=( const SYMBOL_LIB& aLibrary, const wxString& aName );
 
-#endif  //  CLASS_LIBRARY_H
+#endif  //  SYMBOL_LIBRARY_H
diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp
index 9117fa561a..b7444bf157 100644
--- a/eeschema/symbol_viewer_frame.cpp
+++ b/eeschema/symbol_viewer_frame.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <bitmaps.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <dialog_helpers.h>
 #include <dialog_choose_symbol.h>
diff --git a/eeschema/toolbars_symbol_viewer.cpp b/eeschema/toolbars_symbol_viewer.cpp
index 7b8d56689b..d557da3cb0 100644
--- a/eeschema/toolbars_symbol_viewer.cpp
+++ b/eeschema/toolbars_symbol_viewer.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
  * Copyright (C) 2019 CERN
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
 
 #include <bitmaps.h>
 #include <macros.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <eeschema_id.h>
 #include <symbol_viewer_frame.h>
 #include <sch_painter.h>
diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp
index ff10bfb113..0ab9b88708 100644
--- a/eeschema/tools/sch_drawing_tools.cpp
+++ b/eeschema/tools/sch_drawing_tools.cpp
@@ -44,7 +44,7 @@
 #include <sch_sheet_pin.h>
 #include <sch_bitmap.h>
 #include <schematic.h>
-#include <class_library.h>
+#include <symbol_library.h>
 #include <eeschema_settings.h>
 #include <dialogs/dialog_edit_label.h>
 #include <dialogs/dialog_edit_line_style.h>
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index f0173e5885..d0f1137450 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <class_library.h>
+#include <symbol_library.h>
 #include <confirm.h>
 #include <widgets/infobar.h>
 #include <connection_graph.h>