diff --git a/include/class_draw_panel_gal.h b/include/class_draw_panel_gal.h
index 3bc0df6678..d20290b59d 100644
--- a/include/class_draw_panel_gal.h
+++ b/include/class_draw_panel_gal.h
@@ -35,7 +35,6 @@
 #include <math/vector2d.h>
 #include <msgpanel.h>
 #include <memory>
-#include <common.h>
 #include <cursors.h>
 
 class BOARD;
diff --git a/include/class_pcb_group.h b/include/class_pcb_group.h
index 62fe53c24b..2ea9d2ce7c 100644
--- a/include/class_pcb_group.h
+++ b/include/class_pcb_group.h
@@ -37,7 +37,6 @@
 
 #include <board_commit.h>
 #include <class_board_item.h>
-#include <common.h>
 #include <unordered_set>
 
 namespace KIGFX
diff --git a/include/collector.h b/include/collector.h
index 353ce6af41..1cfc4b1f63 100644
--- a/include/collector.h
+++ b/include/collector.h
@@ -33,7 +33,6 @@
 #include <vector>
 
 #include <eda_item.h>    // SEARCH_RESULT
-#include <common.h>         // GetNewTimeStamp()
 #include <eda_rect.h>
 
 
diff --git a/include/tool/grid_menu.h b/include/tool/grid_menu.h
index 5a140e3bbf..b60cdad902 100644
--- a/include/tool/grid_menu.h
+++ b/include/tool/grid_menu.h
@@ -25,7 +25,6 @@
 #ifndef GRID_MENU_H
 #define GRID_MENU_H
 
-#include <common.h>
 #include <tool/action_menu.h>
 
 class EDA_DRAW_FRAME;
diff --git a/include/widgets/bitmap_toggle.h b/include/widgets/bitmap_toggle.h
index 9adb70a975..44d97a283d 100644
--- a/include/widgets/bitmap_toggle.h
+++ b/include/widgets/bitmap_toggle.h
@@ -27,8 +27,6 @@
 
 #include <wx/wx.h>
 
-//#include <common.h>
-
 #include <gal/color4d.h>
 
 
diff --git a/pcbnew/router/pns_itemset.h b/pcbnew/router/pns_itemset.h
index 90242e0364..ad77891711 100644
--- a/pcbnew/router/pns_itemset.h
+++ b/pcbnew/router/pns_itemset.h
@@ -23,7 +23,7 @@
 #define __PNS_ITEMSET_H
 
 #include <vector>
-#include <common.h>
+#include <core/kicad_algo.h>
 #include "pns_item.h"
 
 namespace PNS {
diff --git a/pcbnew/tools/pcb_editor_conditions.h b/pcbnew/tools/pcb_editor_conditions.h
index be8e58dae3..273193ce1d 100644
--- a/pcbnew/tools/pcb_editor_conditions.h
+++ b/pcbnew/tools/pcb_editor_conditions.h
@@ -25,7 +25,6 @@
 #ifndef PCB_EDITOR_CONDITIONS_H_
 #define PCB_EDITOR_CONDITIONS_H_
 
-#include <common.h>
 #include <functional>
 #include <tool/editor_conditions.h>
 #include <tool/selection.h>