From c4c19018c3f7dee2505d0cd80a75dd955ebb695d Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Wed, 4 Mar 2026 15:51:05 +0800
Subject: [PATCH] Pcbnew: Restrict includes of pad.h/footprint.h

There are some headers which don't need to include pad.h (which brings
padstack.h) - they just need forward defines.

While pad.h is not an especially heavy include on the scale of things,
footprint is quite heavy. And both reduce inclusion load and
reduce the number of files needlessly sensitive to changes in headers.
---
 3d-viewer/3d_canvas/board_adapter.cpp         |  1 +
 3d-viewer/3d_canvas/board_adapter.h           |  6 ++--
 3d-viewer/3d_canvas/create_layer_items.cpp    |  3 ++
 3d-viewer/3d_canvas/eda_3d_canvas.cpp         |  6 ++--
 .../3d_rendering/opengl/render_3d_opengl.h    |  1 +
 .../3d_rendering/raytracing/create_scene.cpp  |  1 +
 .../raytracing/render_3d_raytrace_gl.cpp      |  5 ++-
 .../raytracing/render_3d_raytrace_gl.h        |  5 +++
 3d-viewer/dialogs/panel_preview_3d_model.cpp  |  1 +
 pcbnew/array_pad_number_provider.h            |  3 +-
 pcbnew/autorouter/ar_autoplacer.h             |  2 --
 pcbnew/autorouter/autoplace_tool.cpp          |  1 +
 pcbnew/autorouter/spread_footprints.cpp       |  5 ++-
 pcbnew/autorouter/spread_footprints.h         |  5 +--
 pcbnew/board.cpp                              |  1 +
 pcbnew/board_commit.cpp                       |  1 +
 .../component_class_cache_proxy.h             |  3 +-
 pcbnew/connectivity/connectivity_algo.cpp     |  3 ++
 pcbnew/connectivity/connectivity_algo.h       | 13 +++-----
 pcbnew/connectivity/connectivity_data.cpp     |  2 ++
 pcbnew/connectivity/from_to_cache.cpp         |  4 +++
 pcbnew/dialogs/dialog_board_reannotate.cpp    |  7 ++--
 pcbnew/dialogs/dialog_board_reannotate.h      |  3 --
 pcbnew/dialogs/dialog_board_statistics.cpp    |  7 ++++
 pcbnew/dialogs/dialog_board_statistics.h      | 11 ++-----
 .../dialogs/dialog_footprint_properties.cpp   |  1 +
 pcbnew/dialogs/dialog_footprint_properties.h  |  7 ++--
 .../dialog_footprint_properties_fp_editor.cpp |  1 +
 pcbnew/dialogs/dialog_fp_edit_pad_table.h     |  1 -
 .../dialogs/dialog_global_edit_teardrops.cpp  |  2 +-
 .../dialog_multichannel_repeat_layout.cpp     |  1 +
 pcbnew/dialogs/dialog_pad_properties.h        |  5 ++-
 pcbnew/drc/drc_cache_generator.cpp            |  2 +-
 pcbnew/drc/drc_rtree.h                        |  1 -
 .../drc/drc_test_provider_edge_clearance.cpp  |  3 +-
 .../drc_test_provider_schematic_parity.cpp    |  1 +
 pcbnew/exporters/place_file_exporter.cpp      |  1 +
 pcbnew/exporters/place_file_exporter.h        |  1 -
 pcbnew/footprint.cpp                          |  4 ++-
 pcbnew/footprint_chooser_frame.cpp            | 10 +++---
 pcbnew/footprint_chooser_frame.h              |  1 +
 pcbnew/footprint_viewer_frame.cpp             |  2 +-
 pcbnew/footprint_wizard_frame.cpp             | 18 ++++++----
 pcbnew/kicad_clipboard.cpp                    |  1 +
 pcbnew/kicad_clipboard.h                      |  1 -
 .../length_delay_calculation.cpp              |  1 +
 .../length_delay_calculation_item.cpp         |  1 +
 .../length_delay_calculation_item.h           |  6 +++-
 .../tuning_profile_parameters_iface.h         |  1 +
 ...tuning_profile_parameters_user_defined.cpp |  1 +
 .../netlist_reader/kicad_netlist_reader.cpp   |  2 ++
 .../netlist_reader/legacy_netlist_reader.cpp  |  4 ++-
 pcbnew/netlist_reader/netlist.cpp             |  1 +
 pcbnew/netlist_reader/pcb_component.cpp       | 22 ++++++++++++-
 pcbnew/netlist_reader/pcb_component.h         | 21 ++++--------
 pcbnew/netlist_reader/pcb_netlist.cpp         | 33 +++++++++++++++++--
 pcbnew/netlist_reader/pcb_netlist.h           | 23 ++++---------
 pcbnew/pad_utils.cpp                          |  2 ++
 pcbnew/pad_utils.h                            |  6 ++--
 pcbnew/pcb_base_frame.cpp                     |  2 ++
 pcbnew/pcb_draw_panel_gal.cpp                 |  1 +
 pcbnew/pcb_edit_frame.cpp                     | 13 +++++---
 pcbnew/pcb_io/altium/altium_parser_pcb.cpp    |  1 +
 pcbnew/pcb_io/altium/altium_parser_pcb.h      |  8 ++++-
 pcbnew/pcb_io/altium/altium_pcb.cpp           |  1 +
 pcbnew/pcb_io/altium/altium_pcb.h             |  1 +
 pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.h |  3 +-
 pcbnew/pcb_io/ipc2581/pcb_io_ipc2581.cpp      |  3 ++
 pcbnew/pcb_io/odbpp/odb_component.cpp         |  1 +
 pcbnew/pcb_io/odbpp/odb_eda_data.cpp          |  2 ++
 pcbnew/pcb_io/odbpp/odb_entity.cpp            |  1 +
 pcbnew/pcb_io/odbpp/odb_feature.cpp           |  2 ++
 pcbnew/pcb_io/odbpp/odb_feature.h             |  5 +--
 pcbnew/pcb_io/odbpp/pcb_io_odbpp.cpp          |  2 ++
 pcbnew/pcb_io/odbpp/pcb_io_odbpp.h            |  4 ++-
 pcbnew/pcb_io/pcb_io_mgr.cpp                  |  1 +
 pcbnew/pcb_reference_image.cpp                |  1 +
 pcbnew/pcbexpr_functions.cpp                  |  4 +++
 pcbnew/pcbnew.cpp                             |  1 +
 pcbnew/pcbnew_jobs_handler.cpp                |  1 +
 pcbnew/python/swig/pcbnew.i                   |  3 +-
 pcbnew/ratsnest/ratsnest.cpp                  |  2 +-
 pcbnew/ratsnest/ratsnest_data.cpp             |  2 +-
 pcbnew/router/pns_meander_placer.cpp          |  2 ++
 pcbnew/teardrop/teardrop.h                    |  8 ++---
 pcbnew/tools/align_distribute_tool.cpp        |  1 +
 pcbnew/tools/array_tool.cpp                   |  1 +
 pcbnew/tools/board_inspection_tool.cpp        |  4 ++-
 pcbnew/tools/board_reannotate_tool.cpp        |  7 ++--
 pcbnew/tools/drawing_tool.cpp                 |  1 +
 pcbnew/tools/drc_tool.cpp                     |  1 +
 pcbnew/tools/edit_tool.cpp                    |  1 +
 pcbnew/tools/edit_tool_move_fct.cpp           |  1 +
 pcbnew/tools/multichannel_tool.cpp            |  5 +--
 pcbnew/tools/multichannel_tool.h              |  4 +--
 pcbnew/tools/pcb_grid_helper.cpp              | 30 +++++++++++++++++
 pcbnew/tools/pcb_grid_helper.h                | 31 +++--------------
 pcbnew/tools/pcb_selection_tool.cpp           |  3 +-
 pcbnew/tools/pcb_viewer_tools.cpp             |  2 ++
 pcbnew/tracks_cleaner.cpp                     |  1 +
 pcbnew/widgets/search_handlers.cpp            | 21 +++++++++++-
 pcbnew/widgets/search_handlers.h              | 16 +--------
 pcbnew/zone_manager/dialog_zone_manager.h     |  1 -
 103 files changed, 320 insertions(+), 174 deletions(-)

diff --git a/3d-viewer/3d_canvas/board_adapter.cpp b/3d-viewer/3d_canvas/board_adapter.cpp
index e19528bd1c..15dc14171a 100644
--- a/3d-viewer/3d_canvas/board_adapter.cpp
+++ b/3d-viewer/3d_canvas/board_adapter.cpp
@@ -34,6 +34,7 @@
 #include <3d_rendering/raytracing/shapes2D/polygon_2d.h>
 #include <board.h>
 #include <dialogs/dialog_color_picker.h>
+#include <footprint.h>
 #include <layer_range.h>
 #include <3d_math.h>
 #include "3d_fastmath.h"
diff --git a/3d-viewer/3d_canvas/board_adapter.h b/3d-viewer/3d_canvas/board_adapter.h
index daca2e6a3b..675967f305 100644
--- a/3d-viewer/3d_canvas/board_adapter.h
+++ b/3d-viewer/3d_canvas/board_adapter.h
@@ -38,22 +38,22 @@
 #include "../3d_viewer/eda_3d_viewer_settings.h"
 
 #include <layer_ids.h>
-#include <pad.h>
 #include <pcb_base_frame.h>
 #include <pcb_text.h>
 #include <pcb_textbox.h>
 #include <pcb_table.h>
 #include <pcb_shape.h>
 #include <pcb_dimension.h>
-#include <zone.h>
-#include <footprint.h>
 #include <reporter.h>
 #include <dialogs/dialog_color_picker.h>
 
 class COLOR_SETTINGS;
+class FOOTPRINT;
+class PAD;
 class PCB_BARCODE;
 class PCB_TEXTBOX;
 class PCB_TRACK;
+class ZONE;
 
 /// A type that stores a container of 2d objects for each layer id
 typedef std::map<PCB_LAYER_ID, BVH_CONTAINER_2D*> MAP_CONTAINER_2D_BASE;
diff --git a/3d-viewer/3d_canvas/create_layer_items.cpp b/3d-viewer/3d_canvas/create_layer_items.cpp
index 966e02eb3c..feb26e0371 100644
--- a/3d-viewer/3d_canvas/create_layer_items.cpp
+++ b/3d-viewer/3d_canvas/create_layer_items.cpp
@@ -35,13 +35,16 @@
 #include "raytracing/shapes2D/triangle_2d.h"
 #include <board_design_settings.h>
 #include <board.h>
+#include <footprint.h>
 #include <layer_range.h>
 #include <lset.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <trigo.h>
