diff --git a/eeschema/dialogs/dialog_lib_textbox_properties.cpp b/eeschema/dialogs/dialog_lib_textbox_properties.cpp
index ad3ee6330e..79a8f052cc 100644
--- a/eeschema/dialogs/dialog_lib_textbox_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_textbox_properties.cpp
@@ -36,6 +36,7 @@
 #include <scintilla_tricks.h>
 #include <dialog_lib_textbox_properties.h>
 #include "symbol_editor_drawing_tools.h"
+#include <gr_text.h>
 
 DIALOG_LIB_TEXTBOX_PROPERTIES::DIALOG_LIB_TEXTBOX_PROPERTIES( SYMBOL_EDIT_FRAME* aParent,
                                                               LIB_TEXTBOX* aTextBox ) :
diff --git a/eeschema/dialogs/dialog_sheet_pin_properties.cpp b/eeschema/dialogs/dialog_sheet_pin_properties.cpp
index 4b8ca941b4..8ddc21fff3 100644
--- a/eeschema/dialogs/dialog_sheet_pin_properties.cpp
+++ b/eeschema/dialogs/dialog_sheet_pin_properties.cpp
@@ -33,6 +33,7 @@
 #include <dialog_sheet_pin_properties.h>
 #include <dialogs/html_message_box.h>
 #include <string_utils.h>
+#include <gr_text.h>
 
 
 DIALOG_SHEET_PIN_PROPERTIES::DIALOG_SHEET_PIN_PROPERTIES( SCH_EDIT_FRAME* parent,
diff --git a/eeschema/dialogs/dialog_text_properties.cpp b/eeschema/dialogs/dialog_text_properties.cpp
index fed38ad62b..67a8292029 100644
--- a/eeschema/dialogs/dialog_text_properties.cpp
+++ b/eeschema/dialogs/dialog_text_properties.cpp
@@ -39,6 +39,7 @@
 #include <string_utils.h>
 #include <scintilla_tricks.h>
 #include <dialog_text_properties.h>
+#include <gr_text.h>
 
 
 DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_ITEM* aTextItem ) :
diff --git a/eeschema/dialogs/dialog_update_from_pcb.cpp b/eeschema/dialogs/dialog_update_from_pcb.cpp
index d4431e3ace..caf350dd4c 100644
--- a/eeschema/dialogs/dialog_update_from_pcb.cpp
+++ b/eeschema/dialogs/dialog_update_from_pcb.cpp
@@ -28,6 +28,7 @@
 #include <sch_editor_control.h>
 #include "widgets/wx_html_report_panel.h"
 
+
 // Saved dialog settings
 DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB_SAVED_STATE
         DIALOG_UPDATE_FROM_PCB::s_savedDialogState{ false, true, true, true, false };
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index ec090101ea..fccfd82de8 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -34,6 +34,8 @@
 #include <trigo.h>
 #include <string_utils.h>
 #include "sch_painter.h"
+#include "plotters/plotter.h"
+
 
 // small margin in internal units between the pin text and the pin line
 #define PIN_TEXT_MARGIN 4
diff --git a/eeschema/lib_shape.cpp b/eeschema/lib_shape.cpp
index 0014b62e7d..306ef4fdd5 100644
--- a/eeschema/lib_shape.cpp
+++ b/eeschema/lib_shape.cpp
@@ -31,6 +31,7 @@
 #include <eda_draw_frame.h>
 #include <general.h>
 #include <lib_shape.h>
