diff --git a/common/base_struct.cpp b/common/base_struct.cpp
index 9a20d84aac..76f51fba7e 100644
--- a/common/base_struct.cpp
+++ b/common/base_struct.cpp
@@ -109,6 +109,19 @@ void EDA_ITEM::SetModified()
 }
 
 
+const EDA_RECT EDA_ITEM::GetBoundingBox() const
+{
+#if defined(DEBUG)
+    printf( "Missing GetBoundingBox()\n" );
+    Show( 0, std::cout ); // tell me which classes still need GetBoundingBox support
+#endif
+
+    // return a zero-sized box per default. derived classes should override
+    // this
+    return EDA_RECT( wxPoint( 0, 0 ), wxSize( 0, 0 ) );
+}
+
+
 EDA_ITEM* EDA_ITEM::Clone() const
 {
     wxCHECK_MSG( false, NULL, wxT( "Clone not implemented in derived class " ) + GetClass() +
diff --git a/common/common_plotSVG_functions.cpp b/common/common_plotSVG_functions.cpp
index 4a0820a33f..087a1203b0 100644
--- a/common/common_plotSVG_functions.cpp
+++ b/common/common_plotSVG_functions.cpp
@@ -93,6 +93,7 @@
 #include <fctsys.h>
 #include <trigo.h>
 #include <wxstruct.h>
+#include <class_eda_rect.h>
 #include <base_struct.h>
 #include <common.h>
 #include <plot_common.h>
diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp
index 6db857bdf3..2b1a682666 100644
--- a/common/dialog_shim.cpp
+++ b/common/dialog_shim.cpp
@@ -26,6 +26,7 @@
 #include <kiway_player.h>
 #include <wx/evtloop.h>
 #include <pgm_base.h>
+#include <class_eda_rect.h>
 
 
 /// Toggle a window's "enable" status to disabled, then enabled on destruction.
diff --git a/common/eda_text.cpp b/common/eda_text.cpp
index 48d405a610..8c57c606d2 100644
--- a/common/eda_text.cpp
+++ b/common/eda_text.cpp
@@ -29,6 +29,7 @@
 
 #include <eda_text.h>
 #include <drawtxt.h>
+#include <class_eda_rect.h>
 #include <macros.h>
 #include <trigo.h>               // RotatePoint
 #include <class_drawpanel.h>     // EDA_DRAW_PANEL
diff --git a/common/page_layout/class_worksheet_dataitem.cpp b/common/page_layout/class_worksheet_dataitem.cpp
index 4240fcc0d4..6f61f314e3 100644
--- a/common/page_layout/class_worksheet_dataitem.cpp
+++ b/common/page_layout/class_worksheet_dataitem.cpp
@@ -56,6 +56,7 @@
 
 #include <fctsys.h>
 #include <drawtxt.h>
+#include <class_eda_rect.h>
 #include <worksheet.h>
 #include <class_title_block.h>
 #include <worksheet_shape_builder.h>
diff --git a/common/page_layout/page_layout_graphic_items.cpp b/common/page_layout/page_layout_graphic_items.cpp
index 75023fa0ea..80575125d6 100644
--- a/common/page_layout/page_layout_graphic_items.cpp
+++ b/common/page_layout/page_layout_graphic_items.cpp
@@ -53,6 +53,7 @@
  */
 
 #include <fctsys.h>
+#include <class_eda_rect.h>
 #include <drawtxt.h>
 #include <worksheet.h>
 #include <class_title_block.h>
diff --git a/common/tool/context_menu.cpp b/common/tool/context_menu.cpp
index 23d31e4dd9..7a5fd441e2 100644
--- a/common/tool/context_menu.cpp
+++ b/common/tool/context_menu.cpp
@@ -27,6 +27,7 @@
 #include <tool/tool_manager.h>
 #include <tool/tool_interactive.h>
 #include <tool/context_menu.h>
+#include <wx/log.h>
 
 #include <functional>
 using namespace std::placeholders;
diff --git a/eeschema/class_libentry.h b/eeschema/class_libentry.h
index c09e392ed1..7757cd5c83 100644
--- a/eeschema/class_libentry.h
+++ b/eeschema/class_libentry.h
@@ -37,6 +37,7 @@
 #include <vector>
 #include <memory>
 
+class EDA_RECT;
 class LINE_READER;
 class OUTPUTFORMATTER;
 class PART_LIB;
diff --git a/eeschema/lib_draw_item.h b/eeschema/lib_draw_item.h
index 63b2ab7677..f1c0f86046 100644
--- a/eeschema/lib_draw_item.h
+++ b/eeschema/lib_draw_item.h
@@ -32,6 +32,7 @@
 #define _LIB_ITEM_H_
 
 #include <base_struct.h>
+#include <class_eda_rect.h>
 #include <transform.h>
 #include <gr_basic.h>
 
diff --git a/eeschema/lib_pin.h b/eeschema/lib_pin.h
index edd365639e..1d9ffe60fc 100644
--- a/eeschema/lib_pin.h
+++ b/eeschema/lib_pin.h
@@ -32,6 +32,7 @@
 
 class SCH_COMPONENT;
 
+#include <class_eda_rect.h>
 #include <lib_draw_item.h>
 
 #include "pin_shape.h"
diff --git a/gerbview/class_gbr_layout.h b/gerbview/class_gbr_layout.h
index 477136e980..6720e2c9f3 100644
--- a/gerbview/class_gbr_layout.h
+++ b/gerbview/class_gbr_layout.h
@@ -42,6 +42,7 @@
 #include <class_gbr_display_options.h>
 
 #include <gr_basic.h>
+#include <class_eda_rect.h>
 
 class GERBER_FILE_IMAGE_LIST;
 
diff --git a/include/base_struct.h b/include/base_struct.h
index bb12ed7689..5a96465b7e 100644
--- a/include/base_struct.h
+++ b/include/base_struct.h
@@ -34,13 +34,8 @@
 
 #include <core/typeinfo.h>
 
-#include <colors.h>
 #include <bitmap_types.h>
-#include <richio.h>
 #include <view/view_item.h>
-#include <class_eda_rect.h>
-#include <functional>
-
 
 #if defined(DEBUG)
 #include <iostream>         // needed for Show()
@@ -305,17 +300,7 @@ public:
      * system.
      * It is OK to overestimate the size by a few counts.
      */
-    virtual const EDA_RECT GetBoundingBox() const
-    {
-#if defined(DEBUG)
-        printf( "Missing GetBoundingBox()\n" );
-        Show( 0, std::cout ); // tell me which classes still need GetBoundingBox support
-#endif
-
-        // return a zero-sized box per default. derived classes should override
-        // this
-        return EDA_RECT( wxPoint( 0, 0 ), wxSize( 0, 0 ) );
-    }
+    virtual const EDA_RECT GetBoundingBox() const;
 
     /**
      * Function Clone
diff --git a/include/basic_gal.h b/include/basic_gal.h
index e3054b481d..6e6090e7cc 100644
--- a/include/basic_gal.h
+++ b/include/basic_gal.h
@@ -26,6 +26,7 @@
 #define BASIC_GAL_H
 
 #include <plot_common.h>
+#include <class_eda_rect.h>
 
 #include <gal/stroke_font.h>
 #include <gal/graphics_abstraction_layer.h>
diff --git a/include/block_commande.h b/include/block_commande.h
index 8c85aad325..1e3c225f84 100644
--- a/include/block_commande.h
+++ b/include/block_commande.h
@@ -35,6 +35,7 @@
 #include <base_struct.h>
 #include <class_undoredo_container.h>
 #include <gr_basic.h>
+#include <class_eda_rect.h>
 
 /* Block state codes. */
 typedef enum {
diff --git a/include/class_collector.h b/include/class_collector.h
index fd817a445a..90872121fd 100644
--- a/include/class_collector.h
+++ b/include/class_collector.h
@@ -35,6 +35,7 @@
 #include <fctsys.h>
 #include <base_struct.h>    // SEARCH_RESULT
 #include <common.h>         // GetNewTimeStamp()
+#include <class_eda_rect.h>
 
 
 class EDA_ITEM;
diff --git a/include/class_drawpanel.h b/include/class_drawpanel.h
index d6f5743c32..4b12e65a67 100644
--- a/include/class_drawpanel.h
+++ b/include/class_drawpanel.h
@@ -33,6 +33,7 @@
 
 #include <base_struct.h>
 #include <gr_basic.h>
+#include <class_eda_rect.h>
 
 
 class BASE_SCREEN;
diff --git a/include/class_title_block.h b/include/class_title_block.h
index 36c85d5cf3..78f2459abb 100644
--- a/include/class_title_block.h
+++ b/include/class_title_block.h
@@ -25,11 +25,9 @@
 #define CLASS_TITLE_BLOCK_H_
 
 #include <wx/string.h>
-
+#include <ki_exception.h>
 
 class OUTPUTFORMATTER;
-class IO_ERROR;
-
 
 /**
  * Class TITLE_BLOCK
diff --git a/include/tool/tool_base.h b/include/tool/tool_base.h
index eb3da8d17b..c8280be24d 100644
--- a/include/tool/tool_base.h
+++ b/include/tool/tool_base.h
@@ -36,6 +36,7 @@
 
 class EDA_ITEM;
 class TOOL_MANAGER;
+class wxWindow;
 
 namespace KIGFX
 {
diff --git a/pagelayout_editor/class_pl_editor_layout.cpp b/pagelayout_editor/class_pl_editor_layout.cpp
index a40de535c2..db56765219 100644
--- a/pagelayout_editor/class_pl_editor_layout.cpp
+++ b/pagelayout_editor/class_pl_editor_layout.cpp
@@ -31,6 +31,7 @@
 
 #include <fctsys.h>
 #include <common.h>
+#include <class_eda_rect.h>
 #include <class_pl_editor_layout.h>
 
 PL_EDITOR_LAYOUT::PL_EDITOR_LAYOUT()
diff --git a/pcbnew/autorouter/autorout.h b/pcbnew/autorouter/autorout.h
index b863039874..21948ad4a9 100644
--- a/pcbnew/autorouter/autorout.h
+++ b/pcbnew/autorouter/autorout.h
@@ -34,6 +34,7 @@
 
 
 #include <base_struct.h>
+#include <class_eda_rect.h>
 #include <layers_id_colors_and_visibility.h>
 
 
diff --git a/pcbnew/autorouter/routing_matrix.cpp b/pcbnew/autorouter/routing_matrix.cpp
index 6319562823..f3daa2e793 100644
--- a/pcbnew/autorouter/routing_matrix.cpp
+++ b/pcbnew/autorouter/routing_matrix.cpp
@@ -37,6 +37,7 @@
 #include <cell.h>
 #include <autorout.h>
 
+#include <class_eda_rect.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_track.h>