+#include <pad.h>
 #include <pcb_barcode.h>
 #include <pcb_shape.h>
 #include <pcb_track.h>
+#include <zone.h>
 
 #ifdef PRINT_STATISTICS_3D_VIEWER
 #include <core/profile.h>
diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
index 72b2f45758..63a7fc3c03 100644
--- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp
+++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
@@ -28,6 +28,8 @@
 
 #include <wx/tokenzr.h>
 
+#include <fmt/format.h>
+
 #include "../common_ogl/ogl_utils.h"
 #include "eda_3d_canvas.h"
 #include <eda_3d_viewer_frame.h>
@@ -38,6 +40,7 @@
 #include <build_version.h>
 #include <settings/color_settings.h>
 #include <board.h>
+#include <footprint.h>
 #include <pad.h>
 #include <pcb_field.h>
 #include <pcb_track.h>
@@ -54,9 +57,8 @@
 #include <string_utils.h>
 #include <mail_type.h>
 #include <kiway_mail.h>
-#include <fmt/format.h>
-
 #include <widgets/wx_busy_indicator.h>
+#include <zone.h>
 
 
 /**
diff --git a/3d-viewer/3d_rendering/opengl/render_3d_opengl.h b/3d-viewer/3d_rendering/opengl/render_3d_opengl.h
index 34c5a7053b..ca6a3d97aa 100644
--- a/3d-viewer/3d_rendering/opengl/render_3d_opengl.h
+++ b/3d-viewer/3d_rendering/opengl/render_3d_opengl.h
@@ -43,6 +43,7 @@
 #include "3d_cache/3d_info.h"
 
 #include <geometry/eda_angle.h>
+#include <pad.h> // For PAD_DRILL_POST_MACHINING_MODE
 
 #include <map>
 
diff --git a/3d-viewer/3d_rendering/raytracing/create_scene.cpp b/3d-viewer/3d_rendering/raytracing/create_scene.cpp
index 53899c59fd..1e06383c11 100644
--- a/3d-viewer/3d_rendering/raytracing/create_scene.cpp
+++ b/3d-viewer/3d_rendering/raytracing/create_scene.cpp
@@ -44,6 +44,7 @@
 #include <footprint_library_adapter.h>
 #include <eda_3d_viewer_frame.h>
 #include <project_pcb.h>
+#include <pad.h>
 #include <pcb_track.h>
 
 #include <base_units.h>
diff --git a/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_gl.cpp b/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_gl.cpp
index b92d3dc9a9..e442a02942 100644
--- a/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_gl.cpp
+++ b/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_gl.cpp
@@ -30,10 +30,13 @@
 #include <chrono>
 #include <thread>
 
+#include <wx/log.h>
+
 #include "render_3d_raytrace_gl.h"
 #include "../common_ogl/ogl_utils.h"
+
 #include <core/profile.h>        // To use GetRunningMicroSecs or another profiling utility
-#include <wx/log.h>
+#include <eda_3d_canvas.h>
 
 
 RENDER_3D_RAYTRACE_GL::RENDER_3D_RAYTRACE_GL( EDA_3D_CANVAS* aCanvas, BOARD_ADAPTER& aAdapter,
diff --git a/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_gl.h b/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_gl.h
index 9e619bb9c2..b7c357232d 100644
--- a/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_gl.h
+++ b/3d-viewer/3d_rendering/raytracing/render_3d_raytrace_gl.h
@@ -30,6 +30,11 @@
 
 #include <kicad_gl/kiglad.h>
 
+class EDA_3D_CANVAS;
+class BOARD_ADAPTER;
+class REPORTER;
+
+
 class RENDER_3D_RAYTRACE_GL : public RENDER_3D_RAYTRACE_BASE
 {
 public:
diff --git a/3d-viewer/dialogs/panel_preview_3d_model.cpp b/3d-viewer/dialogs/panel_preview_3d_model.cpp
index fd54418f5b..b924949076 100644
--- a/3d-viewer/dialogs/panel_preview_3d_model.cpp
+++ b/3d-viewer/dialogs/panel_preview_3d_model.cpp
@@ -39,6 +39,7 @@
 #include <board.h>
 #include <common_ogl/ogl_attr_list.h>
 #include <dpi_scaling_common.h>
+#include <footprint.h>
 #include <lset.h>
 #include <pgm_base.h>
 #include <project_pcb.h>
diff --git a/pcbnew/array_pad_number_provider.h b/pcbnew/array_pad_number_provider.h
index 00269250d2..6b68784118 100644
--- a/pcbnew/array_pad_number_provider.h
+++ b/pcbnew/array_pad_number_provider.h
@@ -24,10 +24,9 @@
 #ifndef PCBNEW_ARRAY_PAD_NAME_PROVIDER__H
 #define PCBNEW_ARRAY_PAD_NAME_PROVIDER__H
 
+#include <set>
 
 #include <array_options.h>
-#include <footprint.h>
-#include <board_commit.h>
 
 /**
  * Simple class that sequentially provides numbers from an #ARRAY_OPTIONS object, making sure
diff --git a/pcbnew/autorouter/ar_autoplacer.h b/pcbnew/autorouter/ar_autoplacer.h
index d2a39add07..2ec220837b 100644
--- a/pcbnew/autorouter/ar_autoplacer.h
+++ b/pcbnew/autorouter/ar_autoplacer.h
@@ -31,8 +31,6 @@
 
 #include "ar_matrix.h"
 
-#include <board.h>
-#include <footprint.h>
 #include <lset.h>
 
 #include <connectivity/connectivity_data.h>
diff --git a/pcbnew/autorouter/autoplace_tool.cpp b/pcbnew/autorouter/autoplace_tool.cpp
index 7550004105..e17e8f8125 100644
--- a/pcbnew/autorouter/autoplace_tool.cpp
+++ b/pcbnew/autorouter/autoplace_tool.cpp
@@ -23,6 +23,7 @@
 
 
 #include <board_commit.h>
+#include <footprint.h>
 #include <tools/pcb_selection.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
diff --git a/pcbnew/autorouter/spread_footprints.cpp b/pcbnew/autorouter/spread_footprints.cpp
index c37f2cac6e..afa19219b5 100644
--- a/pcbnew/autorouter/spread_footprints.cpp
+++ b/pcbnew/autorouter/spread_footprints.cpp
@@ -34,9 +34,12 @@
  * their selection.
  */
 
-#include <spread_footprints.h>
+#include "spread_footprints.h"
+
 #include <optional>
 #include <algorithm>
+
+#include <footprint.h>
 #include <refdes_utils.h>
 #include <string_utils.h>
 #include <confirm.h>
diff --git a/pcbnew/autorouter/spread_footprints.h b/pcbnew/autorouter/spread_footprints.h
index a08ab7de26..15093a9486 100644
--- a/pcbnew/autorouter/spread_footprints.h
+++ b/pcbnew/autorouter/spread_footprints.h
@@ -27,10 +27,11 @@
 
 #include <vector>
 
-#include <footprint.h>
 #include <base_units.h>
 #include <math/vector2d.h>
