diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp
index 671688fec4..2987ec9780 100644
--- a/3d-viewer/3d_viewer/3d_menubar.cpp
+++ b/3d-viewer/3d_viewer/3d_menubar.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2016 Mario Luzeiro <mrluzeiro@ua.pt>
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,6 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <tool/conditional_menu.h>
 #include <eda_3d_viewer.h>
 #include <menus_helpers.h>
diff --git a/3d-viewer/3d_viewer/3d_toolbar.cpp b/3d-viewer/3d_viewer/3d_toolbar.cpp
index ae9bad4ee9..a2dd254414 100644
--- a/3d-viewer/3d_viewer/3d_toolbar.cpp
+++ b/3d-viewer/3d_viewer/3d_toolbar.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2016 Mario Luzeiro <mrluzeiro@ua.pt>
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,11 +24,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file 3d_toolbar.cpp
- */
-
 #include <wx/wupdlock.h>
+
+#include <bitmaps.h>
 #include <eda_3d_viewer.h>
 #include <menus_helpers.h>
 #include <tool/action_toolbar.h>
diff --git a/common/confirm.cpp b/common/confirm.cpp
index 76613be524..95a9edf59e 100644
--- a/common/confirm.cpp
+++ b/common/confirm.cpp
@@ -26,7 +26,6 @@
 #include <wx/richmsgdlg.h>
 #include <wx/choicdlg.h>
 #include <confirm.h>
-#include <bitmaps.h>
 #include <dialogs/html_messagebox.h>
 #include <functional>
 #include <unordered_map>
diff --git a/common/dialogs/dialog_configure_paths.cpp b/common/dialogs/dialog_configure_paths.cpp
index cdf116bc79..354aa887dc 100644
--- a/common/dialogs/dialog_configure_paths.cpp
+++ b/common/dialogs/dialog_configure_paths.cpp
@@ -24,6 +24,7 @@
 
 #include <dialogs/dialog_configure_paths.h>
 
+#include <bitmaps.h>
 #include <confirm.h>
 #include <menus_helpers.h>
 #include <validators.h>
diff --git a/common/tool/action_menu.cpp b/common/tool/action_menu.cpp
index 84d0658610..ca7f706e2b 100644
--- a/common/tool/action_menu.cpp
+++ b/common/tool/action_menu.cpp
@@ -24,6 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <eda_base_frame.h>
 #include <functional>
 #include <id.h>
diff --git a/cvpcb/tools/cvpcb_fpviewer_selection_tool.cpp b/cvpcb/tools/cvpcb_fpviewer_selection_tool.cpp
index 4a8665500e..f9b649a62c 100644
--- a/cvpcb/tools/cvpcb_fpviewer_selection_tool.cpp
+++ b/cvpcb/tools/cvpcb_fpviewer_selection_tool.cpp
@@ -20,14 +20,11 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include <bitmaps.h>
-#include <preview_items/ruler_item.h>
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
 #include <tools/cvpcb_actions.h>
 #include <tools/cvpcb_fpviewer_selection_tool.h>
-#include <view/view.h>
-#include <view/view_controls.h>
+
 
 CVPCB_FOOTPRINT_VIEWER_SELECTION_TOOL::CVPCB_FOOTPRINT_VIEWER_SELECTION_TOOL() :
         TOOL_INTERACTIVE( "cvpcb.FootprintViewerInteractiveSelection" ),
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index 7254667a5d..6569c00c31 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@@ -28,6 +28,7 @@
  */
 
 
+#include <bitmaps.h>
 #include <bom_plugins.h>
 #include <confirm.h>
 #include <dialog_bom_base.h>
@@ -38,12 +39,10 @@
 #include <i18n_utility.h> // for _HKI definition used in dialog_bom_help_md.h
 #include <invoke_sch_dialog.h>
 #include <kiface_i.h>
-#include <netlist.h>
 #include <netlist_exporter_xml.h>
 #include <pgm_base.h>
 #include <reporter.h>
 #include <sch_edit_frame.h>
-#include <schematic.h>
 #include <paths.h>
 
 #include <wx/filedlg.h>
diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp
index 676ad6baca..6337d4bd92 100644
--- a/eeschema/dialogs/dialog_edit_one_field.cpp
+++ b/eeschema/dialogs/dialog_edit_one_field.cpp
@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <kiway.h>
 #include <confirm.h>
 #include <kicad_string.h>
diff --git a/eeschema/dialogs/dialog_junction_props.cpp b/eeschema/dialogs/dialog_junction_props.cpp
index 459f1a8033..1b5a194de6 100644
--- a/eeschema/dialogs/dialog_junction_props.cpp
+++ b/eeschema/dialogs/dialog_junction_props.cpp
@@ -18,7 +18,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <bitmaps.h>
 #include <sch_junction.h>
 #include <dialog_junction_props.h>
 #include <pgm_base.h>
diff --git a/eeschema/dialogs/dialog_symbol_properties.cpp b/eeschema/dialogs/dialog_symbol_properties.cpp
index 43bdef2bd2..6e00f79405 100644
--- a/eeschema/dialogs/dialog_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_symbol_properties.cpp
@@ -23,6 +23,7 @@
 
 #include "dialog_symbol_properties.h"
 
+#include <bitmaps.h>
 #include <wx/tooltip.h>
 #include <grid_tricks.h>
 #include <confirm.h>
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 682272b714..be150c2f1f 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -24,6 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <filehistory.h>
 #include <kiface_i.h>
 #include <menus_helpers.h>
diff --git a/eeschema/pin_type.cpp b/eeschema/pin_type.cpp
index db204e62be..6153236690 100644
--- a/eeschema/pin_type.cpp
+++ b/eeschema/pin_type.cpp
@@ -21,9 +21,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pin_type.h>
-#include <lib_pin.h>
+#include <bitmaps.h>
 #include <core/arraydim.h>
+#include <lib_pin.h>
+#include <pin_type.h>
 
 
 // These are true singletons so it's OK for them to be globals.
diff --git a/eeschema/pin_type.h b/eeschema/pin_type.h
index 9f6679696c..7839fdef47 100644
--- a/eeschema/pin_type.h
+++ b/eeschema/pin_type.h
@@ -25,7 +25,7 @@
 #define PIN_TYPE_H_
 
 #include <wx/arrstr.h>
-#include <bitmaps.h>
+#include <bitmap_types.h>
 #include <vector>
 
 /**
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index a4cf172304..eb3a83b751 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -23,6 +23,7 @@
  */
 
 #include <base_units.h>
+#include <bitmaps.h>
 #include <class_library.h>
 #include <confirm.h>
 #include <connection_graph.h>
diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index 283852798b..66f43cc873 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -22,6 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <core/mirror.h>
 #include <sch_painter.h>
 #include <plotter.h>
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index d6434be70e..6ad7943137 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -22,6 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <core/mirror.h>
 #include <sch_draw_panel.h>
 #include <gr_text.h>
diff --git a/eeschema/sch_symbol.h b/eeschema/sch_symbol.h
index 673a4ffdea..166a95c5e1 100644
--- a/eeschema/sch_symbol.h
+++ b/eeschema/sch_symbol.h
@@ -43,7 +43,6 @@
 #include <wx/gdicmn.h>
 #include <wx/string.h>
 
-#include <bitmaps.h>
 #include <sch_field.h>
 #include <sch_item.h>
 #include <sch_pin.h>
diff --git a/eeschema/symbol_editor/menubar_symbol_editor.cpp b/eeschema/symbol_editor/menubar_symbol_editor.cpp
index 05ad1e1976..32f9142b2a 100644
--- a/eeschema/symbol_editor/menubar_symbol_editor.cpp
+++ b/eeschema/symbol_editor/menubar_symbol_editor.cpp
@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <menus_helpers.h>
 #include <pgm_base.h>
 #include <tool/action_menu.h>
diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp
index be09813912..70d59f5909 100644
--- a/eeschema/symbol_editor/symbol_edit_frame.cpp
+++ b/eeschema/symbol_editor/symbol_edit_frame.cpp
@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <wx/hyperlink.h>
 #include <base_screen.h>
 #include <class_library.h>
@@ -40,7 +41,6 @@
 #include <symbol_editor_settings.h>
 #include <paths.h>
 #include <pgm_base.h>
