diff --git a/common/tool/tool_dispatcher.cpp b/common/tool/tool_dispatcher.cpp
index 8b42599445..a707e2fbad 100644
--- a/common/tool/tool_dispatcher.cpp
+++ b/common/tool/tool_dispatcher.cpp
@@ -34,7 +34,6 @@
 
 #include <class_draw_panel_gal.h>
 #include <eda_draw_frame.h>
-#include <pcbnew_id.h>
 
 #include <core/optional.h>
 
diff --git a/pcbnew/autorouter/autoplacer_tool.cpp b/pcbnew/autorouter/autoplacer_tool.cpp
index 739e07a203..06bed8851a 100644
--- a/pcbnew/autorouter/autoplacer_tool.cpp
+++ b/pcbnew/autorouter/autoplacer_tool.cpp
@@ -32,9 +32,6 @@
 #include <view/view.h>
 #include <view/view_controls.h>
 
-// For frame ToolID values
-#include <pcbnew_id.h>
-
 // For action icons
 #include <bitmaps.h>
 
diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index e020a26d3f..5f1ba2a3d6 100644
--- a/pcbnew/cross-probing.cpp
+++ b/pcbnew/cross-probing.cpp
@@ -38,7 +38,6 @@
 #include <pcb_edit_frame.h>
 #include <eda_dde.h>
 #include <macros.h>
-#include <pcbnew_id.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_track.h>
diff --git a/pcbnew/dialogs/dialog_find.cpp b/pcbnew/dialogs/dialog_find.cpp
index ae6b7b065d..e82ec190e0 100644
--- a/pcbnew/dialogs/dialog_find.cpp
+++ b/pcbnew/dialogs/dialog_find.cpp
@@ -34,7 +34,6 @@
 #include <kicad_string.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew.h>
-#include <pcbnew_id.h>
 #include <string>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
diff --git a/pcbnew/dialogs/dialog_set_grid.cpp b/pcbnew/dialogs/dialog_set_grid.cpp
index b129c2cb29..b3108b425c 100644
--- a/pcbnew/dialogs/dialog_set_grid.cpp
+++ b/pcbnew/dialogs/dialog_set_grid.cpp
@@ -28,7 +28,7 @@
 #include <pcb_base_edit_frame.h>
 #include <tools/pcb_actions.h>
 #include <tool/tool_manager.h>
-#include <pcbnew_id.h>
+#include <id.h>
 #include <tool/common_tools.h>
 
 // Max values for grid size
diff --git a/pcbnew/dialogs/panel_pcbnew_display_options.cpp b/pcbnew/dialogs/panel_pcbnew_display_options.cpp
index a9641390aa..dfa8ee1a52 100644
--- a/pcbnew/dialogs/panel_pcbnew_display_options.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_display_options.cpp
@@ -23,7 +23,6 @@
 #include <pcb_edit_frame.h>
 #include <pcb_display_options.h>
 #include <config_map.h>
-#include <pcbnew_id.h>
 #include <panel_pcbnew_display_options.h>
 #include <pcb_draw_panel_gal.h>
 #include <pcb_view.h>
diff --git a/pcbnew/dialogs/panel_pcbnew_settings.cpp b/pcbnew/dialogs/panel_pcbnew_settings.cpp
index 5562661ff6..c5e9c748e3 100644
--- a/pcbnew/dialogs/panel_pcbnew_settings.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_settings.cpp
@@ -26,7 +26,6 @@
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
 #include <board_design_settings.h>
-#include <pcbnew_id.h>
 #include <class_board.h>
 #include <panel_pcbnew_settings.h>
 #include <widgets/paged_dialog.h>
diff --git a/pcbnew/footprint_editor_options.cpp b/pcbnew/footprint_editor_options.cpp
index 12ec9310d3..3bf8008952 100644
--- a/pcbnew/footprint_editor_options.cpp
+++ b/pcbnew/footprint_editor_options.cpp
@@ -29,7 +29,6 @@
 #include <footprint_edit_frame.h>
 #include <board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
-#include <pcbnew_id.h>
 
 
 PARAM_CFG_ARRAY& FOOTPRINT_EDIT_FRAME::GetConfigurationSettings()
diff --git a/pcbnew/footprint_preview_panel.cpp b/pcbnew/footprint_preview_panel.cpp
index 19b4e51646..101e7b7aa3 100644
--- a/pcbnew/footprint_preview_panel.cpp
+++ b/pcbnew/footprint_preview_panel.cpp
@@ -37,7 +37,7 @@
 #include <wx/stattext.h>
 #include <pgm_base.h>
 #include <painter.h>