-#include <board.h>
+
+class FOOTPRINT;
+
 
 /**
  * Footprints (after loaded by reading a netlist for instance) are moved
diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index 2f9e12851f..1fbc94de13 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -45,6 +45,7 @@
 #include <font/outline_font.h>
 #include <length_delay_calculation/length_delay_calculation.h>
 #include <lset.h>
+#include <pad.h>
 #include <pcb_base_frame.h>
 #include <pcb_track.h>
 #include <pcb_marker.h>
diff --git a/pcbnew/board_commit.cpp b/pcbnew/board_commit.cpp
index df4c991a17..76c8849399 100644
--- a/pcbnew/board_commit.cpp
+++ b/pcbnew/board_commit.cpp
@@ -30,6 +30,7 @@
 #include <component_classes/component_class_manager.h>
 #include <footprint.h>
 #include <lset.h>
+#include <pad.h>
 #include <pcb_group.h>
 #include <pcb_track.h>
 #include <pcb_shape.h>
diff --git a/pcbnew/component_classes/component_class_cache_proxy.h b/pcbnew/component_classes/component_class_cache_proxy.h
index 38e40dc131..2e8b5bab4c 100644
--- a/pcbnew/component_classes/component_class_cache_proxy.h
+++ b/pcbnew/component_classes/component_class_cache_proxy.h
@@ -23,7 +23,8 @@
 
 #include <component_classes/component_class.h>
 #include <component_classes/component_class_manager.h>
-#include <footprint.h>
+
+class FOOTPRINT;
 
 /*
  * A class which acts as a cache-aware proxy for a FOOTPRINT's component class.
diff --git a/pcbnew/connectivity/connectivity_algo.cpp b/pcbnew/connectivity/connectivity_algo.cpp
index 3366d4d46b..2ca70efa67 100644
--- a/pcbnew/connectivity/connectivity_algo.cpp
+++ b/pcbnew/connectivity/connectivity_algo.cpp
@@ -33,8 +33,11 @@
 #include <connectivity/connectivity_algo.h>
 #include <progress_reporter.h>
 #include <geometry/geometry_utils.h>
+#include <board.h>
 #include <board_commit.h>
 #include <thread_pool.h>
+#include <footprint.h>
+#include <pad.h>
 #include <pcb_shape.h>
 #include <pcb_track.h>
 
diff --git a/pcbnew/connectivity/connectivity_algo.h b/pcbnew/connectivity/connectivity_algo.h
index 63f463a66b..c533dca08b 100644
--- a/pcbnew/connectivity/connectivity_algo.h
+++ b/pcbnew/connectivity/connectivity_algo.h
@@ -30,18 +30,14 @@
 #ifndef __CONNECTIVITY_ALGO_H
 #define __CONNECTIVITY_ALGO_H
 
-#include <board.h>
-#include <pad.h>
-#include <footprint.h>
-#include <zone.h>
-
 #include <geometry/shape_poly_set.h>
 
-#include <memory>
 #include <algorithm>
-#include <functional>
-#include <vector>
 #include <deque>
+#include <functional>
+#include <list>
+#include <memory>
+#include <vector>
 
 #include <connectivity/connectivity_rtree.h>
 #include <connectivity/connectivity_data.h>
@@ -51,6 +47,7 @@ class CN_RATSNEST_NODES;
 class BOARD;
 class BOARD_CONNECTED_ITEM;
 class BOARD_ITEM;
+class FOOTPRINT;
 class ZONE;
 class PROGRESS_REPORTER;
 
diff --git a/pcbnew/connectivity/connectivity_data.cpp b/pcbnew/connectivity/connectivity_data.cpp
index 605f95f44d..38d049362f 100644
--- a/pcbnew/connectivity/connectivity_data.cpp
+++ b/pcbnew/connectivity/connectivity_data.cpp
@@ -40,6 +40,8 @@
 #include <board_design_settings.h>
 #include <geometry/shape_segment.h>
 #include <geometry/shape_circle.h>
+#include <footprint.h>
+#include <pad.h>
 #include <pcb_track.h>
 #include <ratsnest/ratsnest_data.h>
 #include <progress_reporter.h>
diff --git a/pcbnew/connectivity/from_to_cache.cpp b/pcbnew/connectivity/from_to_cache.cpp
index 3bb4118461..6abe6e3ed6 100644
--- a/pcbnew/connectivity/from_to_cache.cpp
+++ b/pcbnew/connectivity/from_to_cache.cpp
@@ -19,8 +19,11 @@
 
 #include <cstdio>
 #include <memory>
+
 #include <reporter.h>
 #include <board.h>
+#include <footprint.h>
+#include <pad.h>
 #include <string_utils.h>
 
 #include <pcbexpr_evaluator.h>
@@ -30,6 +33,7 @@
 
 #include <connectivity/from_to_cache.h>
 
+
 void FROM_TO_CACHE::buildEndpointList( )
 {
     m_ftEndpoints.clear();
diff --git a/pcbnew/dialogs/dialog_board_reannotate.cpp b/pcbnew/dialogs/dialog_board_reannotate.cpp
index 232c2c7c5d..3450d0f2b4 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.cpp
+++ b/pcbnew/dialogs/dialog_board_reannotate.cpp
@@ -26,11 +26,16 @@
 #include "dialog_board_reannotate.h"
 
 #include <algorithm>
+
+#include <wx/tokenzr.h>
+#include <wx/valtext.h>
+
 #include <base_units.h>
 #include <bitmaps.h>
 #include <board_commit.h>
 #include <confirm.h>
 #include <ctype.h>
+#include <footprint.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <string_utils.h>  // StrNumCmp
 #include <kiface_base.h>
@@ -39,8 +44,6 @@
 #include <richio.h>
 #include <tool/grid_menu.h>
 #include <widgets/wx_html_report_panel.h>
-#include <wx/tokenzr.h>
-#include <wx/valtext.h>
 
 
 bool g_SortYFirst;
diff --git a/pcbnew/dialogs/dialog_board_reannotate.h b/pcbnew/dialogs/dialog_board_reannotate.h
index 864cb25a62..5b8aaa8aa0 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.h
+++ b/pcbnew/dialogs/dialog_board_reannotate.h
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include <board.h>
-#include <footprint.h>
 #include <dialogs/dialog_board_reannotate_base.h>
 #include <layer_ids.h>
 #include <netlist_reader/pcb_netlist.h>
@@ -181,4 +179,3 @@ private:
     std::vector<REFDES_PREFIX_INFO> m_refDesPrefixInfos;
     std::vector<wxString>           m_excludeArray;
 };
-
diff --git a/pcbnew/dialogs/dialog_board_statistics.cpp b/pcbnew/dialogs/dialog_board_statistics.cpp
index cb4c6ce5d7..659663da33 100644
--- a/pcbnew/dialogs/dialog_board_statistics.cpp
+++ b/pcbnew/dialogs/dialog_board_statistics.cpp
@@ -26,19 +26,26 @@
 #include "dialog_board_statistics.h"
 #include <board_statistics.h>
 
+#include <algorithm>
+
 #include <wx/filedlg.h>
 
+#include <board.h>
 #include <kiplatform/ui.h>
 #include <confirm.h>
 #include <pad.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <string_utils.h>
 #include <wildcards_and_files_ext.h>
+#include <widgets/ui_common.h>
 #include <widgets/wx_grid.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <algorithm>
 
 
+
+
 #define COL_LABEL 0
 #define COL_AMOUNT 1
 
diff --git a/pcbnew/dialogs/dialog_board_statistics.h b/pcbnew/dialogs/dialog_board_statistics.h
index 9176a8d645..57673dfa45 100644
--- a/pcbnew/dialogs/dialog_board_statistics.h
+++ b/pcbnew/dialogs/dialog_board_statistics.h
@@ -26,16 +26,11 @@
 #ifndef _DIALOG_BOARD_STATISTICS_H
 #define _DIALOG_BOARD_STATISTICS_H
 
-
-#include <board.h>
-#include <footprint.h>
 #include <dialog_board_statistics_base.h>
-#include <board_statistics.h>
 #include <board_statistics_report.h>
-#include <pcb_base_frame.h>
-#include <pcb_edit_frame.h>
-#include <project.h>
-#include <wx/datetime.h>
+
+
+class PCB_EDIT_FRAME;
 
 /**
  * Dialog to show common board info.
diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp
index 9dd09591c8..07dc674991 100644
--- a/pcbnew/dialogs/dialog_footprint_properties.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties.cpp
@@ -35,6 +35,7 @@
 #include <filename_resolver.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
+#include <pcb_fields_grid_table.h>
 #include <pgm_base.h>
 #include <project_pcb.h>
 #include <kiplatform/ui.h>
diff --git a/pcbnew/dialogs/dialog_footprint_properties.h b/pcbnew/dialogs/dialog_footprint_properties.h
index 9fb469ecf1..9fbded24a8 100644
--- a/pcbnew/dialogs/dialog_footprint_properties.h
+++ b/pcbnew/dialogs/dialog_footprint_properties.h
@@ -22,15 +22,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
 #ifndef DIALOG_FOOTPRINT_PROPERTIES_H
 #define DIALOG_FOOTPRINT_PROPERTIES_H
 
-
 #include <dialog_footprint_properties_base.h>
+
 #include <wx/valnum.h>
-#include <pcb_fields_grid_table.h>
-#include <footprint.h>
+
 #include <widgets/unit_binder.h>
 #include <widgets/margin_offset_binder.h>
 
@@ -38,6 +36,7 @@
 class PCB_EDIT_FRAME;
 class PANEL_FP_PROPERTIES_3D_MODEL;
 class PANEL_EMBEDDED_FILES;
+class PCB_FIELDS_GRID_TABLE;
 
 class DIALOG_FOOTPRINT_PROPERTIES: public DIALOG_FOOTPRINT_PROPERTIES_BASE
 {
diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
index 03c94186dc..5c38694133 100644
--- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
@@ -59,6 +59,7 @@
 #include <widgets/std_bitmap_button.h>
 #include <widgets/text_ctrl_eval.h>
 #include <widgets/wx_grid.h>
+#include <zone.h>
 
 #include <footprint_library_adapter.h>
 #include <project_pcb.h>
diff --git a/pcbnew/dialogs/dialog_fp_edit_pad_table.h b/pcbnew/dialogs/dialog_fp_edit_pad_table.h
index ae731f564f..24da765daf 100644
--- a/pcbnew/dialogs/dialog_fp_edit_pad_table.h
+++ b/pcbnew/dialogs/dialog_fp_edit_pad_table.h
@@ -88,4 +88,3 @@ private:
     std::unique_ptr<UNITS_PROVIDER>   m_unitsProvider;
     bool                              m_summaryDirty;
 };
-
diff --git a/pcbnew/dialogs/dialog_global_edit_teardrops.cpp b/pcbnew/dialogs/dialog_global_edit_teardrops.cpp
index 5ccdc6dff2..576a7eccd5 100644
--- a/pcbnew/dialogs/dialog_global_edit_teardrops.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_teardrops.cpp
@@ -28,6 +28,7 @@
 #include <board.h>
 #include <board_design_settings.h>
 #include <project/net_settings.h>
+#include <pad.h>
 #include <pcb_track.h>
 #include <pcb_group.h>
 #include <footprint.h>
@@ -505,4 +506,3 @@ int GLOBAL_EDIT_TOOL::EditTeardrops( const TOOL_EVENT& aEvent )
     dlg.ShowQuasiModal();       // QuasiModal required for NET_SELECTOR
     return 0;
 }
-
diff --git a/pcbnew/dialogs/dialog_multichannel_repeat_layout.cpp b/pcbnew/dialogs/dialog_multichannel_repeat_layout.cpp
index b2851575ee..8c603106a3 100644
--- a/pcbnew/dialogs/dialog_multichannel_repeat_layout.cpp
+++ b/pcbnew/dialogs/dialog_multichannel_repeat_layout.cpp
@@ -31,6 +31,7 @@
 #include <widgets/grid_icon_text_helpers.h>
 #include <zone.h>
 #include <board.h>
+#include <footprint.h>
 
 
 DIALOG_MULTICHANNEL_REPEAT_LAYOUT::DIALOG_MULTICHANNEL_REPEAT_LAYOUT( PCB_BASE_FRAME* aFrame,
diff --git a/pcbnew/dialogs/dialog_pad_properties.h b/pcbnew/dialogs/dialog_pad_properties.h
index b64328a292..9fb5971651 100644
--- a/pcbnew/dialogs/dialog_pad_properties.h
+++ b/pcbnew/dialogs/dialog_pad_properties.h
@@ -28,9 +28,10 @@
 #define _DIALOG_PAD_PROPERTIES_H_
 
 #include <pcb_base_frame.h>
+
 #include <wx/valnum.h>
+
 #include <board.h>
-#include <footprint.h>
 #include <padstack.h>
 #include <pcb_shape.h>
 #include <origin_viewitem.h>
@@ -40,6 +41,8 @@
 #include <widgets/unit_binder.h>
 #include <widgets/margin_offset_binder.h>
 
+class PAD;
+
 /**
  * DIALOG_PAD_PROPERTIES, derived from DIALOG_PAD_PROPERTIES_BASE,
  * created by wxFormBuilder
diff --git a/pcbnew/drc/drc_cache_generator.cpp b/pcbnew/drc/drc_cache_generator.cpp
index 645dcbb571..86fb84b9e9 100644
--- a/pcbnew/drc/drc_cache_generator.cpp
+++ b/pcbnew/drc/drc_cache_generator.cpp
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <board_design_settings.h>
+#include <pad.h>
 #include <pcb_board_outline.h>
 #include <footprint.h>
 #include <thread_pool.h>
@@ -306,4 +307,3 @@ bool DRC_CACHE_GENERATOR::Run()
 
     return !m_drcEngine->IsCancelled();
 }
-
diff --git a/pcbnew/drc/drc_rtree.h b/pcbnew/drc/drc_rtree.h
index 0efbde2fa6..364a19d41a 100644
--- a/pcbnew/drc/drc_rtree.h
+++ b/pcbnew/drc/drc_rtree.h
@@ -26,7 +26,6 @@
 #define DRC_RTREE_H_
 
 #include <board_item.h>
-#include <pad.h>
 #include <pcb_field.h>
 #include <memory>
 #include <unordered_set>
diff --git a/pcbnew/drc/drc_test_provider_edge_clearance.cpp b/pcbnew/drc/drc_test_provider_edge_clearance.cpp
index 9b9bde64e8..ef05aae5a8 100644
--- a/pcbnew/drc/drc_test_provider_edge_clearance.cpp
+++ b/pcbnew/drc/drc_test_provider_edge_clearance.cpp
@@ -26,6 +26,7 @@
 #include <pcb_board_outline.h>
 #include <board_design_settings.h>
 #include <footprint.h>
+#include <pad.h>
 #include <pcb_track.h>
 #include <geometry/seg.h>
 #include <geometry/shape_segment.h>
@@ -33,7 +34,7 @@
 #include <drc/drc_item.h>
 #include <drc/drc_rule.h>
 #include <drc/drc_test_provider.h>
-#include "drc_rtree.h"
+#include <drc/drc_rtree.h>
 
 /*
     Board edge clearance test. Checks all items for their mechanical clearances against the board
diff --git a/pcbnew/drc/drc_test_provider_schematic_parity.cpp b/pcbnew/drc/drc_test_provider_schematic_parity.cpp
index cfa4e91225..2804b16b4e 100644
--- a/pcbnew/drc/drc_test_provider_schematic_parity.cpp
+++ b/pcbnew/drc/drc_test_provider_schematic_parity.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <board.h>
+#include <footprint.h>
 #include <pad.h>
 #include <drc/drc_engine.h>
 #include <drc/drc_item.h>
diff --git a/pcbnew/exporters/place_file_exporter.cpp b/pcbnew/exporters/place_file_exporter.cpp
index 7c2201fa6b..bfe9185dc7 100644
--- a/pcbnew/exporters/place_file_exporter.cpp
+++ b/pcbnew/exporters/place_file_exporter.cpp
@@ -32,6 +32,7 @@
 #include <board_design_settings.h>
 #include <build_version.h>
 #include <exporters/place_file_exporter.h>
+#include <footprint.h>
 #include <pad.h>
 
 #include <fmt/format.h>
diff --git a/pcbnew/exporters/place_file_exporter.h b/pcbnew/exporters/place_file_exporter.h
index 9839e0448d..d68f0304e5 100644
--- a/pcbnew/exporters/place_file_exporter.h
+++ b/pcbnew/exporters/place_file_exporter.h
@@ -26,7 +26,6 @@
 
 
 #include <board.h>
-#include <footprint.h>
 
 /**
  * The ASCII format of the kicad place file is:
diff --git a/pcbnew/footprint.cpp b/pcbnew/footprint.cpp
index a1ede8e31d..97da73a901 100644
--- a/pcbnew/footprint.cpp
+++ b/pcbnew/footprint.cpp
@@ -23,6 +23,9 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
+
+#include "footprint.h"
+
 #include <magic_enum.hpp>
 
 #include <algorithm>
@@ -46,7 +49,6 @@
 #include <embedded_files.h>
 #include <font/font.h>
 #include <font/outline_font.h>
-#include <footprint.h>
 #include <geometry/convex_hull.h>
 #include <geometry/shape_segment.h>
 #include <geometry/shape_simple.h>
diff --git a/pcbnew/footprint_chooser_frame.cpp b/pcbnew/footprint_chooser_frame.cpp
index 0f87c2c40d..344d8daccf 100644
--- a/pcbnew/footprint_chooser_frame.cpp
+++ b/pcbnew/footprint_chooser_frame.cpp
@@ -22,14 +22,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/splitter.h>
+
 #include <pgm_base.h>
 #include <kiface_base.h>
 #include <kiway.h>
 #include <kiway_mail.h>
 #include <board.h>
-#include <wx/button.h>
-#include <wx/checkbox.h>
-#include <wx/splitter.h>
+#include <footprint.h>
 #include <kiplatform/ui.h>
 #include <lset.h>
 #include <widgets/panel_footprint_chooser.h>
@@ -889,5 +891,3 @@ void FOOTPRINT_CHOOSER_FRAME::setupUIConditions()
 #undef CHECK
     // clang-format on
 }
-
-
diff --git a/pcbnew/footprint_chooser_frame.h b/pcbnew/footprint_chooser_frame.h
index 1b6f8e7741..973f1a6e42 100644
--- a/pcbnew/footprint_chooser_frame.h
+++ b/pcbnew/footprint_chooser_frame.h
@@ -34,6 +34,7 @@
 #include <3d_canvas/board_adapter.h>
 #include <3d_rendering/track_ball.h>
 
+class EDA_3D_CANVAS;
 class PANEL_FOOTPRINT_CHOOSER;
 class wxCheckBox;
 class BITMAP_BUTTON;
diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp
index 3946bd8943..07a7415720 100644
--- a/pcbnew/footprint_viewer_frame.cpp
+++ b/pcbnew/footprint_viewer_frame.cpp
@@ -43,6 +43,7 @@
 #include <widgets/wx_listbox.h>
 #include <widgets/wx_aui_utils.h>
 #include <gal/graphics_abstraction_layer.h>
+#include <pad.h>
 #include <pcb_draw_panel_gal.h>
 #include <pcb_painter.h>
 #include <pcbnew_id.h>
@@ -1086,4 +1087,3 @@ BOARD_ITEM_CONTAINER* FOOTPRINT_VIEWER_FRAME::GetModel() const
 {
     return GetBoard()->GetFirstFootprint();
 }
-
diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index 06dac301e7..0d940cfb8e 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -24,6 +24,16 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include "footprint_wizard_frame.h"
+
+#include <wx/listbox.h>
+#include <wx/numformatter.h>
+#include <wx/statline.h>
+#include <wx/tokenzr.h>
+#include <wx/wupdlock.h>
+
+#include <json_common.h>
+
 #include <kiface_base.h>
 #include <pcb_draw_panel_gal.h>
 #include <pcb_edit_frame.h>
@@ -34,17 +44,12 @@
 #include <grid_tricks.h>
 #include <board.h>
 #include <project/net_settings.h>
+#include <footprint.h>
 #include <footprint_edit_frame.h>
 #include <footprint_editor_settings.h>
 #include <pcbnew_id.h>
 #include <widgets/aui_json_serializer.h>
-#include <wx/listbox.h>
-#include <wx/statline.h>
 
-#include <nlohmann/json.hpp>
-#include <wx/tokenzr.h>
-#include <wx/numformatter.h>
-#include <wx/wupdlock.h>
 #include <pgm_base.h>
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>
@@ -59,7 +64,6 @@
 #include <tools/footprint_wizard_tools.h>
 #include <toolbars_footprint_wizard.h>
 #include <python/scripting/pcb_scripting_tool.h>
-#include "footprint_wizard_frame.h"
 
 
 BEGIN_EVENT_TABLE( FOOTPRINT_WIZARD_FRAME, PCB_BASE_EDIT_FRAME )
diff --git a/pcbnew/kicad_clipboard.cpp b/pcbnew/kicad_clipboard.cpp
index 26c65cffb7..150362800a 100644
--- a/pcbnew/kicad_clipboard.cpp
+++ b/pcbnew/kicad_clipboard.cpp
@@ -28,6 +28,7 @@
 #include <board.h>
 #include <build_version.h>
 #include <core/ignore.h>
+#include <footprint.h>
 #include <font/fontconfig.h>
 #include <pad.h>
 #include <pcb_group.h>
diff --git a/pcbnew/kicad_clipboard.h b/pcbnew/kicad_clipboard.h
index 47f6583897..6bb9ff2def 100644
--- a/pcbnew/kicad_clipboard.h
+++ b/pcbnew/kicad_clipboard.h
@@ -31,7 +31,6 @@
 #define KICAD_CLIPBOARD_H
 
 #include <board_item.h>
-#include <footprint.h>
 #include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.h>
 #include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.h>
 #include <memory.h>
diff --git a/pcbnew/length_delay_calculation/length_delay_calculation.cpp b/pcbnew/length_delay_calculation/length_delay_calculation.cpp
index 6f147bdddb..87b2b1ab56 100644
--- a/pcbnew/length_delay_calculation/length_delay_calculation.cpp
+++ b/pcbnew/length_delay_calculation/length_delay_calculation.cpp
@@ -28,6 +28,7 @@
 #include <board.h>
 #include <board_design_settings.h>
 #include <geometry/geometry_utils.h>
+#include <pad.h>
 #include <pcb_track.h>
 
 
diff --git a/pcbnew/length_delay_calculation/length_delay_calculation_item.cpp b/pcbnew/length_delay_calculation/length_delay_calculation_item.cpp
index efcb318411..01d87b2606 100644
--- a/pcbnew/length_delay_calculation/length_delay_calculation_item.cpp
+++ b/pcbnew/length_delay_calculation/length_delay_calculation_item.cpp
@@ -25,6 +25,7 @@
 #include <length_delay_calculation/length_delay_calculation_item.h>
 
 #include <board.h>
+#include <pad.h>
 #include <pcb_track.h>
 
 
diff --git a/pcbnew/length_delay_calculation/length_delay_calculation_item.h b/pcbnew/length_delay_calculation/length_delay_calculation_item.h
index de46670803..c7cbda40c0 100644
--- a/pcbnew/length_delay_calculation/length_delay_calculation_item.h
+++ b/pcbnew/length_delay_calculation/length_delay_calculation_item.h
@@ -26,9 +26,13 @@
 
 #include <geometry/shape_line_chain.h>
 #include <layer_ids.h>
-#include <pad.h>
 #include <pcb_track_types.h>
 
+class BOARD;
+class PAD;
+class NETCLASS;
+
+
 /**
  * Lightweight class which holds a pad, via, or a routed trace outline.  Proxied objects passed by pointer are not
  * owned by this container.
diff --git a/pcbnew/length_delay_calculation/tuning_profile_parameters_iface.h b/pcbnew/length_delay_calculation/tuning_profile_parameters_iface.h
index 0ccf723f9d..e923af96ff 100644
--- a/pcbnew/length_delay_calculation/tuning_profile_parameters_iface.h
+++ b/pcbnew/length_delay_calculation/tuning_profile_parameters_iface.h
@@ -27,6 +27,7 @@
 #include <length_delay_calculation/length_delay_calculation_item.h>
 #include <netclass.h>
 
+class BOARD;
 class LENGTH_DELAY_CALCULATION;
 
 /**
diff --git a/pcbnew/length_delay_calculation/tuning_profile_parameters_user_defined.cpp b/pcbnew/length_delay_calculation/tuning_profile_parameters_user_defined.cpp
index 527efa874c..cb1f14218a 100644
--- a/pcbnew/length_delay_calculation/tuning_profile_parameters_user_defined.cpp
+++ b/pcbnew/length_delay_calculation/tuning_profile_parameters_user_defined.cpp
@@ -25,6 +25,7 @@
 
 #include <board.h>
 #include <length_delay_calculation/length_delay_calculation.h>
+#include <pad.h>
 #include <pcb_track.h>
 #include <project/project_file.h>
 
diff --git a/pcbnew/netlist_reader/kicad_netlist_reader.cpp b/pcbnew/netlist_reader/kicad_netlist_reader.cpp
index 95ee4b17f9..702db7ee95 100644
--- a/pcbnew/netlist_reader/kicad_netlist_reader.cpp
+++ b/pcbnew/netlist_reader/kicad_netlist_reader.cpp
@@ -22,6 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <wx/log.h>
+
 #include <netlist_lexer.h>  // netlist_lexer is common to Eeschema and Pcbnew
 #include <string_utils.h>
 #include <json_common.h>
diff --git a/pcbnew/netlist_reader/legacy_netlist_reader.cpp b/pcbnew/netlist_reader/legacy_netlist_reader.cpp
index a01e4fe074..64fd143d15 100644
--- a/pcbnew/netlist_reader/legacy_netlist_reader.cpp
+++ b/pcbnew/netlist_reader/legacy_netlist_reader.cpp
@@ -23,11 +23,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <config.h> // to define strncasecmp for some platforms
 #include <richio.h>
 #include <string_utils.h>
 
 #include "pcb_netlist.h"
-#include "netlist_reader.h"
+#include <netlist_reader/netlist_reader.h>
+
 
 void LEGACY_NETLIST_READER::LoadNetlist()
 {
diff --git a/pcbnew/netlist_reader/netlist.cpp b/pcbnew/netlist_reader/netlist.cpp
index 97d55df586..9d82881680 100644
--- a/pcbnew/netlist_reader/netlist.cpp
+++ b/pcbnew/netlist_reader/netlist.cpp
@@ -39,6 +39,7 @@ using namespace std::placeholders;
 #include <board.h>
 #include <component_classes/component_class_manager.h>
 #include <footprint.h>
+#include <pad.h>
 #include <pcb_track.h>
 #include <spread_footprints.h>
 #include <ratsnest/ratsnest_data.h>
diff --git a/pcbnew/netlist_reader/pcb_component.cpp b/pcbnew/netlist_reader/pcb_component.cpp
index dfd59a9bcc..9730f7735c 100644
--- a/pcbnew/netlist_reader/pcb_component.cpp
+++ b/pcbnew/netlist_reader/pcb_component.cpp
@@ -21,8 +21,28 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include "netlist_reader/pcb_component.h"
+
 #include <footprint.h>
-#include <netlist_reader/pcb_component.h>
+
+
+PCB_COMPONENT::PCB_COMPONENT( const LIB_ID&            aFPID,
+                              const wxString&          aReference,
+                              const wxString&          aValue,
+                              const KIID_PATH&         aPath,
+                              const std::vector<KIID>& aKiids )
+    : COMPONENT( aFPID, aReference, aValue, aPath, aKiids )
+{
+}
+
+
+PCB_COMPONENT::~PCB_COMPONENT() {};
+
+
+FOOTPRINT* PCB_COMPONENT::GetFootprint( bool aRelease )
+{
+    return ( aRelease ) ? m_footprint.release() : m_footprint.get();
+}
 
 
 void PCB_COMPONENT::SetFootprint( FOOTPRINT* aFootprint )
diff --git a/pcbnew/netlist_reader/pcb_component.h b/pcbnew/netlist_reader/pcb_component.h
index 22b5d75188..82b58ec4f4 100644
--- a/pcbnew/netlist_reader/pcb_component.h
+++ b/pcbnew/netlist_reader/pcb_component.h
@@ -21,12 +21,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef PCB_COMPONENT_H
-#define PCB_COMPONENT_H
+#pragma once
+
+#include <memory>
 
 #include <netlist_reader/netlist.h>
-#include <footprint.h>
-#include <memory>
 
 
 /**
@@ -39,17 +38,11 @@ public:
                    const wxString&          aReference,
                    const wxString&          aValue,
                    const KIID_PATH&         aPath,
-                   const std::vector<KIID>& aKiids )
-        : COMPONENT( aFPID, aReference, aValue, aPath, aKiids )
-    {
-    }
+                   const std::vector<KIID>& aKiids );
 
-    virtual ~PCB_COMPONENT() { };
+    virtual ~PCB_COMPONENT();
 
-    FOOTPRINT* GetFootprint( bool aRelease = false )
-    {
-        return ( aRelease ) ? m_footprint.release() : m_footprint.get();
-    }
+    FOOTPRINT* GetFootprint( bool aRelease = false );
 
     void SetFootprint( FOOTPRINT* aFootprint );
 
@@ -60,5 +53,3 @@ private:
 
 
 typedef boost::ptr_vector< PCB_COMPONENT > PCB_COMPONENTS;
-
-#endif  // PCB_COMPONENT_H
diff --git a/pcbnew/netlist_reader/pcb_netlist.cpp b/pcbnew/netlist_reader/pcb_netlist.cpp
index a063e28ead..f0c0fde567 100644
--- a/pcbnew/netlist_reader/pcb_netlist.cpp
+++ b/pcbnew/netlist_reader/pcb_netlist.cpp
@@ -23,14 +23,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
 #include "pcb_netlist.h"
 
+#include <wx/tokenzr.h>
+#include <wx/log.h>
+
 #include <footprint.h>
 #include <richio.h>
 #include <string_utils.h>
-#include <wx/tokenzr.h>
-#include <wx/log.h>
 
 
 int COMPONENT_NET::Format( OUTPUTFORMATTER* aOut, int aNestLevel, int aCtl )
@@ -40,6 +40,33 @@ int COMPONENT_NET::Format( OUTPUTFORMATTER* aOut, int aNestLevel, int aCtl )
                         aOut->Quotew( m_netName ).c_str() );
 }
 
+COMPONENT::COMPONENT( const LIB_ID&            aFPID,
+                      const wxString&          aReference,
+                      const wxString&          aValue,
+                      const KIID_PATH&         aPath,
+                      const std::vector<KIID>& aKiids )
+{
+    m_fpid             = aFPID;
+    m_reference        = aReference;
+    m_value            = aValue;
+    m_pinCount         = 0;
+    m_path             = aPath;
+    m_kiids            = aKiids;
+    m_duplicatePadNumbersAreJumpers = false;
+    m_group            = nullptr;
+}
+
+
+COMPONENT::~COMPONENT()
+{
+}
+
+
+FOOTPRINT* COMPONENT::GetFootprint( bool aRelease )
+{
+    return ( aRelease ) ? m_footprint.release() : m_footprint.get();
+}
+
 
 void COMPONENT::SetFootprint( FOOTPRINT* aFootprint )
 {
diff --git a/pcbnew/netlist_reader/pcb_netlist.h b/pcbnew/netlist_reader/pcb_netlist.h
index e59e14eea5..81789a2a6d 100644
--- a/pcbnew/netlist_reader/pcb_netlist.h
+++ b/pcbnew/netlist_reader/pcb_netlist.h
@@ -31,13 +31,15 @@
 #include <json_common.h>
 #include <unordered_set>
 
+#include <kiid.h>
 #include <lib_id.h>
-#include <footprint.h>
 #include <ctl_flags.h>
 #include <case_insensitive_map.h>
 
 
 class REPORTER;
+class FOOTPRINT;
+class OUTPUTFORMATTER;
 
 
 /**
@@ -123,19 +125,9 @@ public:
                const wxString&          aReference,
                const wxString&          aValue,
                const KIID_PATH&         aPath,
-               const std::vector<KIID>& aKiids )
-    {
-        m_fpid             = aFPID;
-        m_reference        = aReference;
-        m_value            = aValue;
-        m_pinCount         = 0;
-        m_path             = aPath;
-        m_kiids            = aKiids;
-        m_duplicatePadNumbersAreJumpers = false;
-        m_group            = nullptr;
-    }
+               const std::vector<KIID>& aKiids );
 
-    virtual ~COMPONENT() { };
+    virtual ~COMPONENT();
 
     void AddNet( const wxString& aPinName, const wxString& aNetName, const wxString& aPinFunction,
                  const wxString& aPinType )
@@ -193,10 +185,7 @@ public:
     void SetPinCount( int aPinCount ) { m_pinCount = aPinCount; }
     int GetPinCount() const { return m_pinCount; }
 
-    FOOTPRINT* GetFootprint( bool aRelease = false )
-    {
-        return ( aRelease ) ? m_footprint.release() : m_footprint.get();
-    }
+    FOOTPRINT* GetFootprint( bool aRelease = false );
 
     void SetFootprint( FOOTPRINT* aFootprint );
 
diff --git a/pcbnew/pad_utils.cpp b/pcbnew/pad_utils.cpp
index a61ae404e8..b36263a086 100644
--- a/pcbnew/pad_utils.cpp
+++ b/pcbnew/pad_utils.cpp
@@ -23,6 +23,8 @@
 
 #include "pad_utils.h"
 
+#include <pad.h>
+
 
 double PAD_UTILS::GetDefaultIpcRoundingRatio( const PAD& aPad, PCB_LAYER_ID aLayer )
 {
diff --git a/pcbnew/pad_utils.h b/pcbnew/pad_utils.h
index 0606bf7634..b0d830fa79 100644
--- a/pcbnew/pad_utils.h
+++ b/pcbnew/pad_utils.h
@@ -23,7 +23,9 @@
 
 #pragma once
 
-#include <pad.h>
+#include <layer_ids.h>
+
+class PAD;
 
 namespace PAD_UTILS
 {
@@ -42,4 +44,4 @@ bool PadHasMeaningfulRoundingRadius( const PAD& aPad, PCB_LAYER_ID aLayer );
  */
 double GetDefaultIpcRoundingRatio( const PAD& aPad, PCB_LAYER_ID aLayer );
 
