From 6aaf4413b32b08ea7eeee96d723c77ea967ccd72 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Thu, 29 Jul 2021 10:56:22 +0100
Subject: [PATCH] Fix kicad_string.h / string.cpp mismatch.

They don't define a KiCad string class, so the header file name was
somewhat misleading. But the fact that they didn't match definitely
made coding more difficult.
---
 3d-viewer/3d_cache/3d_cache.h                        |  2 +-
 3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp   |  2 +-
 common/CMakeLists.txt                                |  2 +-
 common/base_units.cpp                                |  2 +-
 common/dialogs/eda_list_dialog.cpp                   |  2 +-
 common/dialogs/html_messagebox.cpp                   |  2 +-
 common/dialogs/panel_setup_netclasses.cpp            |  2 +-
 common/dialogs/wx_html_report_panel.cpp              |  2 +-
 common/drawing_sheet/drawing_sheet_reader.cpp        |  2 +-
 common/drawing_sheet/ds_data_model_io.cpp            |  2 +-
 common/eda_text.cpp                                  |  2 +-
 common/footprint_info.cpp                            |  2 +-
 common/hotkeys_basic.cpp                             |  2 +-
 common/lib_tree_model.cpp                            |  2 +-
 common/lib_tree_model_adapter.cpp                    |  2 +-
 common/libeval/numeric_evaluator.cpp                 |  2 +-
 common/libeval_compiler/libeval_compiler.cpp         |  2 +-
 common/plotters/DXF_plotter.cpp                      |  2 +-
 common/plotters/GERBER_plotter.cpp                   |  2 +-
 common/plotters/HPGL_plotter.cpp                     |  2 +-
 common/plotters/SVG_plotter.cpp                      |  2 +-
 common/plugins/altium/altium_parser_utils.cpp        |  2 +-
 common/plugins/altium/altium_parser_utils.h          |  2 +-
 common/plugins/eagle/eagle_parser.cpp                |  2 +-
 common/project.cpp                                   |  2 +-
 common/project/net_settings.cpp                      |  2 +-
 common/refdes_utils.cpp                              |  2 +-
 common/scintilla_tricks.cpp                          |  2 +-
 common/{string.cpp => string_utils.cpp}              |  2 +-
 common/validators.cpp                                |  2 +-
 common/widgets/grid_text_button_helpers.cpp          |  2 +-
 common/widgets/grid_text_helpers.cpp                 |  2 +-
 common/widgets/net_selector.cpp                      |  2 +-
 cvpcb/auto_associate.cpp                             |  2 +-
 eeschema/connection_graph.cpp                        |  2 +-
 eeschema/cross-probing.cpp                           |  2 +-
 eeschema/dialogs/dialog_change_symbols.cpp           |  2 +-
 eeschema/dialogs/dialog_edit_label.cpp               |  2 +-
 eeschema/dialogs/dialog_edit_one_field.cpp           |  2 +-
 eeschema/dialogs/dialog_edit_symbols_libid.cpp       |  2 +-
 eeschema/dialogs/dialog_erc.cpp                      |  2 +-
 .../dialogs/dialog_global_edit_text_and_graphics.cpp |  2 +-
 eeschema/dialogs/dialog_lib_edit_pin_table.cpp       |  2 +-
 eeschema/dialogs/dialog_lib_new_symbol.h             |  2 +-
 eeschema/dialogs/dialog_lib_symbol_properties.cpp    |  2 +-
 eeschema/dialogs/dialog_sheet_pin_properties.cpp     |  2 +-
 eeschema/dialogs/dialog_signal_list.cpp              |  2 +-
 eeschema/dialogs/dialog_symbol_fields_table.cpp      |  2 +-
 eeschema/dialogs/dialog_symbol_properties.cpp        |  2 +-
 eeschema/dialogs/dialog_update_symbol_fields.cpp     |  2 +-
 eeschema/erc.cpp                                     |  2 +-
 eeschema/fields_grid_table.cpp                       |  2 +-
 eeschema/generate_alias_info.cpp                     |  2 +-
 eeschema/lib_field.cpp                               |  2 +-
 .../netlist_exporters/netlist_exporter_cadstar.cpp   |  2 +-
 .../netlist_exporters/netlist_exporter_orcadpcb2.cpp |  2 +-
 .../netlist_exporters/netlist_exporter_pspice.cpp    |  2 +-
 eeschema/netlist_exporters/netlist_exporter_xml.cpp  |  2 +-
 eeschema/netlist_exporters/netlist_generator.cpp     |  2 +-
 eeschema/sch_connection.cpp                          |  2 +-
 eeschema/sch_edit_frame.cpp                          |  2 +-
 eeschema/sch_field.cpp                               |  2 +-
 eeschema/sch_painter.cpp                             |  2 +-
 eeschema/sch_plugins/altium/sch_altium_plugin.cpp    |  2 +-
 .../cadstar/cadstar_sch_archive_loader.cpp           |  2 +-
 eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp      |  2 +-
 eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp      |  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.cpp                               |  2 +-
 eeschema/sch_sheet_pin.cpp                           |  2 +-
 eeschema/sch_symbol.cpp                              |  2 +-
 eeschema/sch_text.cpp                                |  2 +-
 eeschema/sim/netlist_exporter_pspice_sim.cpp         |  2 +-
 eeschema/sim/sim_plot_frame.cpp                      |  2 +-
 eeschema/symbol_editor/symbol_edit_frame.cpp         |  2 +-
 eeschema/symbol_editor/symbol_editor.cpp             |  2 +-
 .../symbol_editor/symbol_editor_import_export.cpp    |  2 +-
 eeschema/symbol_editor/symbol_library_manager.cpp    |  2 +-
 eeschema/symbol_library.cpp                          |  2 +-
 eeschema/symbol_tree_synchronizing_adapter.cpp       |  2 +-
 eeschema/symbol_viewer_frame.cpp                     |  2 +-
 eeschema/tools/assign_footprints.cpp                 |  2 +-
 eeschema/tools/backannotate.cpp                      |  2 +-
 eeschema/tools/sch_drawing_tools.cpp                 |  2 +-
 eeschema/tools/sch_edit_tool.cpp                     |  2 +-
 eeschema/tools/sch_editor_control.cpp                |  2 +-
 eeschema/tools/symbol_editor_drawing_tools.cpp       |  2 +-
 eeschema/tools/symbol_editor_edit_tool.cpp           |  2 +-
 gerbview/excellon_read_drill_file.cpp                |  2 +-
 gerbview/export_to_pcbnew.cpp                        |  2 +-
 gerbview/gerber_draw_item.cpp                        |  2 +-
 gerbview/readgerb.cpp                                |  2 +-
 gerbview/toolbars_gerber.cpp                         |  2 +-
 gerbview/tools/gerbview_control.cpp                  |  2 +-
 gerbview/tools/gerbview_selection_tool.cpp           |  2 +-
 include/lib_table_grid.h                             |  2 +-
 include/{kicad_string.h => string_utils.h}           | 12 +++---------
 pcb_calculator/datafile_read_write.cpp               |  2 +-
 pcbnew/board.cpp                                     |  2 +-
 pcbnew/board_connected_item.cpp                      |  2 +-
 pcbnew/board_items_to_polygon_shape_transform.cpp    |  2 +-
 pcbnew/board_stackup_manager/board_stackup.cpp       |  2 +-
 pcbnew/build_BOM_from_board.cpp                      |  2 +-
 pcbnew/connectivity/from_to_cache.cpp                |  2 +-
 pcbnew/dialogs/dialog_board_reannotate.cpp           |  2 +-
 pcbnew/dialogs/dialog_copper_zones.cpp               |  2 +-
 pcbnew/dialogs/dialog_exchange_footprints.cpp        |  2 +-
 pcbnew/dialogs/dialog_find.cpp                       |  2 +-
 pcbnew/dialogs/dialog_footprint_wizard_list.cpp      |  2 +-
 .../dialogs/dialog_global_edit_text_and_graphics.cpp |  2 +-
 pcbnew/dialogs/dialog_net_inspector.cpp              |  2 +-
 pcbnew/dialogs/dialog_text_properties.cpp            |  2 +-
 pcbnew/dialogs/panel_edit_options.cpp                |  2 +-
 pcbnew/dialogs/panel_setup_rules.cpp                 |  2 +-
 pcbnew/drc/drc_engine.cpp                            |  2 +-
 pcbnew/exporters/export_footprint_associations.cpp   |  2 +-
 pcbnew/exporters/export_footprints_placefile.cpp     |  2 +-
 pcbnew/exporters/gen_drill_report_files.cpp          |  2 +-
 pcbnew/exporters/gen_footprints_placefile.cpp        |  2 +-
 pcbnew/exporters/gendrill_Excellon_writer.cpp        |  2 +-
 pcbnew/exporters/gendrill_gerber_writer.cpp          |  2 +-
 pcbnew/exporters/gerber_placefile_writer.cpp         |  2 +-
 pcbnew/footprint.cpp                                 |  2 +-
 pcbnew/footprint_info_impl.cpp                       |  2 +-
 pcbnew/footprint_libraries_utils.cpp                 |  2 +-
 pcbnew/fp_text.cpp                                   |  2 +-
 pcbnew/fp_tree_model_adapter.cpp                     |  2 +-
 pcbnew/fp_tree_synchronizing_adapter.cpp             |  2 +-
 pcbnew/generate_footprint_info.cpp                   |  2 +-
 pcbnew/load_select_footprint.cpp                     |  2 +-
 pcbnew/microwave/microwave_polygon.cpp               |  2 +-
 pcbnew/netinfo_item.cpp                              |  2 +-
 pcbnew/netlist_reader/board_netlist_updater.cpp      |  2 +-
 pcbnew/netlist_reader/legacy_netlist_reader.cpp      |  2 +-
 pcbnew/netlist_reader/netlist_reader.cpp             |  2 +-
 pcbnew/pad.cpp                                       |  2 +-
 pcbnew/pcb_painter.cpp                               |  2 +-
 pcbnew/pcb_text.cpp                                  |  2 +-
 pcbnew/pcb_track.cpp                                 |  2 +-
 pcbnew/plot_brditems_plotter.cpp                     |  2 +-
 pcbnew/plugins/altium/altium_pcb.cpp                 |  2 +-
 pcbnew/plugins/eagle/eagle_plugin.cpp                |  2 +-
 pcbnew/plugins/fabmaster/import_fabmaster.cpp        |  2 +-
 pcbnew/plugins/kicad/kicad_plugin.cpp                |  2 +-
 pcbnew/plugins/kicad/pcb_parser.cpp                  |  2 +-
 pcbnew/plugins/legacy/legacy_plugin.cpp              |  2 +-
 pcbnew/python/scripting/pcbnew_scripting.cpp         |  2 +-
 pcbnew/python/scripting/pcbnew_scripting_helpers.cpp |  2 +-
 pcbnew/tools/board_inspection_tool.cpp               |  2 +-
 pcbnew/tools/drawing_stackup_table_tool.cpp          |  2 +-
 pcbnew/tools/drawing_tool.cpp                        |  2 +-
 pcbnew/zone.cpp                                      |  2 +-
 qa/common/test_kicad_string.cpp                      |  2 +-
 qa/drc_proto/drc_proto.cpp                           |  2 +-
 scripting/python_scripting.cpp                       |  2 +-
 157 files changed, 159 insertions(+), 165 deletions(-)
 rename common/{string.cpp => string_utils.cpp} (99%)
 rename include/{kicad_string.h => string_utils.h} (98%)