-#include <pcbnew_id.h>
+#include <id.h>
 
 /**
  * Threadsafe interface class between loader thread and panel class.
diff --git a/pcbnew/footprint_tree_pane.cpp b/pcbnew/footprint_tree_pane.cpp
index 1c8a7c9929..51d76451d3 100644
--- a/pcbnew/footprint_tree_pane.cpp
+++ b/pcbnew/footprint_tree_pane.cpp
@@ -24,7 +24,6 @@
 #include "footprint_tree_pane.h"
 #include "fp_tree_synchronizing_adapter.h"
 #include <widgets/lib_tree.h>
-#include <pcbnew_id.h>
 #include <footprint_edit_frame.h>
 #include <fp_lib_table.h>
 
@@ -41,7 +40,7 @@ FOOTPRINT_TREE_PANE::FOOTPRINT_TREE_PANE( FOOTPRINT_EDIT_FRAME* aParent )
     SetSizer( boxSizer );      // should remove the previous sizer according to wxWidgets docs
     Layout();
     boxSizer->Fit( this );
-    
+
     // Event handlers
     Bind( COMPONENT_SELECTED, &FOOTPRINT_TREE_PANE::onComponentSelected, this );
     m_tree->Bind( wxEVT_UPDATE_UI, &FOOTPRINT_TREE_PANE::onUpdateUI, this );
diff --git a/pcbnew/load_select_footprint.cpp b/pcbnew/load_select_footprint.cpp
index bd249e94e8..3c3215df48 100644
--- a/pcbnew/load_select_footprint.cpp
+++ b/pcbnew/load_select_footprint.cpp
@@ -85,7 +85,6 @@ static void clearModuleItemFlags( BOARD_ITEM* aItem )
     aItem->ClearFlags();
 }
 
-#include "pcbnew_id.h"
 #include <bitmaps.h>
 bool FOOTPRINT_EDIT_FRAME::Load_Module_From_BOARD( MODULE* aModule )
 {
diff --git a/pcbnew/pad_print_functions.cpp b/pcbnew/pad_print_functions.cpp
index ac5ab656bb..9402954b1a 100644
--- a/pcbnew/pad_print_functions.cpp
+++ b/pcbnew/pad_print_functions.cpp
@@ -35,7 +35,6 @@
 #include <pcb_edit_frame.h>
 #include <pcb_screen.h>
 #include <pcbnew.h>
-#include <pcbnew_id.h> // ID_TRACK_BUTT
 #include <trigo.h>
 
 
diff --git a/pcbnew/pcb_screen.cpp b/pcbnew/pcb_screen.cpp
index 475b593dff..03c2f20271 100644
--- a/pcbnew/pcb_screen.cpp
+++ b/pcbnew/pcb_screen.cpp
@@ -36,7 +36,7 @@
 #include <board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
 
-#include <pcbnew_id.h>
+#include <id.h>
 
 
 #define ZOOM_FACTOR( x )       ( x * IU_PER_MILS / 10 )
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index 299063345b..18460f3e9f 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -43,7 +43,6 @@
 #include <class_board.h>
 #include <class_module.h>
 #include <pcbplot.h>
-#include <pcbnew_id.h>
 #include <footprint_viewer_frame.h>
 #include <invoke_pcb_dialog.h>
 #include <wildcards_and_files_ext.h>
diff --git a/pcbnew/pcbnew_id.h b/pcbnew/pcbnew_id.h
index b62f1bedac..2cf7c0bc72 100644
--- a/pcbnew/pcbnew_id.h
+++ b/pcbnew/pcbnew_id.h
@@ -18,26 +18,6 @@ enum pcbnew_ids
     ID_COPY_BOARD_AS,
     ID_IMPORT_NON_KICAD_BOARD,
 
-    // Right vertical tool bar command IDs.
-    ID_PCB_HIGHLIGHT_BUTT,
-    ID_LOCAL_RATSNEST_BUTT,
-    ID_PCB_MODULE_BUTT,
-    ID_TRACK_BUTT,
-    ID_PCB_ZONES_BUTT,
-    ID_PCB_DRAW_VIA_BUTT,
-    ID_PCB_KEEPOUT_BUTT,
-    ID_PCB_ADD_LINE_BUTT,
-    ID_PCB_ADD_POLYGON_BUTT,
-    ID_PCB_CIRCLE_BUTT,
-    ID_PCB_ARC_BUTT,
-    ID_PCB_ADD_TEXT_BUTT,
-    ID_PCB_DIMENSION_BUTT,
-    ID_PCB_TARGET_BUTT,
-    ID_PCB_DELETE_ITEM_BUTT,
-    ID_PCB_PLACE_OFFSET_COORD_BUTT,
-    ID_PCB_PLACE_GRID_COORD_BUTT,
-    ID_PCB_MEASUREMENT_TOOL,
-
     // Tracks and vias sizes general options
     ID_AUX_TOOLBAR_PCB_VIA_SIZE,
     ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
@@ -113,8 +93,6 @@ enum pcbnew_ids
     ID_TOOLBARH_PCB_ACTION_PLUGIN,
     ID_TOOLBARH_PCB_ACTION_PLUGIN_REFRESH,
 
-    ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR,
-
     ID_PCB_GEN_CMP_FILE,
     ID_PCB_GEN_BOM_FILE_FROM_BOARD,
     ID_PCB_3DSHAPELIB_WIZARD,
diff --git a/pcbnew/router/pns_tool_base.cpp b/pcbnew/router/pns_tool_base.cpp
index d98a6825d5..cc24aede10 100644
--- a/pcbnew/router/pns_tool_base.cpp
+++ b/pcbnew/router/pns_tool_base.cpp
@@ -30,7 +30,6 @@ using namespace std::placeholders;
 #include <pcb_edit_frame.h>
 #include <id.h>
 #include <macros.h>
-#include <pcbnew_id.h>
 #include <view/view_controls.h>
 #include <pcb_painter.h>
 #include <dialogs/dialog_pns_settings.h>
diff --git a/pcbnew/swig/pcbnew_scripting_helpers.cpp b/pcbnew/swig/pcbnew_scripting_helpers.cpp
index 6b2df1e2d8..6223367def 100644
--- a/pcbnew/swig/pcbnew_scripting_helpers.cpp
+++ b/pcbnew/swig/pcbnew_scripting_helpers.cpp
@@ -39,7 +39,6 @@
 #include <macros.h>
 #include <pcb_draw_panel_gal.h>
 #include <pcbnew.h>
-#include <pcbnew_id.h>
 #include <pcbnew_scripting_helpers.h>
 
 static PCB_EDIT_FRAME* s_PcbEditFrame = NULL;
diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 3b9b5edad6..6a825f914d 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -33,7 +33,6 @@
 #include <kiway.h>
 #include <footprint_edit_frame.h>
 #include <array_creator.h>
-#include <pcbnew_id.h>
 #include <status_popup.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
diff --git a/pcbnew/tools/microwave_tool.cpp b/pcbnew/tools/microwave_tool.cpp
index ebbc124137..f309885839 100644
--- a/pcbnew/tools/microwave_tool.cpp
+++ b/pcbnew/tools/microwave_tool.cpp
@@ -31,7 +31,6 @@
 #include <confirm.h>
 #include <preview_items/two_point_geom_manager.h>
 #include <preview_items/centreline_rect_item.h>
-#include <pcbnew_id.h>
 #include <bitmaps.h>
 #include <class_board_item.h>
 #include <class_module.h>
diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp
index d9a54ffefe..80e5683a8e 100644
--- a/pcbnew/tools/pad_tool.cpp
+++ b/pcbnew/tools/pad_tool.cpp
@@ -37,7 +37,6 @@
 #include <tools/pcb_selection_conditions.h>
 #include <tools/edit_tool.h>
 #include <dialogs/dialog_enum_pads.h>
-#include "pcbnew_id.h"
 
 
 PAD_TOOL::PAD_TOOL() :
diff --git a/pcbnew/tools/pcbnew_control.cpp b/pcbnew/tools/pcbnew_control.cpp
index e2a400641c..7381003002 100644
--- a/pcbnew/tools/pcbnew_control.cpp
+++ b/pcbnew/tools/pcbnew_control.cpp
@@ -48,7 +48,6 @@
 #include <pcb_edit_frame.h>
 #include <pcb_painter.h>
 #include <pcb_screen.h>
-#include <pcbnew_id.h>
 #include <properties.h>
 #include <tool/tool_manager.h>
 #include <view/view_controls.h>
diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp
index e4fa975d20..1b1ac2b700 100644
--- a/pcbnew/zones_by_polygon.cpp
+++ b/pcbnew/zones_by_polygon.cpp
@@ -34,7 +34,6 @@
 #include <class_zone.h>
 #include <pcbnew.h>
 #include <zones.h>
-#include <pcbnew_id.h>
 #include <zones_functions_for_undo_redo.h>
 #include <tools/drc.h>
 #include <connectivity/connectivity_data.h>