-} // namespace PAD_UTILS
\ No newline at end of file
+} // namespace PAD_UTILS
diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp
index 13263df9d9..4e04ff079d 100644
--- a/pcbnew/pcb_base_frame.cpp
+++ b/pcbnew/pcb_base_frame.cpp
@@ -45,6 +45,7 @@
 #include <footprint_library_adapter.h>
 #include <lset.h>
 #include <kiface_base.h>
+#include <pad.h>
 #include <pcb_painter.h>
 #include <pcbnew_id.h>
 #include <pcbnew_settings.h>
@@ -55,6 +56,7 @@
 #include <project_pcb.h>
 #include <trace_helpers.h>
 #include <wildcards_and_files_ext.h>
+#include <zone.h>
 
 #include <math/vector2d.h>
 #include <math/vector2wx.h>
diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index 9c56ba340c..3dd06fb181 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -34,6 +34,7 @@
 
 #include <board.h>
 #include <footprint.h>
+#include <pad.h>
 #include <pcb_track.h>
 #include <macros.h>
 #include <pcb_generator.h>
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index a716bcf16f..e1c5425d75 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -20,6 +20,12 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <algorithm>
+#include <type_traits>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
 #include <wx/log.h>
 #include <wx/filename.h>
 #include <wx/filedlg.h>
