diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 1aebe80823..9044d9e78f 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -459,6 +459,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pcbnew_wrap.cxx
     DEPENDS python/swig/footprint.i
     DEPENDS python/swig/netinfo.i
     DEPENDS python/swig/pad.i
+    DEPENDS python/swig/pcb_group.i
     DEPENDS python/swig/pcb_text.i
     DEPENDS python/swig/pcb_group.i
     DEPENDS python/swig/plugins.i
diff --git a/pcbnew/array_creator.cpp b/pcbnew/array_creator.cpp
index d533bd6783..95d3745f9f 100644
--- a/pcbnew/array_creator.cpp
+++ b/pcbnew/array_creator.cpp
@@ -26,6 +26,7 @@
 
 #include <array_pad_name_provider.h>
 #include <board_commit.h>
+#include <pcb_group.h>
 #include <pad_naming.h>
 
 #include <dialogs/dialog_create_array.h>
diff --git a/pcbnew/board.h b/pcbnew/board.h
index 8f238a30e1..016d6990ca 100644
--- a/pcbnew/board.h
+++ b/pcbnew/board.h
@@ -27,7 +27,6 @@
 
 #include <board_design_settings.h>
 #include <board_item_container.h>
-#include <pcb_group.h>
 #include <footprint.h>
 #include <common.h> // Needed for stl hash extensions
 #include <layers_id_colors_and_visibility.h>
@@ -45,6 +44,7 @@ class BOARD;
 class ZONE;
 class TRACK;
 class PAD;
+class PCB_GROUP;
 class PCB_MARKER;
 class MSG_PANEL_ITEM;
 class NETLIST;
diff --git a/pcbnew/board_commit.cpp b/pcbnew/board_commit.cpp
index 94a924ac8c..1dc641d907 100644
--- a/pcbnew/board_commit.cpp
+++ b/pcbnew/board_commit.cpp
@@ -25,6 +25,7 @@
 #include <board.h>
 #include <footprint.h>
 #include <pcb_edit_frame.h>
+#include <pcb_group.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_selection_tool.h>
 #include <view/view.h>
diff --git a/pcbnew/dialogs/dialog_cleanup_graphics.cpp b/pcbnew/dialogs/dialog_cleanup_graphics.cpp
index a842768f41..d4d5d16471 100644
--- a/pcbnew/dialogs/dialog_cleanup_graphics.cpp
+++ b/pcbnew/dialogs/dialog_cleanup_graphics.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <dialog_cleanup_graphics.h>
+#include <board_commit.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <graphics_cleaner.h>
diff --git a/pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
index d551288eab..6aa2f55855 100644
--- a/pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <dialog_cleanup_tracks_and_vias.h>
+#include <board_commit.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/dialogs/dialog_dimension_properties.cpp b/pcbnew/dialogs/dialog_dimension_properties.cpp
index 8e6c8a512b..9e8bb7d9b4 100644
--- a/pcbnew/dialogs/dialog_dimension_properties.cpp
+++ b/pcbnew/dialogs/dialog_dimension_properties.cpp
@@ -19,6 +19,7 @@
  */
 
 #include <board.h>
+#include <board_commit.h>
 #include <dimension.h>
 #include <pcb_base_edit_frame.h>
 #include <pcb_layer_box_selector.h>
diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp
index 22235c0709..eb19b0b2e6 100644
--- a/pcbnew/dialogs/dialog_exchange_footprints.cpp
+++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp
@@ -33,6 +33,7 @@
 #include <kiway.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
+#include <pcb_group.h>
 #include <pcbnew_settings.h>
 #include <project.h>
 #include <wx_html_report_panel.h>
diff --git a/pcbnew/footprint_editor_utils.cpp b/pcbnew/footprint_editor_utils.cpp
index 22ab7d425a..ee8dcf11fd 100644
--- a/pcbnew/footprint_editor_utils.cpp
+++ b/pcbnew/footprint_editor_utils.cpp
@@ -21,6 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <board_commit.h>
 #include <confirm.h>
 #include <dialog_footprint_properties_fp_editor.h>
 #include <footprint_edit_frame.h>
diff --git a/pcbnew/kicad_clipboard.cpp b/pcbnew/kicad_clipboard.cpp
index 282c98c928..1c2cb868ee 100644
--- a/pcbnew/kicad_clipboard.cpp
+++ b/pcbnew/kicad_clipboard.cpp
@@ -28,6 +28,7 @@
 #include <build_version.h>
 #include <board.h>
 #include <track.h>
