diff --git a/eeschema/connection_graph.cpp b/eeschema/connection_graph.cpp
index 0a952636cb..6d27f3c136 100644
--- a/eeschema/connection_graph.cpp
+++ b/eeschema/connection_graph.cpp
@@ -39,6 +39,7 @@
 #include <schematic.h>
 #include <connection_graph.h>
 #include <widgets/ui_common.h>
+#include <kicad_string.h>
 
 #include <advanced_config.h> // for realtime connectivity switch
 
diff --git a/eeschema/dialogs/dialog_edit_sheet_pin.cpp b/eeschema/dialogs/dialog_edit_sheet_pin.cpp
index 962293166c..06489c5f76 100644
--- a/eeschema/dialogs/dialog_edit_sheet_pin.cpp
+++ b/eeschema/dialogs/dialog_edit_sheet_pin.cpp
@@ -27,6 +27,7 @@
 #include <sch_validators.h>
 #include <dialog_edit_sheet_pin.h>
 #include <html_messagebox.h>
+#include <kicad_string.h>
 
 
 static wxString sheetPinTypes[] =
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 2f43926497..ba94ebb053 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -48,6 +48,7 @@
 #include <wx/ffile.h>
 #include <erc_item.h>
 #include <eeschema_settings.h>
+#include <kicad_string.h>
 
 DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
         DIALOG_ERC_BASE( parent, ID_DIALOG_ERC ),  // parent looks for this ID explicitly
diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
index 628e41fc5b..113fa06504 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp
@@ -33,6 +33,7 @@
 #include <widgets/wx_grid.h>
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
+#include <kicad_string.h>
 
 class PIN_TABLE_DATA_MODEL : public wxGridTableBase
 {
diff --git a/eeschema/sch_connection.cpp b/eeschema/sch_connection.cpp
index 9f043c326b..211ce00f4c 100644
--- a/eeschema/sch_connection.cpp
+++ b/eeschema/sch_connection.cpp
@@ -27,6 +27,7 @@
 #include <sch_screen.h>
 #include <project/net_settings.h>
 #include <advanced_config.h>
+#include <kicad_string.h>
 
 #include <sch_connection.h>
 
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index b2c256e5a4..23b4122f2b 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -33,6 +33,7 @@
 #include <hierarch.h>
 #include <html_messagebox.h>
 #include <invoke_sch_dialog.h>
+#include <kicad_string.h>
 #include <kiface_i.h>
 #include <kiplatform/app.h>
 #include <kiway.h>
diff --git a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
index 07c0410390..23bb0d1297 100644
--- a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
+++ b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
@@ -29,6 +29,7 @@
 #include <lib_arc.h>
 #include <lib_polyline.h>
 #include <lib_text.h>
+#include <kicad_string.h>
 #include <sch_bus_entry.h>
 #include <sch_edit_frame.h> //COMPONENT_ORIENTATION_T
 #include <sch_io_mgr.h>
@@ -87,14 +88,14 @@ void CADSTAR_SCH_ARCHIVE_LOADER::Load( ::SCHEMATIC* aSchematic, ::SCH_SHEET* aRo
     loadFigures();
     loadTexts();
     loadDocumentationSymbols();
-    
+
     if( Schematic.VariantHierarchy.Variants.size() > 0 )
     {
         wxLogWarning(
                 _( "The CADSTAR design contains variants which has no KiCad equivalent. All "
                    "components have been loaded on top of each other. " ) );
     }
-        
+
     if( Schematic.Groups.size() > 0 )
     {
         wxLogWarning(
@@ -1050,11 +1051,11 @@ CADSTAR_SCH_ARCHIVE_LOADER::POINT CADSTAR_SCH_ARCHIVE_LOADER::getLocationOfNetEl
         const NET_SCH& aNet, const NETELEMENT_ID& aNetElementID )
 {
     // clang-format off
-    auto logUnknownNetElementError = 
+    auto logUnknownNetElementError =
         [&]()
         {
-            wxLogError( wxString::Format( _( 
-                "Net %s references unknown net element %s. The net was "                                         
+            wxLogError( wxString::Format( _(
+                "Net %s references unknown net element %s. The net was "
                 "not properly loaded and may require manual fixing." ),
                     getNetName( aNet ), aNetElementID ) );
 
diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
index 9945a67446..a235736bb1 100644
--- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@@ -58,6 +58,7 @@
 #include <sch_plugins/kicad/sch_sexpr_parser.h>
 #include <symbol_lib_table.h>  // for PropPowerSymsOnly definintion.
 #include <ee_selection.h>
+#include <kicad_string.h>
 
 
 using namespace TSCHEMATIC_T;
diff --git a/eeschema/tools/backannotate.cpp b/eeschema/tools/backannotate.cpp
index fe95f5567c..4ac499256a 100644
--- a/eeschema/tools/backannotate.cpp
+++ b/eeschema/tools/backannotate.cpp
@@ -32,6 +32,7 @@
 #include <sch_edit_frame.h>
 #include <sch_sheet_path.h>
 #include <schematic.h>
+#include <kicad_string.h>
 #include <kiface_i.h>
 #include <wildcards_and_files_ext.h>
 
diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp
index bd1ff6be1f..ee0a6a7b91 100644
--- a/eeschema/tools/sch_edit_tool.cpp
+++ b/eeschema/tools/sch_edit_tool.cpp
@@ -34,6 +34,7 @@
 #include <confirm.h>
 #include <eda_item.h>
 #include <reporter.h>
+#include <kicad_string.h>
 #include <sch_item.h>
 #include <sch_component.h>
 #include <sch_sheet.h>
diff --git a/gerbview/tools/gerbview_control.cpp b/gerbview/tools/gerbview_control.cpp
index 7b5afffa59..392dae56e7 100644
--- a/gerbview/tools/gerbview_control.cpp
+++ b/gerbview/tools/gerbview_control.cpp
@@ -25,6 +25,7 @@
 #include <gerber_file_image_list.h>
 #include <gerbview_painter.h>
 #include <gerbview_frame.h>
+#include <kicad_string.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 ab8359532d..f291e17fb1 100644
--- a/gerbview/tools/gerbview_selection_tool.cpp
+++ b/gerbview/tools/gerbview_selection_tool.cpp
@@ -26,6 +26,7 @@ using namespace std::placeholders;
 #include <bitmaps.h>
 #include <gerber_collectors.h>
 #include <class_draw_panel_gal.h>
+#include <kicad_string.h>
 #include <view/view.h>
 #include <view/view_controls.h>
 #include <view/view_group.h>
diff --git a/include/eda_text.h b/include/eda_text.h
index 54ac0781d1..7ad13b1874 100644
--- a/include/eda_text.h
+++ b/include/eda_text.h
@@ -27,7 +27,6 @@
 
 #include <common.h>                 // wxStringSplit
 #include <eda_rect.h>
-#include "kicad_string.h"
 #include "painter.h"
 
 class SHAPE_COMPOUND;