@@ -39,13 +45,9 @@
 #include <geometry/geometry_utils.h>
 #include <bitmaps.h>
 #include <confirm.h>
+#include <footprint.h>
 #include <lset.h>
 #include <trace_helpers.h>
-#include <algorithm>
-#include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
 #include <pcbnew_id.h>
 #include <pcbnew_settings.h>
 #include <pcb_layer_box_selector.h>
@@ -57,6 +59,7 @@
 #include <dialogs/dialog_dimension_properties.h>
 #include <dialogs/dialog_table_properties.h>
 #include <gal/graphics_abstraction_layer.h>
+#include <pad.h>
 #include <pcb_target.h>
 #include <pcb_point.h>
 #include <pcb_track.h>
diff --git a/pcbnew/pcb_io/altium/altium_parser_pcb.cpp b/pcbnew/pcb_io/altium/altium_parser_pcb.cpp
index 7f9e8b0eaf..a9c234677a 100644
--- a/pcbnew/pcb_io/altium/altium_parser_pcb.cpp
+++ b/pcbnew/pcb_io/altium/altium_parser_pcb.cpp
@@ -29,6 +29,7 @@
 #include <math/util.h>
 
 #include <wx/log.h>
+#include <wx/translation.h>
 
 #include "altium_parser_pcb.h"
 #include "io/altium/altium_binary_parser.h"