-#include <sch_draw_panel.h>
 #include <sch_painter.h>
 #include <sch_view.h>
 #include <settings/settings_manager.h>
diff --git a/eeschema/toolbars_symbol_viewer.cpp b/eeschema/toolbars_symbol_viewer.cpp
index 1e7a9c20cf..7f449b8360 100644
--- a/eeschema/toolbars_symbol_viewer.cpp
+++ b/eeschema/toolbars_symbol_viewer.cpp
@@ -20,19 +20,19 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+#include <bitmaps.h>
 #include <macros.h>
-#include "class_library.h"
-#include "eeschema_id.h"
-#include "symbol_viewer_frame.h"
-#include "sch_painter.h"
+#include <class_library.h>
+#include <eeschema_id.h>
+#include <symbol_viewer_frame.h>
+#include <sch_painter.h>
 #include <tool/action_menu.h>
 #include <tool/action_toolbar.h>
-#include <tool/tool_manager.h>
 #include <tools/ee_actions.h>
 #include <tools/symbol_editor_control.h>
 #include <widgets/wx_menubar.h>
 
+
 void SYMBOL_VIEWER_FRAME::ReCreateHToolbar()
 {
     if( m_mainToolBar )
diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 8b5807c184..bf6d1973f5 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
+#include <bitmaps.h>
 #include <core/typeinfo.h>
 #include <ee_actions.h>
 #include <ee_collectors.h>
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index 8b91b007e3..f2313750b4 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2009 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,12 +22,13 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
+
 #include "gerbview_frame.h"
 
+#include <bitmaps.h>
 #include "gerbview_id.h"
 #include <kiface_i.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <tool/action_menu.h>
 #include <tool/actions.h>
 #include <tool/tool_manager.h>
diff --git a/gerbview/tools/gerbview_selection_tool.cpp b/gerbview/tools/gerbview_selection_tool.cpp
index d51ce2323e..fec7d56a9f 100644
--- a/gerbview/tools/gerbview_selection_tool.cpp
+++ b/gerbview/tools/gerbview_selection_tool.cpp
@@ -22,20 +22,16 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include <eda_item.h>
 #include <bitmaps.h>
+#include <eda_item.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>
 #include <painter.h>
-#include <bitmaps.h>
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
-#include <preview_items/ruler_item.h>
-#include <preview_items/selection_area.h>
 #include <gerbview_id.h>
 #include <gerbview_painter.h>
 #include "gerbview_selection_tool.h"
diff --git a/gerbview/widgets/gerbview_layer_widget.cpp b/gerbview/widgets/gerbview_layer_widget.cpp
index 76a4ea5f8e..830d04b329 100644
--- a/gerbview/widgets/gerbview_layer_widget.cpp
+++ b/gerbview/widgets/gerbview_layer_widget.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2004-2010 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2018-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <menus_helpers.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>
diff --git a/gerbview/widgets/layer_widget.cpp b/gerbview/widgets/layer_widget.cpp
index 4324be14d1..ecf7f89852 100644
--- a/gerbview/widgets/layer_widget.cpp
+++ b/gerbview/widgets/layer_widget.cpp
@@ -3,7 +3,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2010-2020 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2010-2021 KiCad Developers, see change_log.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -35,15 +35,13 @@
 
 #include "layer_widget.h"
 
+#include <bitmaps.h>
 #include <macros.h>
-#include <common.h>
-
+#include <menus_helpers.h>
 #include <widgets/indicator_icon.h>
 
 #include <algorithm>
 
-#include <menus_helpers.h>
-
 
 const wxEventType LAYER_WIDGET::EVT_LAYER_COLOR_CHANGE = wxNewEventType();
 
diff --git a/include/bitmap_types.h b/include/bitmap_types.h
index ef2148e815..510920a215 100644
--- a/include/bitmap_types.h
+++ b/include/bitmap_types.h
@@ -33,7 +33,6 @@ class wxBitmap;     // only to define wxBitmap
 class EDA_DRAW_FRAME;
 class wxWindow;
 
-#include <config.h>
 #include <wx/gdicmn.h>  // wxBitmapType
 
 #include <bitmaps_png/bitmap_def.h>
diff --git a/include/bitmaps.h b/include/bitmaps.h
index 7b2ab3988f..fb70152789 100644
--- a/include/bitmaps.h
+++ b/include/bitmaps.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2007-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2017 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see CHANGELOG.TXT for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/menus_helpers.h b/include/menus_helpers.h
index fc801e40e9..413a90d9fc 100644
--- a/include/menus_helpers.h
+++ b/include/menus_helpers.h
@@ -32,7 +32,6 @@
 
 #include <wx/menu.h>
 #include <wx/menuitem.h>
-#include <bitmaps.h>
 
 class ACTION_MENU;
 class TOOL_INTERACTIVE;
diff --git a/kicad/tools/kicad_manager_control.cpp b/kicad/tools/kicad_manager_control.cpp
index 1d856fbf43..a37adb5ef1 100644
--- a/kicad/tools/kicad_manager_control.cpp
+++ b/kicad/tools/kicad_manager_control.cpp
@@ -24,7 +24,6 @@
 #include <kiway.h>
 #include <kicad_manager_frame.h>
 #include <confirm.h>
-#include <bitmaps.h>
 #include <tool/selection.h>
 #include <tool/tool_event.h>
 #include <tools/kicad_manager_actions.h>
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index 3d543e2674..fc390c4fc0 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2016-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2016-2021 KiCad Developers, see AUTHORS.txt for contributors.
  * Copyright (C) 2013-2019 CERN
  * @author Jean-Pierre Charras, jp.charras at wanadoo.fr
  *
@@ -23,13 +23,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <filehistory.h>
 #include <kiface_i.h>
 #include <menus_helpers.h>
 #include <pgm_base.h>
 #include <tool/action_menu.h>
 #include <tool/tool_manager.h>
-#include <tool/selection.h>
 #include <widgets/wx_menubar.h>
 
 #include "pl_editor_frame.h"
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index 9146c2f1e7..66d79bbac9 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <bitmaps.h>
 #include <confirm.h>
 #include <dialog_drc.h>
 #include <kiface_i.h>
diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp
index a1f3f96119..7cb4897abd 100644
--- a/pcbnew/menubar_footprint_editor.cpp
+++ b/pcbnew/menubar_footprint_editor.cpp
@@ -26,12 +26,12 @@
 
 #include "footprint_edit_frame.h"
 #include "pcbnew_id.h"
+#include <bitmaps.h>
 #include <menus_helpers.h>
 #include <tool/actions.h>
 #include <tool/action_menu.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
-#include <board.h>
 #include <tools/pcb_selection_tool.h>
 #include <widgets/wx_menubar.h>
 
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index ac35035b78..5e983ad06f 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
  * Copyright (C) 2012 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,18 +24,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
-#include <advanced_config.h>
+#include <bitmaps.h>
 #include <filehistory.h>
 #include <kiface_i.h>
 #include <menus_helpers.h>
 #include <pcb_edit_frame.h>
-#include <pcbnew.h>
 #include <pcbnew_id.h>
 #include <pgm_base.h>
 #include <tool/actions.h>
-#include <tool/conditional_menu.h>
-#include <tool/selection_conditions.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <tools/pcb_selection_tool.h>
diff --git a/pcbnew/router/pns_tool_base.cpp b/pcbnew/router/pns_tool_base.cpp
index a0c82f7071..51efb9a6a4 100644
--- a/pcbnew/router/pns_tool_base.cpp
+++ b/pcbnew/router/pns_tool_base.cpp
@@ -23,13 +23,10 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include <eda_item.h>
 #include <id.h>
 #include <view/view.h>
-#include <view/view_controls.h>
 #include <pcb_painter.h>
 #include <pcbnew_settings.h>
-#include <bitmaps.h>
 
 #include <tools/pcb_grid_helper.h>
 #include <tools/pcb_actions.h>
diff --git a/pcbnew/swig/pcbnew_action_plugins.cpp b/pcbnew/swig/pcbnew_action_plugins.cpp
index e98b11a4e9..9c9ceaedc7 100644
--- a/pcbnew/swig/pcbnew_action_plugins.cpp
+++ b/pcbnew/swig/pcbnew_action_plugins.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "pcbnew_action_plugins.h"
+#include <bitmaps.h>
 #include <board.h>
 #include <footprint.h>
 #include <track.h>