diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
index ad1a092ee8..3ec05b223b 100644
--- a/common/tool/tool_manager.cpp
+++ b/common/tool/tool_manager.cpp
@@ -25,6 +25,7 @@
  */
 
 #include <algorithm>
+#include <core/kicad_algo.h>
 #include <core/optional.h>
 #include <map>
 #include <stack>
diff --git a/eeschema/bus_alias.cpp b/eeschema/bus_alias.cpp
index 45aef7aa0b..23a3499a9d 100644
--- a/eeschema/bus_alias.cpp
+++ b/eeschema/bus_alias.cpp
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <common.h>
+#include <core/kicad_algo.h>
 #include "bus_alias.h"
 
 
diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp
index 173263f87c..4b7ffc2478 100644
--- a/eeschema/dialogs/dialog_change_symbols.cpp
+++ b/eeschema/dialogs/dialog_change_symbols.cpp
@@ -26,6 +26,7 @@
 #include <kiway.h>
 #include <lib_id.h>
 
+#include <core/kicad_algo.h>
 #include <dialog_change_symbols.h>
 #include <sch_component.h>
 #include <sch_edit_frame.h>
diff --git a/eeschema/dialogs/dialog_symbol_remap.cpp b/eeschema/dialogs/dialog_symbol_remap.cpp
index 938ea7a523..684a194a0a 100644
--- a/eeschema/dialogs/dialog_symbol_remap.cpp
+++ b/eeschema/dialogs/dialog_symbol_remap.cpp
@@ -32,6 +32,7 @@
 #include <wx_html_report_panel.h>
 
 #include <class_library.h>
+#include <core/kicad_algo.h>
 #include <lib_view_frame.h>
 #include <project_rescue.h>
 #include <sch_io_mgr.h>
diff --git a/eeschema/libedit/lib_edit_frame.cpp b/eeschema/libedit/lib_edit_frame.cpp
index 5ab05d6550..f9afdb94db 100644
--- a/eeschema/libedit/lib_edit_frame.cpp
+++ b/eeschema/libedit/lib_edit_frame.cpp
@@ -26,6 +26,7 @@
 #include <base_screen.h>
 #include <class_library.h>
 #include <confirm.h>
+#include <core/kicad_algo.h>
 #include <eeschema_id.h>
 #include <eeschema_settings.h>
 #include <kiface_i.h>
diff --git a/include/common.h b/include/common.h
index e4173c880f..1871c62b36 100644
--- a/include/common.h
+++ b/include/common.h
@@ -47,7 +47,6 @@
 #include <memory>
 #include <type_traits>
 #include <typeinfo>
-#include <core/kicad_algo.h>
 #include <macros.h>
 
 class PROJECT;
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 0036787da9..afef86ac26 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -37,6 +37,7 @@
 #include <class_zone.h>
 #include <class_marker_pcb.h>
 #include <class_pcb_target.h>
+#include <core/kicad_algo.h>
 #include <connectivity/connectivity_data.h>
 #include <kicad_string.h>
 #include <pgm_base.h>
diff --git a/pcbnew/connectivity/connectivity_items.cpp b/pcbnew/connectivity/connectivity_items.cpp
index 89c6b1e57d..e194e68be7 100644
--- a/pcbnew/connectivity/connectivity_items.cpp
+++ b/pcbnew/connectivity/connectivity_items.cpp
@@ -24,6 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <core/kicad_algo.h>
 #include <connectivity/connectivity_items.h>
 
 int CN_ITEM::AnchorCount() const
diff --git a/pcbnew/dialogs/dialog_export_svg.cpp b/pcbnew/dialogs/dialog_export_svg.cpp
index bd61782af1..fceada9fb7 100644
--- a/pcbnew/dialogs/dialog_export_svg.cpp
+++ b/pcbnew/dialogs/dialog_export_svg.cpp
@@ -28,6 +28,7 @@
 #include <wildcards_and_files_ext.h>
 #include <reporter.h>
 #include <confirm.h>
+#include <core/kicad_algo.h>
 #include <pcbplot.h>
 #include <locale_io.h>
 #include <class_board.h>
diff --git a/pcbnew/dialogs/panel_setup_layers.cpp b/pcbnew/dialogs/panel_setup_layers.cpp
index 3037fd0b9b..d16f8a35da 100644
--- a/pcbnew/dialogs/panel_setup_layers.cpp
+++ b/pcbnew/dialogs/panel_setup_layers.cpp
@@ -25,6 +25,7 @@
 
 
 #include <confirm.h>
+#include <core/kicad_algo.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
 #include <class_board.h>
diff --git a/pcbnew/import_gfx/graphics_import_mgr.cpp b/pcbnew/import_gfx/graphics_import_mgr.cpp
index 80d25730d4..6041dc4f74 100644
--- a/pcbnew/import_gfx/graphics_import_mgr.cpp
+++ b/pcbnew/import_gfx/graphics_import_mgr.cpp
@@ -24,6 +24,7 @@
 
 #include "graphics_import_mgr.h"
 
+#include <core/kicad_algo.h>
 #include <eda_item.h>
 #include "dxf_import_plugin.h"
 #include "svg_import_plugin.h"
diff --git a/pcbnew/router/pns_link_holder.h b/pcbnew/router/pns_link_holder.h
index 80f4dbb321..ec3f92be3d 100644
--- a/pcbnew/router/pns_link_holder.h
+++ b/pcbnew/router/pns_link_holder.h
@@ -22,6 +22,7 @@
 #ifndef PCBNEW_ROUTER_PNS_LINK_HOLDER_H_
 #define PCBNEW_ROUTER_PNS_LINK_HOLDER_H_
 
+#include <core/kicad_algo.h>
 #include "pns_item.h"
 #include "pns_linked_item.h"
 
diff --git a/pcbnew/tools/pcbnew_control.cpp b/pcbnew/tools/pcbnew_control.cpp
index 006f41c7b5..e505b6dab9 100644
--- a/pcbnew/tools/pcbnew_control.cpp
+++ b/pcbnew/tools/pcbnew_control.cpp
@@ -39,6 +39,7 @@
 #include <fp_shape.h>
 #include <confirm.h>
 #include <connectivity/connectivity_data.h>
+#include <core/kicad_algo.h>
 #include <kicad_clipboard.h>
 #include <origin_viewitem.h>
 #include <pcb_edit_frame.h>