diff --git a/pcbnew/pcb_io/altium/altium_parser_pcb.h b/pcbnew/pcb_io/altium/altium_parser_pcb.h
index 4035444cd9..a42077e2e0 100644
--- a/pcbnew/pcb_io/altium/altium_parser_pcb.h
+++ b/pcbnew/pcb_io/altium/altium_parser_pcb.h
@@ -27,12 +27,18 @@
 
 #include <cstdint>
 #include <cstring>
+#include <limits>
+#include <map>
 #include <memory>
+#include <set>
 #include <vector>
 
-#include <footprint.h>
 #include <wx/gdicmn.h>
 
+#include <math/vector2d.h>
+#include <math/vector3.h>
+
+
 // tthis constant specifies an unconnected net
 const uint16_t ALTIUM_NET_UNCONNECTED = std::numeric_limits<uint16_t>::max();
 
diff --git a/pcbnew/pcb_io/altium/altium_pcb.cpp b/pcbnew/pcb_io/altium/altium_pcb.cpp
index 14e40d5c5d..5e2791f020 100644
--- a/pcbnew/pcb_io/altium/altium_pcb.cpp
+++ b/pcbnew/pcb_io/altium/altium_pcb.cpp
@@ -31,6 +31,7 @@
 #include <board.h>
 #include <board_design_settings.h>
 #include <project/net_settings.h>
+#include <footprint.h>
 #include <layer_range.h>
 #include <pcb_dimension.h>
 #include <pad.h>
diff --git a/pcbnew/pcb_io/altium/altium_pcb.h b/pcbnew/pcb_io/altium/altium_pcb.h
index 20f7676650..5bedfc52a8 100644
--- a/pcbnew/pcb_io/altium/altium_pcb.h
+++ b/pcbnew/pcb_io/altium/altium_pcb.h
@@ -85,6 +85,7 @@ enum class ALTIUM_PCB_DIR
 
 
 class BOARD;
+class EDA_TEXT;
 class FP_SHAPE;
 class PCB_SHAPE;
 class PCB_TEXTBOX;
diff --git a/pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.h b/pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.h
index 6b99aacc5a..dee57a8868 100644
--- a/pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.h
+++ b/pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.h
@@ -25,10 +25,11 @@
 #ifndef PCB_IO_EASYEDA_PLUGIN_H_
 #define PCB_IO_EASYEDA_PLUGIN_H_
 
-#include <footprint.h>
 #include <pcb_io/pcb_io.h>
 #include <pcb_io/pcb_io_mgr.h>
 