+#include <pcb_group.h>
 #include <pcb_shape.h>
 #include <pcb_text.h>
 #include <fp_text.h>
diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp
index 15b888f8b8..8a41b76b1a 100644
--- a/pcbnew/pcb_base_frame.cpp
+++ b/pcbnew/pcb_base_frame.cpp
@@ -48,6 +48,7 @@
 #include <collectors.h>
 #include <pcb_draw_panel_gal.h>
 #include <math/vector2d.h>
+#include <pcb_group.h>
 
 #include <pcb_painter.h>
 #include <settings/settings_manager.h>
diff --git a/pcbnew/pcb_expr_evaluator.cpp b/pcbnew/pcb_expr_evaluator.cpp
index ca9612f66c..a01b8cbf68 100644
--- a/pcbnew/pcb_expr_evaluator.cpp
+++ b/pcbnew/pcb_expr_evaluator.cpp
@@ -26,6 +26,7 @@
 #include <memory>
 #include <board.h>
 #include <track.h>
+#include <pcb_group.h>
 #include <geometry/shape_segment.h>
 #include <pcb_expr_evaluator.h>
 #include <wx/log.h>
diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
index 9578a94483..441d92e56c 100644
--- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
+++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
@@ -31,6 +31,7 @@
 #include <pcb_shape.h>
 #include <fp_shape.h>
 #include <footprint.h>
+#include <pcb_group.h>
 #include <pcb_text.h>
 #include <project.h>
 #include <track.h>
diff --git a/pcbnew/plugins/kicad/kicad_plugin.cpp b/pcbnew/plugins/kicad/kicad_plugin.cpp
index 015762be79..5325248983 100644
--- a/pcbnew/plugins/kicad/kicad_plugin.cpp
+++ b/pcbnew/plugins/kicad/kicad_plugin.cpp
@@ -36,6 +36,7 @@
 #include <kiface_i.h>
 #include <locale_io.h>
 #include <macros.h>
+#include <pcb_group.h>
 #include <pcb_shape.h>
 #include <pcb_target.h>
 #include <pcb_text.h>
diff --git a/pcbnew/python/scripting/pcbnew_action_plugins.cpp b/pcbnew/python/scripting/pcbnew_action_plugins.cpp
index dd58dbdf01..de3b752170 100644
--- a/pcbnew/python/scripting/pcbnew_action_plugins.cpp
+++ b/pcbnew/python/scripting/pcbnew_action_plugins.cpp
@@ -24,6 +24,7 @@
 #include "pcbnew_action_plugins.h"
 #include <bitmaps.h>
 #include <board.h>
+#include <board_commit.h>
 #include <footprint.h>
 #include <track.h>
 #include <zone.h>
diff --git a/pcbnew/tools/drawing_stackup_table_tool.cpp b/pcbnew/tools/drawing_stackup_table_tool.cpp
index d1d483cd6b..222e5bdc55 100644
--- a/pcbnew/tools/drawing_stackup_table_tool.cpp
+++ b/pcbnew/tools/drawing_stackup_table_tool.cpp
@@ -36,6 +36,7 @@
 #include <painter.h>
 #include <board.h>
 #include <fp_shape.h>
+#include <pcb_group.h>
 #include <pcb_text.h>
 #include <kicad_string.h>
 #include <wx/utils.h>
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 42f07bfcd3..10046c2d20 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -47,6 +47,7 @@
 #include <preview_items/arc_assistant.h>
 #include <board.h>
 #include <fp_shape.h>
+#include <pcb_group.h>
 #include <pcb_text.h>
 #include <dimension.h>
 #include <zone.h>
diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 5e5dc5cc82..b9e505ad0e 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -62,6 +62,7 @@ using namespace std::placeholders;
 #include <dialogs/dialog_track_via_properties.h>
 #include <dialogs/dialog_unit_entry.h>
 #include <board_commit.h>
+#include <pcb_group.h>
 #include <pcb_target.h>
 #include <zone_filler.h>
 