diff --git a/3d-viewer/3d_cache/3d_cache.h b/3d-viewer/3d_cache/3d_cache.h
index 3ee726652b..fe79162e03 100644
--- a/3d-viewer/3d_cache/3d_cache.h
+++ b/3d-viewer/3d_cache/3d_cache.h
@@ -31,7 +31,7 @@
 
 #include "3d_info.h"
 #include <core/typeinfo.h>
-#include "kicad_string.h"
+#include "string_utils.h"
 #include <list>
 #include <map>
 #include "plugins/3dapi/c3dmodel.h"
diff --git a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
index 72d592a427..f05a8b3de3 100644
--- a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
+++ b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
@@ -41,7 +41,7 @@
 #include <pcb_text.h>
 #include <fp_shape.h>
 #include <zone.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <fp_text.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <trigo.h>
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 3b3fbe7ced..0beeab427d 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -105,7 +105,7 @@ add_library( singletop STATIC EXCLUDE_FROM_ALL
 # Functions and data all need to use the #include <import_export.h> and be declared
 # as APIEXPORT
 set( LIB_KICAD_SRCS
-    string.cpp
+    string_utils.cpp
     )
 
 if( future )
diff --git a/common/base_units.cpp b/common/base_units.cpp
index 55b88f1709..6e09de66f5 100644
--- a/common/base_units.cpp
+++ b/common/base_units.cpp
@@ -36,7 +36,7 @@
 
 #include <base_units.h>
 #include <common.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <math/util.h>      // for KiROUND
 #include <macros.h>
 #include <title_block.h>
diff --git a/common/dialogs/eda_list_dialog.cpp b/common/dialogs/eda_list_dialog.cpp
index 2377f92f2d..1e9137badd 100644
--- a/common/dialogs/eda_list_dialog.cpp
+++ b/common/dialogs/eda_list_dialog.cpp
@@ -25,7 +25,7 @@
 
 #include <dialog_helpers.h>
 #include <eda_draw_frame.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 
 
diff --git a/common/dialogs/html_messagebox.cpp b/common/dialogs/html_messagebox.cpp
index 0fa42247e6..7080555b59 100644
--- a/common/dialogs/html_messagebox.cpp
+++ b/common/dialogs/html_messagebox.cpp
@@ -24,7 +24,7 @@
 
 #include <wx/clipbrd.h>
 #include <wx/log.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <dialogs/html_messagebox.h>
 
 
diff --git a/common/dialogs/panel_setup_netclasses.cpp b/common/dialogs/panel_setup_netclasses.cpp
index 166bd9f886..d4cd0e591f 100644
--- a/common/dialogs/panel_setup_netclasses.cpp
+++ b/common/dialogs/panel_setup_netclasses.cpp
@@ -34,7 +34,7 @@
 #include <dialogs/panel_setup_netclasses.h>
 #include <tool/tool_manager.h>
 #include <widgets/wx_grid.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <widgets/grid_color_swatch_helpers.h>
 #include <widgets/grid_icon_text_helpers.h>
 #include <widgets/grid_text_helpers.h>
diff --git a/common/dialogs/wx_html_report_panel.cpp b/common/dialogs/wx_html_report_panel.cpp
index a106553a00..862c552792 100644
--- a/common/dialogs/wx_html_report_panel.cpp
+++ b/common/dialogs/wx_html_report_panel.cpp
@@ -26,7 +26,7 @@
 #include <wildcards_and_files_ext.h>
 #include <gal/color4d.h>
 #include <wx/clipbrd.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/ffile.h>
 #include <wx/log.h>
 #include <wx/filedlg.h>
diff --git a/common/drawing_sheet/drawing_sheet_reader.cpp b/common/drawing_sheet/drawing_sheet_reader.cpp
index c7bb6d6070..9c479847ee 100644
--- a/common/drawing_sheet/drawing_sheet_reader.cpp
+++ b/common/drawing_sheet/drawing_sheet_reader.cpp
@@ -25,7 +25,7 @@
 
 #include <eda_item.h>
 #include <locale_io.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <drawing_sheet/ds_data_item.h>
 #include <drawing_sheet/ds_data_model.h>
 #include <drawing_sheet/ds_draw_item.h>
diff --git a/common/drawing_sheet/ds_data_model_io.cpp b/common/drawing_sheet/ds_data_model_io.cpp
index ccb542dfe7..0f404c932b 100644
--- a/common/drawing_sheet/ds_data_model_io.cpp
+++ b/common/drawing_sheet/ds_data_model_io.cpp
@@ -24,7 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <math/vector2d.h>
diff --git a/common/eda_text.cpp b/common/eda_text.cpp
index a261e828cb..5e19b17998 100644
--- a/common/eda_text.cpp
+++ b/common/eda_text.cpp
@@ -41,7 +41,7 @@
 #include <gal/color4d.h>      // for COLOR4D, COLOR4D::BLACK
 #include <gal/stroke_font.h>  // for STROKE_FONT
 #include <gr_text.h>          // for GRText
-#include <kicad_string.h>     // for UnescapeString
+#include <string_utils.h>     // for UnescapeString
 #include <math/util.h>        // for KiROUND
 #include <math/vector2d.h>    // for VECTOR2D
 #include <richio.h>
diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index 4c84dbb200..7b1884843a 100644
--- a/common/footprint_info.cpp
+++ b/common/footprint_info.cpp
@@ -31,7 +31,7 @@
 #include <footprint_info.h>
 #include <fp_lib_table.h>
 #include <dialogs/html_messagebox.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <lib_id.h>
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index 8dfd065015..99abc6e5f1 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -26,7 +26,7 @@
 #include <kiface_i.h>
 #include <hotkeys_basic.h>
 #include <id.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <eda_base_frame.h>
 #include <eda_draw_frame.h>
 #include <wildcards_and_files_ext.h>
diff --git a/common/lib_tree_model.cpp b/common/lib_tree_model.cpp
index b1947af4a6..1d9978c0cf 100644
--- a/common/lib_tree_model.cpp
+++ b/common/lib_tree_model.cpp
@@ -26,7 +26,7 @@
 #include <lib_tree_item.h>
 #include <utility>
 #include <pgm_base.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 // Each node gets this lowest score initially, without any matches applied.
 // Matches will then increase this score depending on match quality.  This way,
diff --git a/common/lib_tree_model_adapter.cpp b/common/lib_tree_model_adapter.cpp
index 1b46b22e75..42fe8e6043 100644
--- a/common/lib_tree_model_adapter.cpp
+++ b/common/lib_tree_model_adapter.cpp
@@ -29,7 +29,7 @@
 #include <widgets/ui_common.h>
 #include <wx/tokenzr.h>
 #include <wx/wupdlock.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 #define PINNED_ITEMS_KEY      wxT( "PinnedItems" )
diff --git a/common/libeval/numeric_evaluator.cpp b/common/libeval/numeric_evaluator.cpp
index b6d408f23d..8e81bcdde4 100644
--- a/common/libeval/numeric_evaluator.cpp
+++ b/common/libeval/numeric_evaluator.cpp
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <libeval/numeric_evaluator.h>
 
 /* The (generated) lemon parser is written in C.
diff --git a/common/libeval_compiler/libeval_compiler.cpp b/common/libeval_compiler/libeval_compiler.cpp
index 1e3178840f..7e9911bca4 100644
--- a/common/libeval_compiler/libeval_compiler.cpp
+++ b/common/libeval_compiler/libeval_compiler.cpp
@@ -23,7 +23,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/log.h>
 
 #ifdef DEBUG
diff --git a/common/plotters/DXF_plotter.cpp b/common/plotters/DXF_plotter.cpp
index 5fe08c6d3b..6c8d3f7bf4 100644
--- a/common/plotters/DXF_plotter.cpp
+++ b/common/plotters/DXF_plotter.cpp
@@ -29,7 +29,7 @@
 #include <fill_type.h>
 #include <plotters_specific.h>
 #include <macros.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <render_settings.h>
 #include <trigo.h>
diff --git a/common/plotters/GERBER_plotter.cpp b/common/plotters/GERBER_plotter.cpp
index b465f5377b..79f29ed216 100644
--- a/common/plotters/GERBER_plotter.cpp
+++ b/common/plotters/GERBER_plotter.cpp
@@ -25,7 +25,7 @@
 
 #include <eda_base_frame.h>
 #include <fill_type.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <macros.h>
 #include <math/util.h>      // for KiROUND
diff --git a/common/plotters/HPGL_plotter.cpp b/common/plotters/HPGL_plotter.cpp
index 1ff18b09a0..8f1100e43e 100644
--- a/common/plotters/HPGL_plotter.cpp
+++ b/common/plotters/HPGL_plotter.cpp
@@ -197,7 +197,7 @@
 
 #include <eda_base_frame.h>
 #include <fill_type.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <math/util.h>      // for KiROUND
 #include <trigo.h>
diff --git a/common/plotters/SVG_plotter.cpp b/common/plotters/SVG_plotter.cpp
index 4bad880679..89df75a3b4 100644
--- a/common/plotters/SVG_plotter.cpp
+++ b/common/plotters/SVG_plotter.cpp
@@ -94,7 +94,7 @@
 #include <base64.h>
 #include <eda_base_frame.h>
 #include <eda_rect.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <trigo.h>
 
diff --git a/common/plugins/altium/altium_parser_utils.cpp b/common/plugins/altium/altium_parser_utils.cpp
index 26cfd5ec1a..0abbf5a2a6 100644
--- a/common/plugins/altium/altium_parser_utils.cpp
+++ b/common/plugins/altium/altium_parser_utils.cpp
@@ -24,7 +24,7 @@
 
 #include "altium_parser_utils.h"
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <lib_id.h>
 
 
diff --git a/common/plugins/altium/altium_parser_utils.h b/common/plugins/altium/altium_parser_utils.h
index f8c1de9dab..5bfabd5062 100644
--- a/common/plugins/altium/altium_parser_utils.h
+++ b/common/plugins/altium/altium_parser_utils.h
@@ -27,7 +27,7 @@
 
 #include <map>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <lib_id.h>
 
 #include <iostream>
diff --git a/common/plugins/eagle/eagle_parser.cpp b/common/plugins/eagle/eagle_parser.cpp
index 141b412e71..d7965f652a 100644
--- a/common/plugins/eagle/eagle_parser.cpp
+++ b/common/plugins/eagle/eagle_parser.cpp
@@ -27,7 +27,7 @@
 
 #include <plugins/eagle/eagle_parser.h>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <richio.h>
 #include <wx/log.h>
 
diff --git a/common/project.cpp b/common/project.cpp
index 8176fdd064..c546f6cba5 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -27,7 +27,7 @@
 #include <confirm.h>
 #include <core/arraydim.h>
 #include <fp_lib_table.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <macros.h>
diff --git a/common/project/net_settings.cpp b/common/project/net_settings.cpp
index 190dacb860..4cbdef76a7 100644
--- a/common/project/net_settings.cpp
+++ b/common/project/net_settings.cpp
@@ -26,7 +26,7 @@
 #include <settings/parameters.h>
 #include <settings/json_settings_internals.h>
 #include <settings/settings_manager.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <convert_to_biu.h>
 
 
diff --git a/common/refdes_utils.cpp b/common/refdes_utils.cpp
index 7cf46f0725..983b034307 100644
--- a/common/refdes_utils.cpp
+++ b/common/refdes_utils.cpp
@@ -23,7 +23,7 @@
 
 #include <refdes_utils.h>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #include <algorithm>
 #include <cctype>
diff --git a/common/scintilla_tricks.cpp b/common/scintilla_tricks.cpp
index 616dddc3ab..6c6228681f 100644
--- a/common/scintilla_tricks.cpp
+++ b/common/scintilla_tricks.cpp
@@ -22,7 +22,7 @@
  */
 
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <scintilla_tricks.h>
 #include <wx/stc/stc.h>
 #include <gal/color4d.h>
diff --git a/common/string.cpp b/common/string_utils.cpp
similarity index 99%
rename from common/string.cpp
rename to common/string_utils.cpp
index 63a2b2ca9e..016b6ed8df 100644
--- a/common/string.cpp
+++ b/common/string_utils.cpp
@@ -30,7 +30,7 @@
 #include <cmath>
 #include <macros.h>
 #include <richio.h>                        // StrPrintf
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 /**
diff --git a/common/validators.cpp b/common/validators.cpp
index 6f809a0601..5f6d229bb7 100644
--- a/common/validators.cpp
+++ b/common/validators.cpp
@@ -28,7 +28,7 @@
  * @brief Custom text control validator implementations.
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <confirm.h>
 #include <validators.h>
 
diff --git a/common/widgets/grid_text_button_helpers.cpp b/common/widgets/grid_text_button_helpers.cpp
index 8afe97cec3..014fb2cf88 100644
--- a/common/widgets/grid_text_button_helpers.cpp
+++ b/common/widgets/grid_text_button_helpers.cpp
@@ -30,7 +30,7 @@
 #include <bitmaps.h>
 #include <kiway.h>
 #include <kiway_player.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <dialog_shim.h>
 #include <common.h>
 #include <env_paths.h>
diff --git a/common/widgets/grid_text_helpers.cpp b/common/widgets/grid_text_helpers.cpp
index e37126d15f..10fba6787e 100644
--- a/common/widgets/grid_text_helpers.cpp
+++ b/common/widgets/grid_text_helpers.cpp
@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <widgets/grid_text_helpers.h>
 
 
diff --git a/common/widgets/net_selector.cpp b/common/widgets/net_selector.cpp
index b4f34211e3..92d54ac269 100644
--- a/common/widgets/net_selector.cpp
+++ b/common/widgets/net_selector.cpp
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiplatform/ui.h>
 
 #include <widgets/ui_common.h>
diff --git a/cvpcb/auto_associate.cpp b/cvpcb/auto_associate.cpp
index 39de3f98cd..bc412faf03 100644
--- a/cvpcb/auto_associate.cpp
+++ b/cvpcb/auto_associate.cpp
@@ -32,7 +32,7 @@
 
 
 #include <kiface_i.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 
 #include <auto_associate.h>
diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp
index bc5e38e07a..078e78ab97 100644
--- a/eeschema/connection_graph.cpp
+++ b/eeschema/connection_graph.cpp
@@ -43,7 +43,7 @@
 #include <schematic.h>
 #include <connection_graph.h>
 #include <widgets/ui_common.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/log.h>
 
 #include <advanced_config.h> // for realtime connectivity switch
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index b4a3bc49de..c14d85f68b 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -30,7 +30,7 @@
 #include <sch_symbol.h>
 #include <schematic.h>
 #include <reporter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <netlist_exporters/netlist_exporter_kicad.h>
 #include <project/project_file.h>
 #include <project/net_settings.h>
diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp
index 1b6ab76315..ce5a01cdc9 100644
--- a/eeschema/dialogs/dialog_change_symbols.cpp
+++ b/eeschema/dialogs/dialog_change_symbols.cpp
@@ -23,7 +23,7 @@
 #include <algorithm>
 
 #include <bitmaps.h>
-#include <kicad_string.h>   // WildCompareString
+#include <string_utils.h>   // WildCompareString
 #include <kiway.h>
 #include <lib_id.h>
 #include <refdes_utils.h>
diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp
index 19e48a96f9..c6c80757e0 100644
--- a/eeschema/dialogs/dialog_edit_label.cpp
+++ b/eeschema/dialogs/dialog_edit_label.cpp
@@ -35,7 +35,7 @@
 #include <schematic.h>
 #include <dialogs/html_messagebox.h>
 #include <dialog_edit_label.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <tool/actions.h>
 #include <scintilla_tricks.h>
 
diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index 144d189c79..5b1e10f4c5 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -26,7 +26,7 @@
 #include <bitmaps.h>
 #include <kiway.h>
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_base_frame.h>
 #include <sch_edit_frame.h>
 #include <ee_collectors.h>
diff --git a/eeschema/dialogs/dialog_edit_symbols_libid.cpp b/eeschema/dialogs/dialog_edit_symbols_libid.cpp
index 7ccc4ab69a..dab995684e 100644
--- a/eeschema/dialogs/dialog_edit_symbols_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_symbols_libid.cpp
@@ -43,7 +43,7 @@
 #include <wx/dcclient.h>
 #include <grid_tricks.h>
 #include <widgets/grid_text_button_helpers.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 #define COL_REFS 0
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 2bea7577f6..956d326ab2 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -49,7 +49,7 @@
 #include <wx/hyperlink.h>
 #include <erc_item.h>
 #include <eeschema_settings.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiplatform/ui.h>
 
 DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
index 9ea52330ba..31c3e5b235 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -23,7 +23,7 @@
 
 #include <connection_graph.h>
 #include <dialog_global_edit_text_and_graphics_base.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_symbol.h>
 #include <sch_connection.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
index 1c23b8f00b..706a4d8d03 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
@@ -32,7 +32,7 @@
 #include <widgets/grid_icon_text_helpers.h>
 #include <widgets/wx_grid.h>
 #include <settings/settings_manager.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 class PIN_TABLE_DATA_MODEL : public wxGridTableBase
 {
diff --git a/eeschema/dialogs/dialog_lib_new_symbol.h b/eeschema/dialogs/dialog_lib_new_symbol.h
index c673f4c72c..89be991f7c 100644
--- a/eeschema/dialogs/dialog_lib_new_symbol.h
+++ b/eeschema/dialogs/dialog_lib_new_symbol.h
@@ -26,7 +26,7 @@
 #define __dialog_lib_new_symbol__
 
 #include <widgets/unit_binder.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <dialog_lib_new_symbol_base.h>
 
 class EDA_DRAW_FRAME;
diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
index 5859f7a75a..d02597ec7b 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@@ -31,7 +31,7 @@
 #include <sch_symbol.h>
 #include <widgets/grid_text_button_helpers.h>
 #include <widgets/wx_grid.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #ifdef KICAD_SPICE
 #include <dialog_spice_model.h>
diff --git a/eeschema/dialogs/dialog_sheet_pin_properties.cpp b/eeschema/dialogs/dialog_sheet_pin_properties.cpp
index 546ff1dab5..9ebb0b0206 100644
--- a/eeschema/dialogs/dialog_sheet_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_sheet_pin_properties.cpp
@@ -28,7 +28,7 @@
 #include <sch_validators.h>
 #include <dialog_sheet_pin_properties.h>
 #include <dialogs/html_messagebox.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 static wxString sheetPinTypes[] =
diff --git a/eeschema/dialogs/dialog_signal_list.cpp b/eeschema/dialogs/dialog_signal_list.cpp
index 89aefe37dc..8e7b8ef322 100644
--- a/eeschema/dialogs/dialog_signal_list.cpp
+++ b/eeschema/dialogs/dialog_signal_list.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "dialog_signal_list.h"
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sim/sim_plot_frame.h>
 
 #include <sim/netlist_exporter_pspice_sim.h>
diff --git a/eeschema/dialogs/dialog_symbol_fields_table.cpp b/eeschema/dialogs/dialog_symbol_fields_table.cpp
index c5c2668807..08626dbbe0 100644
--- a/eeschema/dialogs/dialog_symbol_fields_table.cpp
+++ b/eeschema/dialogs/dialog_symbol_fields_table.cpp
@@ -31,7 +31,7 @@
 #include <eeschema_settings.h>
 #include <general.h>
 #include <grid_tricks.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <refdes_utils.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/dialogs/dialog_symbol_properties.cpp b/eeschema/dialogs/dialog_symbol_properties.cpp
index 671614af73..df24548d83 100644
--- a/eeschema/dialogs/dialog_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_symbol_properties.cpp
@@ -29,7 +29,7 @@
 #include <confirm.h>
 #include <kiface_i.h>
 #include <pin_numbers.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <menus_helpers.h>
 #include <widgets/grid_icon_text_helpers.h>
 #include <widgets/grid_combobox.h>
diff --git a/eeschema/dialogs/dialog_update_symbol_fields.cpp b/eeschema/dialogs/dialog_update_symbol_fields.cpp
index 6fc685ee32..d4d7912b22 100644
--- a/eeschema/dialogs/dialog_update_symbol_fields.cpp
+++ b/eeschema/dialogs/dialog_update_symbol_fields.cpp
@@ -25,7 +25,7 @@
 #include <lib_symbol.h>
 #include <symbol_edit_frame.h>
 #include <template_fieldnames.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 bool g_removeExtraLibFields      = false;
diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index 95cbbd6281..f1640cffad 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -26,7 +26,7 @@
 #include "connection_graph.h"
 #include <common.h>     // for ExpandEnvVarSubstitutions
 #include <erc.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <lib_pin.h>
 #include <sch_edit_frame.h>
 #include <sch_marker.h>
diff --git a/eeschema/fields_grid_table.cpp b/eeschema/fields_grid_table.cpp
index 0ecbea2f81..944b3d2157 100644
--- a/eeschema/fields_grid_table.cpp
+++ b/eeschema/fields_grid_table.cpp
@@ -36,7 +36,7 @@
 #include <project/project_file.h>
 #include "eda_doc.h"
 #include <wx/settings.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 enum
diff --git a/eeschema/generate_alias_info.cpp b/eeschema/generate_alias_info.cpp
index 8cfdca568f..520b2fb535 100644
--- a/eeschema/generate_alias_info.cpp
+++ b/eeschema/generate_alias_info.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <generate_alias_info.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <template_fieldnames.h>
 #include <lib_symbol.h>
 #include <symbol_lib_table.h>
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index f41a2648c1..c3860e53b9 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -24,7 +24,7 @@
 
 #include <eda_item.h>
 #include <gr_text.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_draw_panel.h>
 #include <eda_draw_frame.h>
 #include <plotter.h>
diff --git a/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp b/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
index d717c209b9..1936105ca8 100644
--- a/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp
@@ -27,7 +27,7 @@
 #include <confirm.h>
 
 #include <connection_graph.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
index 2c75ccf643..d546c9b41d 100644
--- a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp
@@ -28,7 +28,7 @@
 
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <symbol_library.h>
 #include <symbol_lib_table.h>
 
diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index 6179669d77..b097bef760 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -31,7 +31,7 @@
 #include <search_stack.h>
 
 #include <connection_graph.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
 #include <env_paths.h>
diff --git a/eeschema/netlist_exporters/netlist_exporter_xml.cpp b/eeschema/netlist_exporters/netlist_exporter_xml.cpp
index 41e1ac7598..aaf029ba23 100644
--- a/eeschema/netlist_exporters/netlist_exporter_xml.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_xml.cpp
@@ -29,7 +29,7 @@
 #include <common.h>     // for ExpandTextVars
 #include <sch_base_frame.h>
 #include <symbol_library.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <connection_graph.h>
 #include <refdes_utils.h>
 #include <wx/wfstream.h>
diff --git a/eeschema/netlist_exporters/netlist_generator.cpp b/eeschema/netlist_exporters/netlist_generator.cpp
index 447aacdf47..24d9d8488b 100644
--- a/eeschema/netlist_exporters/netlist_generator.cpp
+++ b/eeschema/netlist_exporters/netlist_generator.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <common.h>     // for ProcessExecute
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <gestfich.h>
 #include <sch_edit_frame.h>
 #include <schematic.h>
diff --git a/eeschema/sch_connection.cpp b/eeschema/sch_connection.cpp
index 2c412458e6..e385e83520 100644
--- a/eeschema/sch_connection.cpp
+++ b/eeschema/sch_connection.cpp
@@ -29,7 +29,7 @@
 #include <sch_screen.h>
 #include <project/net_settings.h>
 #include <advanced_config.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #include <sch_connection.h>
 
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index a1458d9b31..888a2189d7 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -34,7 +34,7 @@
 #include <hierarch.h>
 #include <dialogs/html_messagebox.h>
 #include <invoke_sch_dialog.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <kiplatform/app.h>
 #include <kiway.h>
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index fa6354daab..40c31c427d 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -46,7 +46,7 @@
 #include <sch_field.h>
 #include <schematic.h>
 #include <settings/color_settings.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <trace_helpers.h>
 #include <trigo.h>
 #include <eeschema_id.h>
diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 9d3f4455fd..4a3cf4ec64 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -63,7 +63,7 @@
 #include <kiface_i.h>
 #include <default_values.h>
 #include <advanced_config.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include "sch_painter.h"
 
 namespace KIGFX
diff --git a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
index fc103ab8c8..e149ce6b9d 100644
--- a/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
+++ b/eeschema/sch_plugins/altium/sch_altium_plugin.cpp
@@ -54,7 +54,7 @@
 
 #include <bezier_curves.h>
 #include <compoundfilereader.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_edit_frame.h>
 #include <trigo.h>
 #include <wildcards_and_files_ext.h>
diff --git a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
index 753f818160..0a02eb407d 100644
--- a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
+++ b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
@@ -32,7 +32,7 @@
 #include <lib_polyline.h>
 #include <lib_text.h>
 #include <macros.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_bus_entry.h>
 #include <sch_edit_frame.h> //SYMBOL_ORIENTATION_T
 #include <sch_io_mgr.h>
diff --git a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
index df36a354fc..6ac5279dca 100644
--- a/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
+++ b/eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
@@ -37,7 +37,7 @@
 
 #include <symbol_library.h>
 #include <plugins/eagle/eagle_parser.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <lib_arc.h>
 #include <lib_circle.h>
 #include <lib_id.h>
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
index 52341c16ff..c1aeadddf6 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
@@ -41,7 +41,7 @@
 #include <lib_rectangle.h>
 #include <lib_text.h>
 #include <math/util.h>                           // KiROUND, Clamp
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_bitmap.h>
 #include <sch_bus_entry.h>
 #include <sch_symbol.h>
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
index c17a0bbb2c..8df05f1cc1 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@@ -59,7 +59,7 @@
 #include <sch_plugins/kicad/sch_sexpr_parser.h>
 #include <symbol_lib_table.h>  // for PropPowerSymsOnly definition.
 #include <ee_selection.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx_filename.h>       // for ::ResolvePossibleSymlinks()
 #include <widgets/progress_reporter.h>
 
diff --git a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
index 2e6063d0d5..eea9fd08f6 100644
--- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
+++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
@@ -34,7 +34,7 @@
 #include <wx_filename.h>       // For ::ResolvePossibleSymlinks()
 
 #include <kiway.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <richio.h>
 #include <trace_helpers.h>
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 3d40e66e9a..86f455ec9b 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -34,7 +34,7 @@
 #include <eda_item.h>
 #include <eda_rect.h>
 #include <id.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiway.h>
 #include <plotter.h>
 #include <project.h>
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 184636e70a..b47dca9342 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -29,7 +29,7 @@
 #include <trigo.h>
 #include <sch_edit_frame.h>
 #include <plotter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <widgets/msgpanel.h>
 #include <math/util.h>      // for KiROUND
 #include <sch_sheet.h>
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index 8a226bc9ad..f51c5a746b 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -28,7 +28,7 @@
 #include <general.h>
 #include <geometry/shape_line_chain.h>
 #include <gr_text.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <plotter.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/sch_symbol.cpp b/eeschema/sch_symbol.cpp
index d29e997c73..6a11124c69 100644
--- a/eeschema/sch_symbol.cpp
+++ b/eeschema/sch_symbol.cpp
@@ -36,7 +36,7 @@
 #include <trigo.h>
 #include <refdes_utils.h>
 #include <wx/log.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 /**
  * Convert a wxString to UTF8 and replace any control characters with a ~,
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 5739d57e52..15e9f690fd 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -34,7 +34,7 @@
 #include <widgets/msgpanel.h>
 #include <gal/stroke_font.h>
 #include <bitmaps.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_text.h>
 #include <schematic.h>
 #include <settings/color_settings.h>
diff --git a/eeschema/sim/netlist_exporter_pspice_sim.cpp b/eeschema/sim/netlist_exporter_pspice_sim.cpp
index 76e1f99352..d7e6904739 100644
--- a/eeschema/sim/netlist_exporter_pspice_sim.cpp
+++ b/eeschema/sim/netlist_exporter_pspice_sim.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "netlist_exporter_pspice_sim.h"
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>     // for TO_UTF8 def
 #include <wx/regex.h>
 #include <wx/tokenzr.h>
diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp
index 3ad15bec86..07dc896611 100644
--- a/eeschema/sim/sim_plot_frame.cpp
+++ b/eeschema/sim/sim_plot_frame.cpp
@@ -36,7 +36,7 @@
 #include <wildcards_and_files_ext.h>
 #include <widgets/tuner_slider.h>
 #include <dialogs/dialog_signal_list.h>
-#include "kicad_string.h"
+#include "string_utils.h"
 #include "netlist_exporter_pspice_sim.h"
 #include <pgm_base.h>
 #include "ngspice.h"
diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp
index b18700bfe4..cb102a535a 100644
--- a/eeschema/symbol_editor/symbol_edit_frame.cpp
+++ b/eeschema/symbol_editor/symbol_edit_frame.cpp
@@ -72,7 +72,7 @@
 #include <wildcards_and_files_ext.h>
 #include <panel_sym_lib_table.h>
 #include <wx/choicdlg.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 bool SYMBOL_EDIT_FRAME::m_showDeMorgan = false;
diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp
index 55e4a96185..fa21646e0e 100644
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@@ -43,7 +43,7 @@
 #include <wx/clipbrd.h>
 #include <wx/filedlg.h>
 #include <wx/log.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 /**
diff --git a/eeschema/symbol_editor/symbol_editor_import_export.cpp b/eeschema/symbol_editor/symbol_editor_import_export.cpp
index 747a74da0c..f7f836b99f 100644
--- a/eeschema/symbol_editor/symbol_editor_import_export.cpp
+++ b/eeschema/symbol_editor/symbol_editor_import_export.cpp
@@ -31,7 +31,7 @@
 #include <symbol_library_manager.h>
 #include <wx/filename.h>
 #include <wx/filedlg.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 void SYMBOL_EDIT_FRAME::ImportSymbol()
diff --git a/eeschema/symbol_editor/symbol_library_manager.cpp b/eeschema/symbol_editor/symbol_library_manager.cpp
index 8d6137ff65..52a567299a 100644
--- a/eeschema/symbol_editor/symbol_library_manager.cpp
+++ b/eeschema/symbol_editor/symbol_library_manager.cpp
@@ -39,7 +39,7 @@
 #include <list>
 #include <locale_io.h>
 #include <wx/log.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include "lib_logger.h"
 
 
diff --git a/eeschema/symbol_library.cpp b/eeschema/symbol_library.cpp
index d5b4a880d5..d1bf24f2b7 100644
--- a/eeschema/symbol_library.cpp
+++ b/eeschema/symbol_library.cpp
@@ -26,7 +26,7 @@
 #include <algorithm>
 #include <kiface_i.h>
 #include <eda_base_frame.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <richio.h>
 #include <config_params.h>
diff --git a/eeschema/symbol_tree_synchronizing_adapter.cpp b/eeschema/symbol_tree_synchronizing_adapter.cpp
index 5c6a07161d..f51dbbbfc3 100644
--- a/eeschema/symbol_tree_synchronizing_adapter.cpp
+++ b/eeschema/symbol_tree_synchronizing_adapter.cpp
@@ -27,7 +27,7 @@
 #include <symbol_library_manager.h>
 #include <symbol_lib_table.h>
 #include <tools/symbol_editor_control.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 wxObjectDataPtr<LIB_TREE_MODEL_ADAPTER>
diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp
index d3da1121b5..880aed18fd 100644
--- a/eeschema/symbol_viewer_frame.cpp
+++ b/eeschema/symbol_viewer_frame.cpp
@@ -55,7 +55,7 @@
 #include <wx/listbox.h>
 
 #include <default_values.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 // Save previous symbol library viewer state.
 wxString SYMBOL_VIEWER_FRAME::m_libraryName;
diff --git a/eeschema/tools/assign_footprints.cpp b/eeschema/tools/assign_footprints.cpp
index aaa927e605..1f4e47c3e9 100644
--- a/eeschema/tools/assign_footprints.cpp
+++ b/eeschema/tools/assign_footprints.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <sch_edit_frame.h>
 #include <wildcards_and_files_ext.h>
diff --git a/eeschema/tools/backannotate.cpp b/eeschema/tools/backannotate.cpp
index b1a3ea96be..a8d37fc305 100644
--- a/eeschema/tools/backannotate.cpp
+++ b/eeschema/tools/backannotate.cpp
@@ -32,7 +32,7 @@
 #include <sch_edit_frame.h>
 #include <sch_sheet_path.h>
 #include <schematic.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <wildcards_and_files_ext.h>
 #include <connection_graph.h>
diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp
index 440085f643..2c9a7262bf 100644
--- a/eeschema/tools/sch_drawing_tools.cpp
+++ b/eeschema/tools/sch_drawing_tools.cpp
@@ -50,7 +50,7 @@
 #include <dialogs/dialog_line_wire_bus_properties.h>
 #include <dialogs/dialog_junction_props.h>
 #include <dialogs/dialog_sheet_pin_properties.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wildcards_and_files_ext.h>
 #include <wx/filedlg.h>
 
diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp
index 47e1174198..a6a47fe2a8 100644
--- a/eeschema/tools/sch_edit_tool.cpp
+++ b/eeschema/tools/sch_edit_tool.cpp
@@ -34,7 +34,7 @@
 #include <confirm.h>
 #include <eda_item.h>
 #include <reporter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_item.h>
 #include <sch_symbol.h>
 #include <sch_sheet.h>
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index c34258c30f..f194508c8f 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -34,7 +34,7 @@
 #include <project_rescue.h>
 #include <erc.h>
 #include <invoke_sch_dialog.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiway.h>
 #include <kiway_player.h>
 #include <netlist_exporters/netlist_exporter_pspice.h>
diff --git a/eeschema/tools/symbol_editor_drawing_tools.cpp b/eeschema/tools/symbol_editor_drawing_tools.cpp
index c1c888c749..95a06ff99d 100644
--- a/eeschema/tools/symbol_editor_drawing_tools.cpp
+++ b/eeschema/tools/symbol_editor_drawing_tools.cpp
@@ -36,7 +36,7 @@
 #include <pgm_base.h>
 #include <symbol_editor/symbol_editor_settings.h>
 #include <settings/settings_manager.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 static void* g_lastPinWeakPtr;
 
diff --git a/eeschema/tools/symbol_editor_edit_tool.cpp b/eeschema/tools/symbol_editor_edit_tool.cpp
index 864e01848d..a096f66c8a 100644
--- a/eeschema/tools/symbol_editor_edit_tool.cpp
+++ b/eeschema/tools/symbol_editor_edit_tool.cpp
@@ -29,7 +29,7 @@
 #include <tools/symbol_editor_move_tool.h>
 #include <ee_actions.h>
 #include <bitmaps.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <symbol_edit_frame.h>
 #include <dialogs/dialog_lib_edit_draw_item.h>
 #include <dialogs/dialog_lib_edit_text.h>
diff --git a/gerbview/excellon_read_drill_file.cpp b/gerbview/excellon_read_drill_file.cpp
index 01840591ae..812c548b57 100644
--- a/gerbview/excellon_read_drill_file.cpp
+++ b/gerbview/excellon_read_drill_file.cpp
@@ -70,7 +70,7 @@
 #include <gerber_file_image_list.h>
 #include <excellon_image.h>
 #include <macros.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <X2_gerber_attributes.h>
 #include <view/view.h>
diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp
index 383dec5d57..222ba6ccf4 100644
--- a/gerbview/export_to_pcbnew.cpp
+++ b/gerbview/export_to_pcbnew.cpp
@@ -27,7 +27,7 @@
 #include <export_to_pcbnew.h>
 
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <trigo.h>
diff --git a/gerbview/gerber_draw_item.cpp b/gerbview/gerber_draw_item.cpp
index 4f7c1030d5..d97502f986 100644
--- a/gerbview/gerber_draw_item.cpp
+++ b/gerbview/gerber_draw_item.cpp
@@ -30,7 +30,7 @@
 #include <gerber_draw_item.h>
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <geometry/shape_arc.h>
 #include <math/util.h>      // for KiROUND
 #include <widgets/msgpanel.h>
diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp
index 86ba0bb950..faaf9bb5e8 100644
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>
diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp
index fae48f82d5..f6cf92c522 100644
--- a/gerbview/toolbars_gerber.cpp
+++ b/gerbview/toolbars_gerber.cpp
@@ -26,7 +26,7 @@
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
 #include <dialog_helpers.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/wupdlock.h>
 #include <tool/actions.h>
 #include <tool/action_toolbar.h>
diff --git a/gerbview/tools/gerbview_control.cpp b/gerbview/tools/gerbview_control.cpp
index 0fd669bc9c..f1385dd8c8 100644
--- a/gerbview/tools/gerbview_control.cpp
+++ b/gerbview/tools/gerbview_control.cpp
@@ -25,7 +25,7 @@
 #include <gerber_file_image_list.h>
 #include <gerbview_painter.h>
 #include <gerbview_frame.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <excellon_image.h>
 #include <menus_helpers.h>
 #include <tool/tool_manager.h>
diff --git a/gerbview/tools/gerbview_selection_tool.cpp b/gerbview/tools/gerbview_selection_tool.cpp
index 01594af9ac..21a8681bfa 100644
--- a/gerbview/tools/gerbview_selection_tool.cpp
+++ b/gerbview/tools/gerbview_selection_tool.cpp
@@ -26,7 +26,7 @@ using namespace std::placeholders;
 #include <eda_item.h>
 #include <gerber_collectors.h>
 #include <class_draw_panel_gal.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <view/view.h>
 #include <view/view_group.h>
 #include <painter.h>
diff --git a/include/lib_table_grid.h b/include/lib_table_grid.h
index 00f8aadda9..d7e6f49549 100644
--- a/include/lib_table_grid.h
+++ b/include/lib_table_grid.h
@@ -21,7 +21,7 @@
 #define __LIB_TABLE_GRID_H__
 
 #include <lib_table_base.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/grid.h>
 
 const wxColour COLOUR_ROW_ENABLED( 0, 0, 0 );
diff --git a/include/kicad_string.h b/include/string_utils.h
similarity index 98%
rename from include/kicad_string.h
rename to include/string_utils.h
index e2fcab7c24..227efad3c1 100644
--- a/include/kicad_string.h
+++ b/include/string_utils.h
@@ -21,14 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file  kicad_string.h
- * @see   common.h, string.cpp
- */
-
-
-#ifndef KICAD_STRING_H_
-#define KICAD_STRING_H_
+#ifndef STRING_UTILS_H
+#define STRING_UTILS_H
 
 #include "config.h"
 
@@ -354,4 +348,4 @@ std::string Double2Str( double aValue );
  */
 wxString AngleToStringDegrees( double aAngle );
 
-#endif  // KICAD_STRING_H_
+#endif  // STRING_UTILS_H
diff --git a/pcb_calculator/datafile_read_write.cpp b/pcb_calculator/datafile_read_write.cpp
index b2c752d098..c1d8adaed9 100644
--- a/pcb_calculator/datafile_read_write.cpp
+++ b/pcb_calculator/datafile_read_write.cpp
@@ -29,7 +29,7 @@
 #include <class_regulator_data.h>
 #include <common.h>
 #include <datafile_read_write.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <pcb_calculator_datafile_lexer.h>
diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index 1d0a11b8df..b2f505bb82 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -42,7 +42,7 @@
 #include <core/arraydim.h>
 #include <core/kicad_algo.h>
 #include <connectivity/connectivity_data.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <pgm_base.h>
 #include <pcbnew_settings.h>
 #include <project.h>
diff --git a/pcbnew/board_connected_item.cpp b/pcbnew/board_connected_item.cpp
index 38c94a2367..ecc55417e2 100644
--- a/pcbnew/board_connected_item.cpp
+++ b/pcbnew/board_connected_item.cpp
@@ -28,7 +28,7 @@
 #include <board_design_settings.h>
 #include <connectivity/connectivity_data.h>
 #include <drc/drc_engine.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <i18n_utility.h>
 #include <netinfo.h>
 
diff --git a/pcbnew/board_items_to_polygon_shape_transform.cpp b/pcbnew/board_items_to_polygon_shape_transform.cpp
index 8544c88b9a..3455c6f311 100644
--- a/pcbnew/board_items_to_polygon_shape_transform.cpp
+++ b/pcbnew/board_items_to_polygon_shape_transform.cpp
@@ -30,7 +30,7 @@
 #include <pad.h>
 #include <pcb_dimension.h>
 #include <pcb_track.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <pcb_shape.h>
 #include <pcb_text.h>
 #include <zone.h>
diff --git a/pcbnew/board_stackup_manager/board_stackup.cpp b/pcbnew/board_stackup_manager/board_stackup.cpp
index ed89d8f8cf..49436fe8dd 100644
--- a/pcbnew/board_stackup_manager/board_stackup.cpp
+++ b/pcbnew/board_stackup_manager/board_stackup.cpp
@@ -22,7 +22,7 @@
 #include "board_stackup.h"
 #include <convert_to_biu.h>
 #include <base_units.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <layer_ids.h>
 #include <board_design_settings.h>
 #include <board.h>
diff --git a/pcbnew/build_BOM_from_board.cpp b/pcbnew/build_BOM_from_board.cpp
index 484067884a..63415aa39c 100644
--- a/pcbnew/build_BOM_from_board.cpp
+++ b/pcbnew/build_BOM_from_board.cpp
@@ -27,7 +27,7 @@
 
 #include <confirm.h>
 #include <macros.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <pcb_edit_frame.h>
 #include <project.h>
 #include <wildcards_and_files_ext.h>
diff --git a/pcbnew/connectivity/from_to_cache.cpp b/pcbnew/connectivity/from_to_cache.cpp
index 62fb7e830b..dce9ed4836 100644
--- a/pcbnew/connectivity/from_to_cache.cpp
+++ b/pcbnew/connectivity/from_to_cache.cpp
@@ -21,7 +21,7 @@
 #include <memory>
 #include <reporter.h>
 #include <board.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #include <pcb_expr_evaluator.h>
 
diff --git a/pcbnew/dialogs/dialog_board_reannotate.cpp b/pcbnew/dialogs/dialog_board_reannotate.cpp
index 4e6944ac88..fd823201e5 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.cpp
+++ b/pcbnew/dialogs/dialog_board_reannotate.cpp
@@ -30,7 +30,7 @@
 #include <ctype.h>
 #include <dialog_board_reannotate.h>
 #include <fstream>
-#include <kicad_string.h>  // StrNumCmp
+#include <string_utils.h>  // StrNumCmp
 #include <kiface_i.h>
 #include <mail_type.h>
 #include <pcbnew_settings.h>
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index 02d0948c78..a1984bca54 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -37,7 +37,7 @@
 #include <eda_pattern_match.h>
 
 #include <dialog_copper_zones_base.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 class DIALOG_COPPER_ZONE : public DIALOG_COPPER_ZONE_BASE
diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp
index 76e33f671d..78cdee1a17 100644
--- a/pcbnew/dialogs/dialog_exchange_footprints.cpp
+++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp
@@ -30,7 +30,7 @@
 #include <footprint.h>
 #include <pad.h>
 #include <dialog_exchange_footprints.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiway.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/dialogs/dialog_find.cpp b/pcbnew/dialogs/dialog_find.cpp
index 0e984ecf6f..99ef3bff6b 100644
--- a/pcbnew/dialogs/dialog_find.cpp
+++ b/pcbnew/dialogs/dialog_find.cpp
@@ -30,7 +30,7 @@
 #include <fp_text.h>
 #include <zone.h>
 #include <dialog_find.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <pcb_edit_frame.h>
 #include <string>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list.cpp b/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
index 9ea95d6be4..1f9909649d 100644
--- a/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
+++ b/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
@@ -31,7 +31,7 @@
 #include <pcbnew_settings.h>
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <dialog_footprint_wizard_list.h>
 #include <footprint_wizard_frame.h>
diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
index 1df757eb16..ad14a3b162 100644
--- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <board_commit.h>
 #include <pcb_edit_frame.h>
 #include <pcb_layer_box_selector.h>
diff --git a/pcbnew/dialogs/dialog_net_inspector.cpp b/pcbnew/dialogs/dialog_net_inspector.cpp
index 61e85d2c8d..0f10cc25c7 100644
--- a/pcbnew/dialogs/dialog_net_inspector.cpp
+++ b/pcbnew/dialogs/dialog_net_inspector.cpp
@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <tools/board_inspection_tool.h>
 #include <board.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/dialogs/dialog_text_properties.cpp b/pcbnew/dialogs/dialog_text_properties.cpp
index bebbf09468..a656dc84d6 100644
--- a/pcbnew/dialogs/dialog_text_properties.cpp
+++ b/pcbnew/dialogs/dialog_text_properties.cpp
@@ -28,7 +28,7 @@
 #include <board_commit.h>
 #include <board.h>
 #include <footprint.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <pcb_text.h>
 #include <fp_text.h>
 #include <pcbnew.h>
diff --git a/pcbnew/dialogs/panel_edit_options.cpp b/pcbnew/dialogs/panel_edit_options.cpp
index b7cdc47b6b..9f0ffaf0d3 100644
--- a/pcbnew/dialogs/panel_edit_options.cpp
+++ b/pcbnew/dialogs/panel_edit_options.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <panel_edit_options.h>
 #include <pcb_edit_frame.h>
 #include <pcb_painter.h>
diff --git a/pcbnew/dialogs/panel_setup_rules.cpp b/pcbnew/dialogs/panel_setup_rules.cpp
index 2b4e8d3892..50a9503cd4 100644
--- a/pcbnew/dialogs/panel_setup_rules.cpp
+++ b/pcbnew/dialogs/panel_setup_rules.cpp
@@ -29,7 +29,7 @@
 #include <board.h>
 #include <board_design_settings.h>
 #include <project.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <tool/tool_manager.h>
 #include <panel_setup_rules.h>
 #include <wx_html_report_box.h>
diff --git a/pcbnew/drc/drc_engine.cpp b/pcbnew/drc/drc_engine.cpp
index 99ff8f1b4a..64784a2fa4 100644
--- a/pcbnew/drc/drc_engine.cpp
+++ b/pcbnew/drc/drc_engine.cpp
@@ -25,7 +25,7 @@
 
 #include <reporter.h>
 #include <widgets/progress_reporter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <board_design_settings.h>
 #include <drc/drc_engine.h>
 #include <drc/drc_rtree.h>
diff --git a/pcbnew/exporters/export_footprint_associations.cpp b/pcbnew/exporters/export_footprint_associations.cpp
index 2757c67c02..48e45aab57 100644
--- a/pcbnew/exporters/export_footprint_associations.cpp
+++ b/pcbnew/exporters/export_footprint_associations.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
 #include <board.h>
diff --git a/pcbnew/exporters/export_footprints_placefile.cpp b/pcbnew/exporters/export_footprints_placefile.cpp
index c1cd42f140..74c985a83f 100644
--- a/pcbnew/exporters/export_footprints_placefile.cpp
+++ b/pcbnew/exporters/export_footprints_placefile.cpp
@@ -26,7 +26,7 @@
  *  2 - create a footprint report (pos and footprint descr) (ascii file)
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <locale_io.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/exporters/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp
index c4c3620b17..274ae1ff4f 100644
--- a/pcbnew/exporters/gen_drill_report_files.cpp
+++ b/pcbnew/exporters/gen_drill_report_files.cpp
@@ -32,7 +32,7 @@
 #include <eda_item.h>
 #include <gr_text.h>
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <math/util.h>      // for KiROUND
diff --git a/pcbnew/exporters/gen_footprints_placefile.cpp b/pcbnew/exporters/gen_footprints_placefile.cpp
index e5310d09c2..b990dedd32 100644
--- a/pcbnew/exporters/gen_footprints_placefile.cpp
+++ b/pcbnew/exporters/gen_footprints_placefile.cpp
@@ -27,7 +27,7 @@
  */
 
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <gestfich.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
diff --git a/pcbnew/exporters/gendrill_Excellon_writer.cpp b/pcbnew/exporters/gendrill_Excellon_writer.cpp
index 1780f4d8b7..34bb429430 100644
--- a/pcbnew/exporters/gendrill_Excellon_writer.cpp
+++ b/pcbnew/exporters/gendrill_Excellon_writer.cpp
@@ -36,7 +36,7 @@
  */
 
 #include <plotter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/exporters/gendrill_gerber_writer.cpp b/pcbnew/exporters/gendrill_gerber_writer.cpp
index 72c52f7731..2c6aeda9c5 100644
--- a/pcbnew/exporters/gendrill_gerber_writer.cpp
+++ b/pcbnew/exporters/gendrill_gerber_writer.cpp
@@ -31,7 +31,7 @@
 
 #include <plotter.h>
 #include <plotters_specific.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <pcb_edit_frame.h>
 #include <board.h>
diff --git a/pcbnew/exporters/gerber_placefile_writer.cpp b/pcbnew/exporters/gerber_placefile_writer.cpp
index b04bed59ca..ce3e3aa2b8 100644
--- a/pcbnew/exporters/gerber_placefile_writer.cpp
+++ b/pcbnew/exporters/gerber_placefile_writer.cpp
@@ -29,7 +29,7 @@
 
 #include <plotter.h>
 #include <plotters_specific.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/footprint.cpp b/pcbnew/footprint.cpp
index 94567df147..6c3d6b5c93 100644
--- a/pcbnew/footprint.cpp
+++ b/pcbnew/footprint.cpp
@@ -29,7 +29,7 @@
 #include <refdes_utils.h>
 #include <bitmaps.h>
 #include <unordered_set>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <pcb_edit_frame.h>
 #include <board.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp
index 744b5f17ca..e4e6b317ce 100644
--- a/pcbnew/footprint_info_impl.cpp
+++ b/pcbnew/footprint_info_impl.cpp
@@ -26,7 +26,7 @@
 #include <footprint_info.h>
 #include <fp_lib_table.h>
 #include <dialogs/html_messagebox.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <kiway.h>
 #include <lib_id.h>
diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index 3c1e80a8a9..170b4fb1ac 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -25,7 +25,7 @@
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
diff --git a/pcbnew/fp_text.cpp b/pcbnew/fp_text.cpp
index 84e8f5c1ba..82131d9919 100644
--- a/pcbnew/fp_text.cpp
+++ b/pcbnew/fp_text.cpp
@@ -32,7 +32,7 @@
 #include <footprint.h>
 #include <settings/settings_manager.h>
 #include <trigo.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <painter.h>
 #include <geometry/shape_compound.h>
 
diff --git a/pcbnew/fp_tree_model_adapter.cpp b/pcbnew/fp_tree_model_adapter.cpp
index 7b583a77e5..984210ce44 100644
--- a/pcbnew/fp_tree_model_adapter.cpp
+++ b/pcbnew/fp_tree_model_adapter.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <wx/tokenzr.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <eda_pattern_match.h>
 #include <fp_lib_table.h>
 #include <footprint_info.h>
diff --git a/pcbnew/fp_tree_synchronizing_adapter.cpp b/pcbnew/fp_tree_synchronizing_adapter.cpp
index 0e5d339c16..ae7c7c1cbb 100644
--- a/pcbnew/fp_tree_synchronizing_adapter.cpp
+++ b/pcbnew/fp_tree_synchronizing_adapter.cpp
@@ -27,7 +27,7 @@
 #include <footprint_edit_frame.h>
 #include <fp_lib_table.h>
 #include <footprint_info_impl.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <board.h>
 #include <footprint.h>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/generate_footprint_info.cpp b/pcbnew/generate_footprint_info.cpp
index 98b5629486..83f1539341 100644
--- a/pcbnew/generate_footprint_info.cpp
+++ b/pcbnew/generate_footprint_info.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <generate_footprint_info.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <footprint.h>
 #include <fp_lib_table.h>
 #include <wx/log.h>
diff --git a/pcbnew/load_select_footprint.cpp b/pcbnew/load_select_footprint.cpp
index 2dd51f7ce1..fa3e11cad1 100644
--- a/pcbnew/load_select_footprint.cpp
+++ b/pcbnew/load_select_footprint.cpp
@@ -39,7 +39,7 @@ using namespace std::placeholders;
 #include <footprint_viewer_frame.h>
 #include <fp_lib_table.h>
 #include <io_mgr.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiway.h>
 #include <lib_id.h>
 #include <macros.h>
diff --git a/pcbnew/microwave/microwave_polygon.cpp b/pcbnew/microwave/microwave_polygon.cpp
index 8d003188a9..b04b546ee7 100644
--- a/pcbnew/microwave/microwave_polygon.cpp
+++ b/pcbnew/microwave/microwave_polygon.cpp
@@ -26,7 +26,7 @@
 
 #include <confirm.h>
 #include <trigo.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <dialog_shim.h>
diff --git a/pcbnew/netinfo_item.cpp b/pcbnew/netinfo_item.cpp
index 5716f9902c..5563ac44db 100644
--- a/pcbnew/netinfo_item.cpp
+++ b/pcbnew/netinfo_item.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <pcb_base_frame.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <widgets/msgpanel.h>
 #include <base_units.h>
 #include <board.h>
diff --git a/pcbnew/netlist_reader/board_netlist_updater.cpp b/pcbnew/netlist_reader/board_netlist_updater.cpp
index 3e62b871ef..7e8164d2dc 100644
--- a/pcbnew/netlist_reader/board_netlist_updater.cpp
+++ b/pcbnew/netlist_reader/board_netlist_updater.cpp
@@ -35,7 +35,7 @@
 #include <pad.h>
 #include <pcb_track.h>
 #include <zone.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <pcbnew_settings.h>
 #include <pcb_edit_frame.h>
 #include <netlist_reader/pcb_netlist.h>
diff --git a/pcbnew/netlist_reader/legacy_netlist_reader.cpp b/pcbnew/netlist_reader/legacy_netlist_reader.cpp
index 4d07d0ebe4..35d938961a 100644
--- a/pcbnew/netlist_reader/legacy_netlist_reader.cpp
+++ b/pcbnew/netlist_reader/legacy_netlist_reader.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <richio.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #include "pcb_netlist.h"
 #include "netlist_reader.h"
diff --git a/pcbnew/netlist_reader/netlist_reader.cpp b/pcbnew/netlist_reader/netlist_reader.cpp
index f2efa87577..0be49834d7 100644
--- a/pcbnew/netlist_reader/netlist_reader.cpp
+++ b/pcbnew/netlist_reader/netlist_reader.cpp
@@ -28,7 +28,7 @@
 
 
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <reporter.h>
 
 #include "pcb_netlist.h"
diff --git a/pcbnew/pad.cpp b/pcbnew/pad.cpp
index b9fa9c74b6..3153473b7e 100644
--- a/pcbnew/pad.cpp
+++ b/pcbnew/pad.cpp
@@ -33,7 +33,7 @@
 #include <geometry/shape_simple.h>
 #include <geometry/shape_rect.h>
 #include <geometry/shape_compound.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <i18n_utility.h>
 #include <view/view.h>
 #include <board.h>
diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index a2dca82746..584baeca38 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -32,7 +32,7 @@
 #include <footprint.h>
 #include <pad.h>
 #include <pcb_shape.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <zone.h>
 #include <pcb_text.h>
 #include <pcb_marker.h>
diff --git a/pcbnew/pcb_text.cpp b/pcbnew/pcb_text.cpp
index 1af9d0f91c..522f0e8a36 100644
--- a/pcbnew/pcb_text.cpp
+++ b/pcbnew/pcb_text.cpp
@@ -34,7 +34,7 @@
 #include <pcb_text.h>
 #include <pcb_painter.h>
 #include <trigo.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <geometry/shape_compound.h>
 
 using KIGFX::PCB_RENDER_SETTINGS;
diff --git a/pcbnew/pcb_track.cpp b/pcbnew/pcb_track.cpp
index f5f03ac64b..2e2f7455b5 100644
--- a/pcbnew/pcb_track.cpp
+++ b/pcbnew/pcb_track.cpp
@@ -31,7 +31,7 @@
 #include <pcb_track.h>
 #include <base_units.h>
 #include <bitmaps.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <view/view.h>
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>
diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index c4a93158a7..294395ed8f 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -32,7 +32,7 @@
 #include <geometry/shape_line_chain.h>        // for SHAPE_LINE_CHAIN
 #include <geometry/shape_poly_set.h>          // for SHAPE_POLY_SET, SHAPE_P...
 #include <geometry/shape_segment.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <math/util.h>                        // for KiROUND, Clamp
 #include <math/vector2d.h>                    // for VECTOR2I
diff --git a/pcbnew/plugins/altium/altium_pcb.cpp b/pcbnew/plugins/altium/altium_pcb.cpp
index 7da57e5536..c9c7045d7b 100644
--- a/pcbnew/plugins/altium/altium_pcb.cpp
+++ b/pcbnew/plugins/altium/altium_pcb.cpp
@@ -34,7 +34,7 @@
 #include <pcb_shape.h>
 #include <pcb_text.h>
 #include <pcb_track.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #include <fp_shape.h>
 #include <fp_text.h>
diff --git a/pcbnew/plugins/eagle/eagle_plugin.cpp b/pcbnew/plugins/eagle/eagle_plugin.cpp
index 32c135d583..4eda9535be 100644
--- a/pcbnew/plugins/eagle/eagle_plugin.cpp
+++ b/pcbnew/plugins/eagle/eagle_plugin.cpp
@@ -61,7 +61,7 @@ Load() TODO's
 #include <convert_basic_shapes_to_polygon.h>
 #include <core/arraydim.h>
 #include <geometry/geometry_utils.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <properties.h>
diff --git a/pcbnew/plugins/fabmaster/import_fabmaster.cpp b/pcbnew/plugins/fabmaster/import_fabmaster.cpp
index 28ab27fd12..a4695a8ea8 100644
--- a/pcbnew/plugins/fabmaster/import_fabmaster.cpp
+++ b/pcbnew/plugins/fabmaster/import_fabmaster.cpp
@@ -52,7 +52,7 @@
 #include <zone.h>
 #include <common.h>
 #include <geometry/shape_arc.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <widgets/progress_reporter.h>
 #include <math/util.h>
 #include <wx/filename.h>
diff --git a/pcbnew/plugins/kicad/kicad_plugin.cpp b/pcbnew/plugins/kicad/kicad_plugin.cpp
index 73ace7fe3b..6a22006aa1 100644
--- a/pcbnew/plugins/kicad/kicad_plugin.cpp
+++ b/pcbnew/plugins/kicad/kicad_plugin.cpp
@@ -33,7 +33,7 @@
 #include <pcb_dimension.h>
 #include <footprint.h>
 #include <fp_shape.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <locale_io.h>
 #include <macros.h>
diff --git a/pcbnew/plugins/kicad/pcb_parser.cpp b/pcbnew/plugins/kicad/pcb_parser.cpp
index 4c389a1e17..c880731b72 100644
--- a/pcbnew/plugins/kicad/pcb_parser.cpp
+++ b/pcbnew/plugins/kicad/pcb_parser.cpp
@@ -55,7 +55,7 @@
 #include <plugins/kicad/pcb_parser.h>
 #include <convert_basic_shapes_to_polygon.h>    // for RECT_CHAMFER_POSITIONS definition
 #include <math/util.h>                           // KiROUND, Clamp
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/log.h>
 #include <widgets/progress_reporter.h>
 
diff --git a/pcbnew/plugins/legacy/legacy_plugin.cpp b/pcbnew/plugins/legacy/legacy_plugin.cpp
index 872202b9ae..0ad9a8f86a 100644
--- a/pcbnew/plugins/legacy/legacy_plugin.cpp
+++ b/pcbnew/plugins/legacy/legacy_plugin.cpp
@@ -65,7 +65,7 @@
 #include <wx/ffile.h>
 #include <wx/string.h>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <properties.h>
diff --git a/pcbnew/python/scripting/pcbnew_scripting.cpp b/pcbnew/python/scripting/pcbnew_scripting.cpp
index c92b0a68a3..99c0a0ceeb 100644
--- a/pcbnew/python/scripting/pcbnew_scripting.cpp
+++ b/pcbnew/python/scripting/pcbnew_scripting.cpp
@@ -37,7 +37,7 @@
 #include <eda_base_frame.h>
 #include <gal/color4d.h>
 #include <trace_helpers.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <paths.h>
 #include <settings/settings_manager.h>
diff --git a/pcbnew/python/scripting/pcbnew_scripting_helpers.cpp b/pcbnew/python/scripting/pcbnew_scripting_helpers.cpp
index 26a7adcd67..181817fca4 100644
--- a/pcbnew/python/scripting/pcbnew_scripting_helpers.cpp
+++ b/pcbnew/python/scripting/pcbnew_scripting_helpers.cpp
@@ -41,7 +41,7 @@
 #include <drc/drc_item.h>
 #include <fp_lib_table.h>
 #include <io_mgr.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <pcbnew_scripting_helpers.h>
 #include <project.h>
diff --git a/pcbnew/tools/board_inspection_tool.cpp b/pcbnew/tools/board_inspection_tool.cpp
index adc73479e4..4f274b1637 100644
--- a/pcbnew/tools/board_inspection_tool.cpp
+++ b/pcbnew/tools/board_inspection_tool.cpp
@@ -34,7 +34,7 @@
 #include <drc/drc_engine.h>
 #include <dialogs/panel_setup_rules_base.h>
 #include <dialogs/dialog_constraints_reporter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include "board_inspection_tool.h"
 #include <pcbnew_settings.h>
 #include <widgets/appearance_controls.h>
diff --git a/pcbnew/tools/drawing_stackup_table_tool.cpp b/pcbnew/tools/drawing_stackup_table_tool.cpp
index 81d5462983..961bc22054 100644
--- a/pcbnew/tools/drawing_stackup_table_tool.cpp
+++ b/pcbnew/tools/drawing_stackup_table_tool.cpp
@@ -40,7 +40,7 @@
 #include <fp_shape.h>
 #include <pcb_group.h>
 #include <pcb_text.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/utils.h>
 
 
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index e246306492..d9aa4f7895 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -57,7 +57,7 @@
 #include <ratsnest/ratsnest_data.h>
 #include <pcbnew_id.h>
 #include <dialogs/dialog_track_via_size.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <widgets/infobar.h>
 #include <board_design_settings.h>
diff --git a/pcbnew/zone.cpp b/pcbnew/zone.cpp
index 3b407d0931..15101d9c61 100644
--- a/pcbnew/zone.cpp
+++ b/pcbnew/zone.cpp
@@ -34,7 +34,7 @@
 #include <board_design_settings.h>
 #include <pad.h>
 #include <zone.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <math_for_graphics.h>
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>
diff --git a/qa/common/test_kicad_string.cpp b/qa/common/test_kicad_string.cpp
index ed24479401..73d913148b 100644
--- a/qa/common/test_kicad_string.cpp
+++ b/qa/common/test_kicad_string.cpp
@@ -29,7 +29,7 @@
 #include <qa_utils/wx_utils/unit_test_utils.h>
 
 // Code under test
-#include <kicad_string.h>
+#include <string_utils.h>
 
 /**
  * Declare the test suite
diff --git a/qa/drc_proto/drc_proto.cpp b/qa/drc_proto/drc_proto.cpp
index 619c28d346..0db2eff6c6 100644
--- a/qa/drc_proto/drc_proto.cpp
+++ b/qa/drc_proto/drc_proto.cpp
@@ -38,7 +38,7 @@
 #include <pcbnew/pcb_expr_evaluator.h>
 #include <board_design_settings.h>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #include <connectivity/connectivity_data.h>
 #include <connectivity/connectivity_algo.h>
diff --git a/scripting/python_scripting.cpp b/scripting/python_scripting.cpp
index 9e6f816e1b..55dccd0c2f 100644
--- a/scripting/python_scripting.cpp
+++ b/scripting/python_scripting.cpp
@@ -38,7 +38,7 @@
 #include <gal/color4d.h>
 #include <gestfich.h>
 #include <trace_helpers.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 
 #include <kiface_ids.h>