+class FOOTPRINT;
+
 class PCB_IO_EASYEDA : public PCB_IO
 {
 public:
diff --git a/pcbnew/pcb_io/ipc2581/pcb_io_ipc2581.cpp b/pcbnew/pcb_io/ipc2581/pcb_io_ipc2581.cpp
index 96811ed558..cf524c10b0 100644
--- a/pcbnew/pcb_io/ipc2581/pcb_io_ipc2581.cpp
+++ b/pcbnew/pcb_io/ipc2581/pcb_io_ipc2581.cpp
@@ -31,8 +31,11 @@
 #include <connectivity/connectivity_algo.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <font/font.h>
+#include <footprint.h>
 #include <hash_eda.h>
+#include <pad.h>
 #include <pcb_dimension.h>
+#include <pcb_field.h>
 #include <pcb_shape.h>
 #include <pcb_textbox.h>
 #include <pcb_track.h>
diff --git a/pcbnew/pcb_io/odbpp/odb_component.cpp b/pcbnew/pcb_io/odbpp/odb_component.cpp
index c7eb57679b..9b821153f5 100644
--- a/pcbnew/pcb_io/odbpp/odb_component.cpp
+++ b/pcbnew/pcb_io/odbpp/odb_component.cpp
@@ -22,6 +22,7 @@
 #include <wx/log.h>
 
 #include <board.h>
+#include <footprint.h>
 
 #include "odb_component.h"
 #include "odb_util.h"
diff --git a/pcbnew/pcb_io/odbpp/odb_eda_data.cpp b/pcbnew/pcb_io/odbpp/odb_eda_data.cpp
index 8ad5d49762..4519cbe911 100644
--- a/pcbnew/pcb_io/odbpp/odb_eda_data.cpp
+++ b/pcbnew/pcb_io/odbpp/odb_eda_data.cpp
@@ -23,6 +23,8 @@
 #include <base_units.h>
 #include <build_version.h>
 #include <hash_eda.h>
+#include <footprint.h>
+#include <pad.h>
 #include <string_utils.h>
 
 #include <netinfo.h>
diff --git a/pcbnew/pcb_io/odbpp/odb_entity.cpp b/pcbnew/pcb_io/odbpp/odb_entity.cpp
index 10983de0db..fdea47615d 100644
--- a/pcbnew/pcb_io/odbpp/odb_entity.cpp
+++ b/pcbnew/pcb_io/odbpp/odb_entity.cpp
@@ -21,6 +21,7 @@
 
 #include <base_units.h>
 #include <optional>
+#include <board.h>
 #include <board_stackup_manager/stackup_predefined_prms.h>
 #include <build_version.h>
 #include <callback_gal.h>
diff --git a/pcbnew/pcb_io/odbpp/odb_feature.cpp b/pcbnew/pcb_io/odbpp/odb_feature.cpp
index 185aabf450..281aaf9a01 100644
--- a/pcbnew/pcb_io/odbpp/odb_feature.cpp
+++ b/pcbnew/pcb_io/odbpp/odb_feature.cpp
@@ -25,6 +25,8 @@
 
 #include <wx/log.h>
 
+#include "footprint.h"
+#include "pad.h"
 #include "pcb_shape.h"
 #include "odb_defines.h"
 #include "pcb_track.h"
diff --git a/pcbnew/pcb_io/odbpp/odb_feature.h b/pcbnew/pcb_io/odbpp/odb_feature.h
index daf9945115..b9b90ccdb1 100644
--- a/pcbnew/pcb_io/odbpp/odb_feature.h
+++ b/pcbnew/pcb_io/odbpp/odb_feature.h
@@ -23,9 +23,8 @@
 #define _ODB_FEATURE_H_
 
 #include "odb_attribute.h"
-#include "pad.h"
 #include "convert_basic_shapes_to_polygon.h"
-#include "footprint.h"
+
 #include <list>
 #include "math/vector2d.h"
 #include "odb_defines.h"
@@ -44,6 +43,8 @@ class ODB_PAD;
 class ODB_SURFACE;
 class ODB_FEATURE;
 class PCB_IO_ODBPP;
+class FOOTPRINT;
+class PAD;
 class PCB_VIA;
 
 class FEATURES_MANAGER : public ATTR_MANAGER
diff --git a/pcbnew/pcb_io/odbpp/pcb_io_odbpp.cpp b/pcbnew/pcb_io/odbpp/pcb_io_odbpp.cpp
index e5b12a0242..6cc520fcaf 100644
--- a/pcbnew/pcb_io/odbpp/pcb_io_odbpp.cpp
+++ b/pcbnew/pcb_io/odbpp/pcb_io_odbpp.cpp
@@ -28,6 +28,8 @@
 #include "odb_entity.h"
 #include "wx/log.h"
 
+#include <footprint.h>
+
 
 double      PCB_IO_ODBPP::m_scale = 1.0 / PCB_IU_PER_MM;
 double      PCB_IO_ODBPP::m_symbolScale = 1.0 / PL_IU_PER_MM;
diff --git a/pcbnew/pcb_io/odbpp/pcb_io_odbpp.h b/pcbnew/pcb_io/odbpp/pcb_io_odbpp.h
index 75f9f02050..e6ee00623f 100644
--- a/pcbnew/pcb_io/odbpp/pcb_io_odbpp.h
+++ b/pcbnew/pcb_io/odbpp/pcb_io_odbpp.h
@@ -26,7 +26,6 @@
 #include <pcb_io/pcb_io_mgr.h>
 #include <pcb_io/common/plugin_common_layer_mapping.h>
 
-#include <eda_shape.h>
 #include <layer_ids.h> // PCB_LAYER_ID
 #include <font/font.h>
 #include <geometry/shape_segment.h>
@@ -34,6 +33,7 @@
 #include <memory>
 #include "odb_entity.h"
 
+
 struct ODB_DRILL_SPAN
 {
     ODB_DRILL_SPAN()
@@ -102,11 +102,13 @@ class PROGRESS_REPORTER;
 class NETINFO_ITEM;
 class PAD;
 class PCB_SHAPE;
+class PCB_TRACK;
 class PCB_VIA;
 class PROGRESS_REPORTER;
 class SHAPE_POLY_SET;
 class SHAPE_SEGMENT;
 class EDA_DATA;
+class ZONE;
 
 
 class PCB_IO_ODBPP : public PCB_IO
diff --git a/pcbnew/pcb_io/pcb_io_mgr.cpp b/pcbnew/pcb_io/pcb_io_mgr.cpp
index 4296a428a8..b87c1cc4e4 100644
--- a/pcbnew/pcb_io/pcb_io_mgr.cpp
+++ b/pcbnew/pcb_io/pcb_io_mgr.cpp
@@ -26,6 +26,7 @@
 #include <wx/uri.h>
 
 #include <config.h>
+#include <footprint.h>
 #include <kiway_player.h>
 #include <wildcards_and_files_ext.h>
 #include <libraries/library_table.h>
diff --git a/pcbnew/pcb_reference_image.cpp b/pcbnew/pcb_reference_image.cpp
index efe52128fc..59c33f24a5 100644
--- a/pcbnew/pcb_reference_image.cpp
+++ b/pcbnew/pcb_reference_image.cpp
@@ -31,6 +31,7 @@
 #include <common.h>
 #include <core/mirror.h>
 #include <eda_draw_frame.h>
+#include <footprint.h>
 #include <pcb_draw_panel_gal.h>
 #include <pcb_painter.h>
 #include <plotters/plotter.h>
diff --git a/pcbnew/pcbexpr_functions.cpp b/pcbnew/pcbexpr_functions.cpp
index 9ed0b320da..464dacb23d 100644
--- a/pcbnew/pcbexpr_functions.cpp
+++ b/pcbnew/pcbexpr_functions.cpp
@@ -25,13 +25,17 @@
 #include <cstdio>
 #include <memory>
 #include <mutex>
+
 #include <wx/log.h>
+
 #include <board.h>
 #include <board_design_settings.h>
 #include <component_classes/component_class.h>
 #include <drc/drc_rtree.h>
 #include <drc/drc_engine.h>
+#include <footprint.h>
 #include <lset.h>
+#include <pad.h>
 #include <pcb_track.h>
 #include <pcb_group.h>
 #include <geometry/shape_segment.h>
diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
index c442cca8da..8883b9d06a 100644
--- a/pcbnew/pcbnew.cpp
+++ b/pcbnew/pcbnew.cpp
@@ -39,6 +39,7 @@
 #include <gestfich.h>
 #include <paths.h>
 #include <pcbnew_settings.h>
+#include <footprint.h>
 #include <footprint_editor_settings.h>
 #include <settings/settings_manager.h>
 #include <settings/cvpcb_settings.h>
diff --git a/pcbnew/pcbnew_jobs_handler.cpp b/pcbnew/pcbnew_jobs_handler.cpp
index f2c6586ded..5955615b94 100644
--- a/pcbnew/pcbnew_jobs_handler.cpp
+++ b/pcbnew/pcbnew_jobs_handler.cpp
@@ -36,6 +36,7 @@
 #include <drc/drc_report.h>
 #include <drawing_sheet/ds_data_model.h>
 #include <drawing_sheet/ds_proxy_view_item.h>
+#include <footprint.h>
 #include <jobs/job_fp_export_svg.h>
 #include <jobs/job_fp_upgrade.h>
 #include <jobs/job_export_pcb_ipc2581.h>
diff --git a/pcbnew/python/swig/pcbnew.i b/pcbnew/python/swig/pcbnew.i
index a3f56483ac..468fbbb8d6 100644
--- a/pcbnew/python/swig/pcbnew.i
+++ b/pcbnew/python/swig/pcbnew.i
@@ -85,6 +85,7 @@ class BASE_SET {};
 #include <exporters/gendrill_excellon_writer.h>
 #include <exporters/gendrill_gerber_writer.h>
 #include <exporters/gerber_jobfile_writer.h>
+#include <footprint.h>
 #include <pcb_io/pcb_io_mgr.h>
 #include <pcb_io/pcb_io.h>
 
@@ -149,5 +150,3 @@ HANDLE_EXCEPTIONS(WriteDRCReport)
 %include plugins.i
 %include units.i
 %include version.i
-
-
diff --git a/pcbnew/ratsnest/ratsnest.cpp b/pcbnew/ratsnest/ratsnest.cpp
index 8a6e8e2bf3..bb4bbd2355 100644
--- a/pcbnew/ratsnest/ratsnest.cpp
+++ b/pcbnew/ratsnest/ratsnest.cpp
@@ -23,6 +23,7 @@
  */
 
 #include <pcb_edit_frame.h>
+#include <board.h>
 #include <footprint.h>
 #include <ratsnest/ratsnest_data.h>
 
@@ -41,4 +42,3 @@ void PCB_BASE_FRAME::Compile_Ratsnest( bool aDisplayStatus )
     if( aDisplayStatus )
         SetMsgPanel( m_pcb );
 }
-
diff --git a/pcbnew/ratsnest/ratsnest_data.cpp b/pcbnew/ratsnest/ratsnest_data.cpp
index 046def1205..1815aaf04d 100644
--- a/pcbnew/ratsnest/ratsnest_data.cpp
+++ b/pcbnew/ratsnest/ratsnest_data.cpp
@@ -41,6 +41,7 @@ using namespace std::placeholders;
 #include <algorithm>
 #include <cassert>
 #include <limits>
+#include <list>
 
 #include <delaunator.hpp>
 
@@ -678,4 +679,3 @@ bool RN_NET::NearestBicoloredPair( RN_NET* aOtherNet, VECTOR2I& aPos1, VECTOR2I&
 
     return rv;
 }
-
diff --git a/pcbnew/router/pns_meander_placer.cpp b/pcbnew/router/pns_meander_placer.cpp
index 079adb02b9..bfa3cd6105 100644
--- a/pcbnew/router/pns_meander_placer.cpp
+++ b/pcbnew/router/pns_meander_placer.cpp
@@ -27,6 +27,8 @@
 #include "pns_solid.h"
 #include "pns_topology.h"
 
+#include <board_connected_item.h>
+
 #include <length_delay_calculation/tuning_profile_parameters_iface.h>
 
 namespace PNS {
diff --git a/pcbnew/teardrop/teardrop.h b/pcbnew/teardrop/teardrop.h
index 2ca503b105..b058beb436 100644
--- a/pcbnew/teardrop/teardrop.h
+++ b/pcbnew/teardrop/teardrop.h
@@ -26,15 +26,13 @@
 #define TEARDROP_H
 
 #include <tool/tool_manager.h>
-#include <board.h>
-#include <footprint.h>
-#include <pad.h>
-#include <zone.h>
 #include <drc/drc_rtree.h>
 #include "teardrop_parameters.h"
 
-
+class BOARD;
 class PCB_TRACK;
+class ZONE;
+
 
 // A class to store tracks grouped by layer and netcode
 class TRACK_BUFFER
diff --git a/pcbnew/tools/align_distribute_tool.cpp b/pcbnew/tools/align_distribute_tool.cpp
index 3f1b7afe5c..ca3c641de2 100644
--- a/pcbnew/tools/align_distribute_tool.cpp
+++ b/pcbnew/tools/align_distribute_tool.cpp
@@ -32,6 +32,7 @@
 
 #include <board.h>
 #include <board_commit.h>
+#include <footprint.h>
 #include <collectors.h>
 #include <bitmaps.h>
 #include <pcb_edit_frame.h>
diff --git a/pcbnew/tools/array_tool.cpp b/pcbnew/tools/array_tool.cpp
index 4fbbab13e8..a4b902537a 100644
--- a/pcbnew/tools/array_tool.cpp
+++ b/pcbnew/tools/array_tool.cpp
@@ -26,6 +26,7 @@
 #include <array_options.h>
 #include <array_pad_number_provider.h>
 #include <dialogs/dialog_create_array.h>
+#include <footprint.h>
 #include <pad.h>
 #include <pcb_generator.h>
 #include <pcb_group.h>
diff --git a/pcbnew/tools/board_inspection_tool.cpp b/pcbnew/tools/board_inspection_tool.cpp
index 581461eff5..0415e801d3 100644
--- a/pcbnew/tools/board_inspection_tool.cpp
+++ b/pcbnew/tools/board_inspection_tool.cpp
@@ -21,8 +21,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include "tools/board_inspection_tool.h"
+
 #include <bitmaps.h>
 #include <collectors.h>
+#include <footprint.h>
 #include <pcb_group.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_selection_tool.h>
@@ -40,7 +43,6 @@
 #include <kiplatform/ui.h>
 #include <status_popup.h>
 #include <string_utils.h>
-#include <tools/board_inspection_tool.h>
 #include <footprint_library_adapter.h>
 #include <pcb_shape.h>
 #include <widgets/appearance_controls.h>
diff --git a/pcbnew/tools/board_reannotate_tool.cpp b/pcbnew/tools/board_reannotate_tool.cpp
index e912627ea3..aa9ecc27d3 100644
--- a/pcbnew/tools/board_reannotate_tool.cpp
+++ b/pcbnew/tools/board_reannotate_tool.cpp
@@ -23,12 +23,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include "tools/board_reannotate_tool.h"
+
+#include <wx/filedlg.h>
+
+#include <footprint.h>
 #include <pcb_group.h>
 #include <refdes_utils.h>
 #include <string_utils.h>
 #include <tool/tool_manager.h>
-#include <wx/filedlg.h>
-#include <tools/board_reannotate_tool.h>
 
 
 BOARD_REANNOTATE_TOOL::BOARD_REANNOTATE_TOOL() :
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index fab1d95ea2..d689281cda 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -71,6 +71,7 @@
 #include <footprint.h>
 #include <macros.h>
 #include <gal/painter.h>
+#include <pad.h>
 #include <pcb_edit_frame.h>
 #include <pcb_group.h>
 #include <pcb_point.h>
diff --git a/pcbnew/tools/drc_tool.cpp b/pcbnew/tools/drc_tool.cpp
index d648a4e815..3f39b52583 100644
--- a/pcbnew/tools/drc_tool.cpp
+++ b/pcbnew/tools/drc_tool.cpp
@@ -30,6 +30,7 @@
 #include <tools/drc_tool.h>
 #include <kiface_base.h>
 #include <dialog_drc.h>
+#include <footprint.h>
 #include <board_commit.h>
 #include <board_design_settings.h>
 #include <progress_reporter.h>
diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index dab71761c2..ea2a0bf8c8 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -43,6 +43,7 @@
 #include <pcb_table.h>
 #include <pcb_generator.h>
 #include <zone.h>
+#include <pad.h>
 #include <pcb_edit_frame.h>
 #include <drawing_sheet/ds_proxy_view_item.h>
 #include <kiway.h>
diff --git a/pcbnew/tools/edit_tool_move_fct.cpp b/pcbnew/tools/edit_tool_move_fct.cpp
index 4651ddceb4..7a1a0b07da 100644
--- a/pcbnew/tools/edit_tool_move_fct.cpp
+++ b/pcbnew/tools/edit_tool_move_fct.cpp
@@ -31,6 +31,7 @@
 #include <board.h>
 #include <board_commit.h>
 #include <collectors.h>
+#include <footprint.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <geometry/geometry_utils.h>
 #include <pad.h>
diff --git a/pcbnew/tools/multichannel_tool.cpp b/pcbnew/tools/multichannel_tool.cpp
index eaad2cc71a..c7964f3950 100644
--- a/pcbnew/tools/multichannel_tool.cpp
+++ b/pcbnew/tools/multichannel_tool.cpp
@@ -38,20 +38,17 @@
 #include <geometry/shape_utils.h>
 #include <pcb_group.h>
 #include <footprint.h>
+#include <pad.h>
 #include <pcb_text.h>
 #include <component_classes/component_class.h>
 #include <connectivity/connectivity_data.h>
 #include <connectivity/topo_match.h>
-#include <optional>
 #include <algorithm>
 #include <pcbnew_scripting_helpers.h>
 #include <pcb_track.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_picker_tool.h>
-#include <random>
 #include <chrono>
-#include <atomic>
-#include <thread>
 #include <core/profile.h>
 #include <thread_pool.h>
 #include <widgets/wx_progress_reporters.h>
diff --git a/pcbnew/tools/multichannel_tool.h b/pcbnew/tools/multichannel_tool.h
index 0f6b0386ef..5f4e713602 100644
--- a/pcbnew/tools/multichannel_tool.h
+++ b/pcbnew/tools/multichannel_tool.h
@@ -33,12 +33,12 @@
 #include <tools/pcb_picker_tool.h>
 #include <connectivity/topo_match.h>
 
-#include <pad.h>
-#include <footprint.h>
 #include <reporter.h>
 #include <zone_settings.h>
 
 class wxWindow;
+class EDA_ITEM;
+class FOOTPRINT;
 
 struct REPEAT_LAYOUT_OPTIONS
 {
diff --git a/pcbnew/tools/pcb_grid_helper.cpp b/pcbnew/tools/pcb_grid_helper.cpp
index f6e4d6a03a..5c3d724312 100644
--- a/pcbnew/tools/pcb_grid_helper.cpp
+++ b/pcbnew/tools/pcb_grid_helper.cpp
@@ -29,6 +29,7 @@
 #include <algorithm>
 
 #include <advanced_config.h>
+#include <board_item.h>
 #include <pcb_dimension.h>
 #include <pcb_shape.h>
 #include <footprint.h>
@@ -472,6 +473,35 @@ VECTOR2I PCB_GRID_HELPER::SnapToPad( const VECTOR2I& aMousePos, std::deque<PAD*>
 }
 
 
+void PCB_GRID_HELPER::OnBoardItemRemoved( BOARD& aBoard, BOARD_ITEM* aRemovedItem )
+{
+    // If the item being removed is involved in the snap, clear the snap item
+    if( m_snapItem )
+    {
+        for( EDA_ITEM* eda_item : m_snapItem->items )
+        {
+            if( eda_item->IsBOARD_ITEM() )
+            {
+                BOARD_ITEM* item = static_cast<BOARD_ITEM*>( eda_item );
+
+                if( item == aRemovedItem || item->GetParentFootprint() == aRemovedItem )
+                {
+                    m_snapItem = std::nullopt;
+                    break;
+                }
+            }
+        }
+    }
+}
+
+
+void PCB_GRID_HELPER::OnBoardItemsRemoved( BOARD& aBoard, std::vector<BOARD_ITEM*>& aBoardItems )
+{
+    // This is a bulk-remove.  Simply clearing the snap item will be the most performant.
+    m_snapItem = std::nullopt;
+}
+
+
 VECTOR2I PCB_GRID_HELPER::BestDragOrigin( const VECTOR2I &aMousePos,
                                           std::vector<BOARD_ITEM*>& aItems,
                                           GRID_HELPER_GRIDS aGrid,
diff --git a/pcbnew/tools/pcb_grid_helper.h b/pcbnew/tools/pcb_grid_helper.h
index 5e49384c18..ea5d83e842 100644
--- a/pcbnew/tools/pcb_grid_helper.h
+++ b/pcbnew/tools/pcb_grid_helper.h
@@ -30,11 +30,11 @@
 
 #include <pcb_item_containers.h>
 #include <tool/grid_helper.h>
-#include <board.h>
-#include <footprint.h>
 #include <geometry/intersection.h>
 #include <geometry/nearest.h>
 
+#include <board.h>
+
 
 class LSET;
 class SHAPE_ARC;
@@ -73,32 +73,9 @@ public:
 
     VECTOR2I SnapToPad( const VECTOR2I& aMousePos, std::deque<PAD*>& aPads );
 
-    virtual void OnBoardItemRemoved( BOARD& aBoard, BOARD_ITEM* aRemovedItem ) override
-    {
-        // If the item being removed is involved in the snap, clear the snap item
-        if( m_snapItem )
-        {
-            for( EDA_ITEM* eda_item : m_snapItem->items )
-            {
-                if( eda_item->IsBOARD_ITEM() )
-                {
-                    BOARD_ITEM* item = static_cast<BOARD_ITEM*>( eda_item );
+    void OnBoardItemRemoved( BOARD& aBoard, BOARD_ITEM* aRemovedItem ) override;
 
-                    if( item == aRemovedItem || item->GetParentFootprint() == aRemovedItem )
-                    {
-                        m_snapItem = std::nullopt;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    virtual void OnBoardItemsRemoved( BOARD& aBoard, std::vector<BOARD_ITEM*>& aBoardItems ) override
-    {
-        // This is a bulk-remove.  Simply clearing the snap item will be the most performant.
-        m_snapItem = std::nullopt;
-    }
+    void OnBoardItemsRemoved( BOARD& aBoard, std::vector<BOARD_ITEM*>& aBoardItems ) override;
 
     /**
      * Chooses the "best" snap anchor around the given point, optionally taking layers from
diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp
index ba5d1eff77..7ea0b28356 100644
--- a/pcbnew/tools/pcb_selection_tool.cpp
+++ b/pcbnew/tools/pcb_selection_tool.cpp
@@ -24,7 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <limits>
 #include <cmath>
 #include <functional>
 #include <stack>
@@ -34,6 +33,8 @@ using namespace std::placeholders;
 #include <macros.h>
 #include <board.h>
 #include <board_design_settings.h>
+#include <footprint.h>
+#include <pad.h>
 #include <pcb_point.h>
 #include <pcb_table.h>
 #include <pcb_tablecell.h>
diff --git a/pcbnew/tools/pcb_viewer_tools.cpp b/pcbnew/tools/pcb_viewer_tools.cpp
index f5f70b7e58..1a7fcd8222 100644
--- a/pcbnew/tools/pcb_viewer_tools.cpp
+++ b/pcbnew/tools/pcb_viewer_tools.cpp
@@ -26,9 +26,11 @@
 #include <wx/clipbrd.h>
 
 #include <3d_viewer/eda_3d_viewer_frame.h>
+#include <footprint.h>
 #include <footprint_editor_settings.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <kiplatform/ui.h>
+#include <pad.h>
 #include <pcb_base_frame.h>
 #include <preview_items/ruler_item.h>
 #include <preview_items/two_point_geom_manager.h>
diff --git a/pcbnew/tracks_cleaner.cpp b/pcbnew/tracks_cleaner.cpp
index 6e0b422a24..7f8514ea9b 100644
--- a/pcbnew/tracks_cleaner.cpp
+++ b/pcbnew/tracks_cleaner.cpp
@@ -36,6 +36,7 @@
 #include <reporter.h>
 #include <thread_pool.h>
 #include <lset.h>
+#include <pad.h>
 #include <pcb_track.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
diff --git a/pcbnew/widgets/search_handlers.cpp b/pcbnew/widgets/search_handlers.cpp
index fec9efc778..0dbcf72491 100644
--- a/pcbnew/widgets/search_handlers.cpp
+++ b/pcbnew/widgets/search_handlers.cpp
@@ -18,6 +18,9 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "search_handlers.h"
+
+#include <board.h>
 #include <footprint.h>
 #include <pcb_edit_frame.h>
 #include <pcb_marker.h>
@@ -34,7 +37,6 @@
 #include <zone.h>
 #include <pad.h>
 #include <pcb_track.h>
-#include "search_handlers.h"
 
 
 void PCB_SEARCH_HANDLER::ActivateItem( long aItemRow )
@@ -46,6 +48,23 @@ void PCB_SEARCH_HANDLER::ActivateItem( long aItemRow )
 }
 
 
+wxString PCB_SEARCH_HANDLER::GetResultCell( int aRow, int aCol )
+{
+    if( m_frame->IsClosing() )
+        return wxEmptyString;
+
+    if( aRow >= static_cast<int>(m_hitlist.size() ) )
+        return wxEmptyString;
+
+    BOARD_ITEM* item = m_hitlist[aRow];
+
+    if( !item )
+        return wxEmptyString;
+
+    return getResultCell( item, aCol );
+}
+
+
 void PCB_SEARCH_HANDLER::Sort( int aCol, bool aAscending, std::vector<long>* aSelection )
 {
     std::vector<BOARD_ITEM*> selection;
diff --git a/pcbnew/widgets/search_handlers.h b/pcbnew/widgets/search_handlers.h
index 92289b1e61..151f5774e7 100644
--- a/pcbnew/widgets/search_handlers.h
+++ b/pcbnew/widgets/search_handlers.h
@@ -39,21 +39,7 @@ public:
             m_frame( aFrame )
     {}
 
-    wxString GetResultCell( int aRow, int aCol ) override
-    {
-        if( m_frame->IsClosing() )
-            return wxEmptyString;
-
-        if( aRow >= static_cast<int>(m_hitlist.size() ) )
-            return wxEmptyString;
-
-        BOARD_ITEM* item = m_hitlist[aRow];
-
-        if( !item )
-            return wxEmptyString;
-
-        return getResultCell( item, aCol );
-    }
+    wxString GetResultCell( int aRow, int aCol ) override;
 
     void Sort( int aCol, bool aAscending, std::vector<long>* aSelection ) override;
 
diff --git a/pcbnew/zone_manager/dialog_zone_manager.h b/pcbnew/zone_manager/dialog_zone_manager.h
index bbd4458c80..e39bba550b 100644
--- a/pcbnew/zone_manager/dialog_zone_manager.h
+++ b/pcbnew/zone_manager/dialog_zone_manager.h
@@ -37,7 +37,6 @@
 #include <zone_settings_bag.h>
 #include <widgets/unit_binder.h>
 #include <zone.h>
-#include <pad.h>
 #include <board.h>
 #include <trigo.h>
 #include <eda_pattern_match.h>