diff --git a/pcbnew/tools/footprint_editor_control.cpp b/pcbnew/tools/footprint_editor_control.cpp
index 04c79b44c0..911520f38f 100644
--- a/pcbnew/tools/footprint_editor_control.cpp
+++ b/pcbnew/tools/footprint_editor_control.cpp
@@ -34,6 +34,7 @@
 #include <widgets/infobar.h>
 #include <bitmaps.h>
 #include <footprint.h>
+#include <pcb_group.h>
 #include <project.h>
 #include <fp_lib_table.h>
 #include <dialogs/dialog_cleanup_graphics.h>
diff --git a/pcbnew/tools/group_tool.cpp b/pcbnew/tools/group_tool.cpp
index 77b9582de5..6414f7e4eb 100644
--- a/pcbnew/tools/group_tool.cpp
+++ b/pcbnew/tools/group_tool.cpp
@@ -30,6 +30,7 @@
 #include <board_commit.h>
 #include <bitmaps.h>
 #include <dialogs/dialog_group_properties.h>
+#include <pcb_group.h>
 
 
 class GROUP_CONTEXT_MENU : public ACTION_MENU
diff --git a/pcbnew/tools/pcb_control.cpp b/pcbnew/tools/pcb_control.cpp
index 8ae32321c8..943fdfbcc7 100644
--- a/pcbnew/tools/pcb_control.cpp
+++ b/pcbnew/tools/pcb_control.cpp
@@ -37,6 +37,7 @@
 #include <dialogs/dialog_paste_special.h>
 #include <dimension.h>
 #include <footprint.h>
+#include <pcb_group.h>
 #include <track.h>
 #include <zone.h>
 #include <fp_shape.h>
diff --git a/pcbnew/tools/pcb_grid_helper.cpp b/pcbnew/tools/pcb_grid_helper.cpp
index 84ef5c07b0..dc80f2507d 100644
--- a/pcbnew/tools/pcb_grid_helper.cpp
+++ b/pcbnew/tools/pcb_grid_helper.cpp
@@ -28,6 +28,7 @@
 #include <dimension.h>
 #include <fp_shape.h>
 #include <footprint.h>
+#include <pcb_group.h>
 #include <track.h>
 #include <zone.h>
 #include <geometry/shape_circle.h>
diff --git a/pcbnew/tools/pcb_selection.cpp b/pcbnew/tools/pcb_selection.cpp
index afb08e8cda..8c50c51758 100644
--- a/pcbnew/tools/pcb_selection.cpp
+++ b/pcbnew/tools/pcb_selection.cpp
@@ -34,6 +34,7 @@ using namespace std::placeholders;
 #include <track.h>
 #include <footprint.h>
 #include <pcb_edit_frame.h>
+#include <pcb_group.h>
 #include <class_draw_panel_gal.h>
 #include <view/view_controls.h>
 #include <view/view_group.h>
diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp
index e35e8742c1..c5702a1031 100644
--- a/pcbnew/tools/pcb_selection_tool.cpp
+++ b/pcbnew/tools/pcb_selection_tool.cpp
@@ -33,6 +33,7 @@ using namespace std::placeholders;
 #include <clipper.hpp>
 #include <track.h>
 #include <footprint.h>
+#include <pcb_group.h>
 #include <pcb_shape.h>
 #include <pcb_text.h>
 #include <pcb_marker.h>
diff --git a/pcbnew/undo_redo.cpp b/pcbnew/undo_redo.cpp
index c2ed9a4923..50b5b8b5b1 100644
--- a/pcbnew/undo_redo.cpp
+++ b/pcbnew/undo_redo.cpp
@@ -31,6 +31,7 @@ using namespace std::placeholders;
 #include <pcb_edit_frame.h>
 #include <board.h>
 #include <track.h>
+#include <pcb_group.h>
 #include <pcb_target.h>
 #include <footprint.h>
 #include <dimension.h>
diff --git a/qa/pcbnew/group_saveload.cpp b/qa/pcbnew/group_saveload.cpp
index 47f27cb42a..0d01053478 100644
--- a/qa/pcbnew/group_saveload.cpp
+++ b/qa/pcbnew/group_saveload.cpp
@@ -28,6 +28,7 @@
 #include <boost/filesystem.hpp>
 #include <board.h>
 #include <footprint.h>
+#include <pcb_group.h>
 #include <pcb_text.h>
 #include <common.h>
 #include <pcbnew_utils/board_construction_utils.h>