diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp
index c9bb94c3fa..cb1bb1385a 100644
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@@ -36,7 +36,6 @@
 #include <tools/ee_actions.h>
 #include <tools/ee_selection_tool.h>
 #include <tool/tool_manager.h>
-#include "eeschema_id.h"
 
 void SCH_EDIT_FRAME::GetSchematicConnections( std::vector< wxPoint >& aConnections )
 {
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index 2d1ea2e4be..e879f5d2a2 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -31,7 +31,6 @@
 #include <eda_dde.h>
 #include <sch_edit_frame.h>
 #include <general.h>
-#include <eeschema_id.h>
 #include <lib_item.h>
 #include <lib_pin.h>
 #include <sch_component.h>
diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp
index 6cc54d57ea..f0de1b9731 100644
--- a/eeschema/edit_label.cpp
+++ b/eeschema/edit_label.cpp
@@ -33,7 +33,6 @@
 #include <tools/ee_actions.h>
 #include <general.h>
 #include <sch_text.h>
-#include <eeschema_id.h>
 #include <sch_view.h>
 
 #include <wx/tokenzr.h>
diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp
index f8568dd936..e9e7b11966 100644
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@@ -45,7 +45,6 @@
 #include <dialogs/panel_libedit_settings.h>
 #include <sch_painter.h>
 #include "sch_junction.h"
-#include "eeschema_id.h"
 
 static int s_defaultBusThickness = DEFAULTBUSTHICKNESS;
 static int s_defaultWireThickness  = DEFAULTDRAWLINETHICKNESS;
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index e03e9ab4b1..456a6c45ee 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -34,7 +34,7 @@
 #include <richio.h>
 #include <trace_helpers.h>
 #include <tool/tool_manager.h>
-#include <eeschema_id.h>
+#include <id.h>
 #include <class_library.h>
 #include <lib_edit_frame.h>
 #include <sch_sheet.h>
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index b879442156..cebe0b2e52 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -39,7 +39,6 @@
 #include <sch_component.h>
 #include <lib_edit_frame.h>
 #include <lib_view_frame.h>
-#include <eeschema_id.h>
 #include <symbol_lib_table.h>
 
 #include <dialog_choose_component.h>
diff --git a/eeschema/libedit/menubar_libedit.cpp b/eeschema/libedit/menubar_libedit.cpp
index 436eb89a43..598488df9e 100644
--- a/eeschema/libedit/menubar_libedit.cpp
+++ b/eeschema/libedit/menubar_libedit.cpp
@@ -30,7 +30,6 @@
 #include <tools/ee_actions.h>
 #include <tools/ee_selection_tool.h>
 #include <lib_manager.h>
-#include "eeschema_id.h"
 #include "lib_edit_frame.h"
 
 
diff --git a/eeschema/sch_base_frame.cpp b/eeschema/sch_base_frame.cpp
index 8db9a07ddf..da71a7b358 100644
--- a/eeschema/sch_base_frame.cpp
+++ b/eeschema/sch_base_frame.cpp
@@ -31,7 +31,6 @@
 #include <confirm.h>
 #include <preview_items/selection_area.h>
 #include <class_library.h>
-#include <eeschema_id.h>
 #include <lib_edit_frame.h>
 #include <lib_view_frame.h>
 #include <sch_base_frame.h>
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 26637275b0..fded3b755c 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -33,7 +33,7 @@
 #include <gr_basic.h>
 #include <common.h>
 #include <kicad_string.h>
-#include <eeschema_id.h>
+#include <id.h>
 #include <pgm_base.h>
 #include <kiway.h>
 #include <sch_draw_panel.h>
diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 1abc377d38..502c6c5aaa 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -44,7 +44,7 @@
 #include <tools/sch_line_wire_bus_tool.h>
 #include <ee_collectors.h>
 #include <painter.h>
-#include <eeschema_id.h>
+#include <eeschema_id.h>        // For MAX_SELECT_ITEM_IDS
 #include <menus_helpers.h>
 
 
diff --git a/eeschema/tools/lib_control.cpp b/eeschema/tools/lib_control.cpp
index 69a9c864a4..68287467a0 100644
--- a/eeschema/tools/lib_control.cpp
+++ b/eeschema/tools/lib_control.cpp
@@ -28,7 +28,6 @@
 #include <tool/tool_manager.h>
 #include <tools/ee_actions.h>
 #include <tools/lib_control.h>
-#include <eeschema_id.h>
 #include <lib_edit_frame.h>
 #include <lib_view_frame.h>
 #include <wildcards_and_files_ext.h>
diff --git a/eeschema/tools/lib_drawing_tools.cpp b/eeschema/tools/lib_drawing_tools.cpp
index 28b4ba4ee1..d52c4cdac7 100644
--- a/eeschema/tools/lib_drawing_tools.cpp
+++ b/eeschema/tools/lib_drawing_tools.cpp
@@ -25,7 +25,6 @@
 #include <ee_actions.h>
 #include <lib_edit_frame.h>
 #include <sch_view.h>
-#include <eeschema_id.h>
 #include <confirm.h>
 #include <view/view_controls.h>
 #include <view/view.h>
diff --git a/eeschema/tools/lib_edit_tool.cpp b/eeschema/tools/lib_edit_tool.cpp
index 2b115ee986..3aca62ff15 100644
--- a/eeschema/tools/lib_edit_tool.cpp
+++ b/eeschema/tools/lib_edit_tool.cpp
@@ -33,7 +33,6 @@
 #include <confirm.h>
 #include <sch_view.h>
 #include <lib_edit_frame.h>
-#include <eeschema_id.h>
 #include <dialogs/dialog_lib_edit_draw_item.h>
 #include <dialogs/dialog_lib_edit_text.h>
 #include <dialogs/dialog_edit_one_field.h>
diff --git a/eeschema/tools/lib_pin_tool.cpp b/eeschema/tools/lib_pin_tool.cpp
index 3e7088124d..e0bad963ff 100644
--- a/eeschema/tools/lib_pin_tool.cpp
+++ b/eeschema/tools/lib_pin_tool.cpp
@@ -25,7 +25,6 @@
 #include <tool/tool_manager.h>
 #include <tools/ee_selection_tool.h>
 #include <lib_edit_frame.h>
-#include <eeschema_id.h>
 #include <confirm.h>
 #include <ee_actions.h>
 #include <sch_view.h>
diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index 5815309ffc..f2d41d96af 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -30,7 +30,6 @@
 #include <sch_line.h>
 #include <connection_graph.h>
 #include <erc.h>
-#include <eeschema_id.h>
 #include <netlist_object.h>
 #include <tool/tool_manager.h>
 #include <tool/picker_tool.h>