+#include "plotters/plotter.h"
 
 
 LIB_SHAPE::LIB_SHAPE( LIB_SYMBOL* aParent, SHAPE_T aShape, int aLineWidth, FILL_T aFillType,
diff --git a/eeschema/lib_textbox.cpp b/eeschema/lib_textbox.cpp
index 27b1d84713..b943d29497 100644
--- a/eeschema/lib_textbox.cpp
+++ b/eeschema/lib_textbox.cpp
@@ -31,7 +31,6 @@
 #include <schematic.h>
 #include <settings/color_settings.h>
 #include <sch_painter.h>
-#include <wx/log.h>
 #include <dialogs/html_message_box.h>
 #include <project/project_file.h>
 #include <project/net_settings.h>
@@ -39,6 +38,7 @@
 #include <trigo.h>
 #include <lib_textbox.h>
 
+
 using KIGFX::SCH_RENDER_SETTINGS;
 
 
diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index 35185fa4c1..80de0a2516 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -41,6 +41,7 @@
 #include <advanced_config.h>
 #include <connection_graph.h>
 #include "sch_painter.h"
+#include "plotters/plotter.h"
 
 
 SCH_BUS_ENTRY_BASE::SCH_BUS_ENTRY_BASE( KICAD_T aType, const VECTOR2I& pos, bool aFlipY ) :
diff --git a/eeschema/sch_item.h b/eeschema/sch_item.h
index 3ebf74082b..c219bd0bef 100644
--- a/eeschema/sch_item.h
+++ b/eeschema/sch_item.h
@@ -30,10 +30,11 @@
 #include <set>
 
 #include <eda_item.h>
-#include <plotters/plotter.h>
 #include <default_values.h>
 #include <sch_sheet_path.h>
 #include <netclass.h>
+#include <stroke_params.h>
+#include <layer_ids.h>
 
 class CONNECTION_GRAPH;
 class SCH_CONNECTION;
@@ -45,6 +46,7 @@ class wxFindReplaceData;
 class PLOTTER;
 class NETLIST_OBJECT;
 class NETLIST_OBJECT_LIST;
+class PLOTTER;
 
 using KIGFX::RENDER_SETTINGS;
 
diff --git a/eeschema/sch_line.h b/eeschema/sch_line.h
index 55ee42238d..ed599c423d 100644
--- a/eeschema/sch_line.h
+++ b/eeschema/sch_line.h
@@ -26,6 +26,8 @@
 #define _SCH_LINE_H_
 
 #include <sch_item.h>
+#include <wx/pen.h>     // for wxPenStyle
+#include <list>         // for std::list
 
 class NETLIST_OBJECT_LIST;
 
diff --git a/eeschema/sch_shape.cpp b/eeschema/sch_shape.cpp
index 9ef6c0bac8..57bb95250b 100644
--- a/eeschema/sch_shape.cpp
+++ b/eeschema/sch_shape.cpp
@@ -32,6 +32,7 @@
 #include <general.h>
 #include <schematic.h>
 #include <sch_shape.h>
+#include "plotters/plotter.h"
 
 
 SCH_SHAPE::SCH_SHAPE( SHAPE_T aShape, int aLineWidth, FILL_T aFillType, KICAD_T aType ) :
diff --git a/eeschema/sch_symbol.cpp b/eeschema/sch_symbol.cpp
index 32c67070b5..1f975bce20 100644
--- a/eeschema/sch_symbol.cpp
+++ b/eeschema/sch_symbol.cpp
@@ -37,6 +37,7 @@
 #include <refdes_utils.h>
 #include <wx/log.h>
 #include <string_utils.h>
+#include "plotters/plotter.h"
 
 
 /**
diff --git a/eeschema/sim/spice_library_parser.cpp b/eeschema/sim/spice_library_parser.cpp
index bd7ce29d67..c59e543350 100644
--- a/eeschema/sim/spice_library_parser.cpp
+++ b/eeschema/sim/spice_library_parser.cpp
@@ -44,7 +44,7 @@ namespace SIM_LIBRARY_SPICE_PARSER
 
     template <> struct librarySelector<modelUnit> : std::true_type {};
     template <> struct librarySelector<modelName> : std::true_type {};
-    
+
     // For debugging.
     template <> struct librarySelector<unknownLine> : std::true_type {};
 };
diff --git a/include/plotters/plotter.h b/include/plotters/plotter.h
index e74e994a4b..490d0c2f3a 100644
--- a/include/plotters/plotter.h
+++ b/include/plotters/plotter.h
@@ -41,6 +41,7 @@
 #include <stroke_params.h>
 #include <render_settings.h>
 
+
 class COLOR_SETTINGS;
 class SHAPE_ARC;
 class SHAPE_POLY_SET;