diff --git a/common/page_layout/page_layout_reader.cpp b/common/page_layout/page_layout_reader.cpp
index ed84607099..9a83643878 100644
--- a/common/page_layout/page_layout_reader.cpp
+++ b/common/page_layout/page_layout_reader.cpp
@@ -32,6 +32,7 @@
 #include <base_struct.h>
 #include <ws_painter.h>
 #include <ws_draw_item.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
 #include <page_layout/page_layout_reader_lexer.h>
 
diff --git a/common/page_layout/ws_data_item.cpp b/common/page_layout/ws_data_item.cpp
index 20f963e3c2..db8bc5621f 100644
--- a/common/page_layout/ws_data_item.cpp
+++ b/common/page_layout/ws_data_item.cpp
@@ -57,6 +57,7 @@
 #include <title_block.h>
 #include <ws_draw_item.h>
 #include <ws_data_model.h>
+#include <ws_data_item.h>
 
 using KIGFX::COLOR4D;
 
diff --git a/common/page_layout/ws_data_model.cpp b/common/page_layout/ws_data_model.cpp
index 5e50f97ffa..9eeb37480a 100644
--- a/common/page_layout/ws_data_model.cpp
+++ b/common/page_layout/ws_data_model.cpp
@@ -48,6 +48,7 @@
 #include <ws_painter.h>
 #include <title_block.h>
 #include <ws_draw_item.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
 
 
diff --git a/common/page_layout/ws_data_model_io.cpp b/common/page_layout/ws_data_model_io.cpp
index 86019523df..7728f68462 100644
--- a/common/page_layout/ws_data_model_io.cpp
+++ b/common/page_layout/ws_data_model_io.cpp
@@ -33,6 +33,7 @@
 #include <base_struct.h>
 #include <ws_painter.h>
 #include <ws_draw_item.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
 #include <math/vector2d.h>
 #include <page_layout/page_layout_reader_lexer.h>
diff --git a/common/page_layout/ws_draw_item.cpp b/common/page_layout/ws_draw_item.cpp
index c803992824..b2c4505979 100644
--- a/common/page_layout/ws_draw_item.cpp
+++ b/common/page_layout/ws_draw_item.cpp
@@ -51,6 +51,7 @@
 #include <eda_rect.h>
 #include <eda_draw_frame.h>
 #include <ws_draw_item.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
 #include <base_units.h>
 #include <page_info.h>
diff --git a/common/page_layout/ws_proxy_undo_item.cpp b/common/page_layout/ws_proxy_undo_item.cpp
index d98afe1eb7..70abb964df 100644
--- a/common/page_layout/ws_proxy_undo_item.cpp
+++ b/common/page_layout/ws_proxy_undo_item.cpp
@@ -22,7 +22,9 @@
  */
 
 #include <ws_proxy_undo_item.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
+#include <view/view.h>
 #include <eda_draw_frame.h>
 #include <macros.h>
 
diff --git a/include/ws_data_item.h b/include/ws_data_item.h
index 6577ff40df..1fab284b89 100644
--- a/include/ws_data_item.h
+++ b/include/ws_data_item.h
@@ -33,13 +33,17 @@
 #include <math/vector2d.h>
 #include <eda_text.h>
 #include <bitmap_base.h>
-#include <view/view.h>
 #include "ws_draw_item.h"
 
 class WS_DRAW_ITEM_TEXT;            // Forward declaration
 
 #define TB_DEFAULT_TEXTSIZE 1.5     // default worksheet text size in mm
 
+namespace KIGFX
+{
+class VIEW;
+}
+
 /**
  * A coordinate is relative to a page corner.
  * Any of the 4 corners can be a reference.
diff --git a/include/ws_data_model.h b/include/ws_data_model.h
index 67b2f8fbc9..c6ef7b7208 100644
--- a/include/ws_data_model.h
+++ b/include/ws_data_model.h
@@ -27,11 +27,10 @@
 
 #include <math/vector2d.h>
 #include <eda_text.h>
-#include <eda_text.h>
 #include <bitmap_base.h>
-#include <ws_data_item.h>
-
 
+class WS_DATA_ITEM;
+class PAGE_INFO;
 
 /**
  * WS_DATA_MODEL handles the graphic items list to draw/plot the frame and title block
diff --git a/pagelayout_editor/design_inspector.cpp b/pagelayout_editor/design_inspector.cpp
index cb75878b9e..28839e0581 100644
--- a/pagelayout_editor/design_inspector.cpp
+++ b/pagelayout_editor/design_inspector.cpp
@@ -26,13 +26,16 @@
 #include <wx/wupdlock.h>
 
 #include <ws_draw_item.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
-#include <pl_editor_id.h>
-#include <design_inspector.h>
 #include <tool/tool_manager.h>
-#include <tools/pl_actions.h>
-#include <tools/pl_selection_tool.h>
-#include <properties_frame.h>
+
+#include "dialogs/dialog_design_inspector_base.h"
+#include "design_inspector.h"
+#include "pl_editor_frame.h"
+#include "properties_frame.h"
+#include "tools/pl_actions.h"
+#include "tools/pl_selection_tool.h"
 
 /* XPM
  * This bitmap is used to show item types
diff --git a/pagelayout_editor/design_inspector.h b/pagelayout_editor/design_inspector.h
index aa705b71a6..eed39b9480 100644
--- a/pagelayout_editor/design_inspector.h
+++ b/pagelayout_editor/design_inspector.h
@@ -27,9 +27,9 @@
 #define  _DESIGN_INSPECTOR_H
 
 #include <vector>
-#include <dialog_design_inspector_base.h>
-#include <pl_editor_frame.h>
 
+class DIALOG_INSPECTOR_BASE;
+class PL_EDITOR_FRAME;
 
 /**
  * DESIGN_INSPECTOR is the left window showing the list of items
diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem.cpp b/pagelayout_editor/dialogs/dialog_new_dataitem.cpp
index 918e899b6e..ac926472da 100644
--- a/pagelayout_editor/dialogs/dialog_new_dataitem.cpp
+++ b/pagelayout_editor/dialogs/dialog_new_dataitem.cpp
@@ -22,10 +22,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pl_editor_frame.h>
 #include <ws_data_item.h>
-#include <dialog_new_dataitem_base.h>
 
+#include "dialog_new_dataitem_base.h"
+#include "pl_editor_frame.h"
 
 class DIALOG_NEW_DATAITEM : public DIALOG_NEW_DATAITEM_BASE
 {
diff --git a/pagelayout_editor/dialogs/dialogs_for_printing.cpp b/pagelayout_editor/dialogs/dialogs_for_printing.cpp
index afa91548cb..5a183d6949 100644
--- a/pagelayout_editor/dialogs/dialogs_for_printing.cpp
+++ b/pagelayout_editor/dialogs/dialogs_for_printing.cpp
@@ -27,14 +27,16 @@
  */
 
 #include <base_units.h>
-#include <pl_editor_frame.h>
-#include <pl_editor_id.h>
 #include <dialog_helpers.h>
 #include <ws_draw_item.h>
 #include <ws_data_item.h>
 #include <ws_data_model.h>
+#include <ws_painter.h>
 #include <dialog_page_settings.h>
-#include <invoke_pl_editor_dialog.h>
+
+#include "invoke_pl_editor_dialog.h"
+#include "pl_editor_frame.h"
+#include "pl_editor_id.h"
 
 /**
  * Custom print out for printing schematics.
diff --git a/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp b/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp
index 2e3a2df8fb..d5c3198c28 100644
--- a/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp
+++ b/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp
@@ -17,13 +17,13 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pl_editor_settings.h>
-#include <pl_editor_frame.h>
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <view/view.h>
 
 #include "panel_pl_editor_color_settings.h"
+#include "pl_editor_frame.h"
+#include "pl_editor_settings.h"
 
 
 PANEL_PL_EDITOR_COLOR_SETTINGS::PANEL_PL_EDITOR_COLOR_SETTINGS( PL_EDITOR_FRAME* aFrame,
diff --git a/pagelayout_editor/files.cpp b/pagelayout_editor/files.cpp
index e5a2f1b798..cbc11004f2 100644
--- a/pagelayout_editor/files.cpp
+++ b/pagelayout_editor/files.cpp
@@ -26,14 +26,13 @@
 
 #include <confirm.h>
 #include <gestfich.h>
-#include <ws_draw_item.h>
 #include <ws_data_model.h>
-#include <pl_editor_frame.h>
-#include <properties_frame.h>
-#include <pl_editor_id.h>
 #include <widgets/infobar.h>
 #include <wildcards_and_files_ext.h>
 
+#include "pl_editor_frame.h"
+#include "pl_editor_id.h"
+#include "properties_frame.h"
 
 bool PL_EDITOR_FRAME::saveCurrentPageLayout()
 {
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index a20fe3027c..3742803931 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -30,11 +30,12 @@
 #include <tool/action_menu.h>
 #include <tool/tool_manager.h>
 #include <tool/selection.h>
-#include <tools/pl_actions.h>
-#include <tools/pl_selection_tool.h>
+#include <widgets/wx_menubar.h>
+
 #include "pl_editor_frame.h"
 #include "pl_editor_id.h"
-#include <widgets/wx_menubar.h>
+#include "tools/pl_actions.h"
+#include "tools/pl_selection_tool.h"
 
 
 void PL_EDITOR_FRAME::ReCreateMenuBar()
diff --git a/pagelayout_editor/pl_draw_panel_gal.cpp b/pagelayout_editor/pl_draw_panel_gal.cpp
index a8f370a952..f03b1f1ab3 100644
--- a/pagelayout_editor/pl_draw_panel_gal.cpp
+++ b/pagelayout_editor/pl_draw_panel_gal.cpp
@@ -17,24 +17,26 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "pl_draw_panel_gal.h"
+#include <functional>
+#include <memory>
+
 #include <view/view.h>
 #include <tool/tool_manager.h>
-#include <tools/pl_actions.h>
 #include <view/wx_view_controls.h>
 #include <ws_proxy_view_item.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
 #include <ws_painter.h>
 #include <pgm_base.h>
 #include <kiway.h>
-#include <pl_editor_frame.h>
-#include <pl_editor_settings.h>
 #include <settings/settings_manager.h>
 #include <gal/graphics_abstraction_layer.h>
 
-#include <functional>
-#include <memory>
-#include <tools/pl_selection_tool.h>
+#include "pl_draw_panel_gal.h"
+#include "pl_editor_frame.h"
+#include "pl_editor_settings.h"
+#include "tools/pl_actions.h"
+#include "tools/pl_selection_tool.h"
 
 using namespace std::placeholders;
 
diff --git a/pagelayout_editor/pl_draw_panel_gal.h b/pagelayout_editor/pl_draw_panel_gal.h
index 8bcd8a225b..8cd723f414 100644
--- a/pagelayout_editor/pl_draw_panel_gal.h
+++ b/pagelayout_editor/pl_draw_panel_gal.h
@@ -21,9 +21,13 @@
 #define PL_DRAW_PANEL_GAL_H
 
 #include <class_draw_panel_gal.h>
-#include <ws_proxy_view_item.h>
-#include <ws_painter.h>
 
+namespace KIGFX
+{
+    class WS_PROXY_VIEW_ITEM;
+}
+
+class WS_DRAW_ITEM_PAGE;
 
 class PL_DRAW_PANEL_GAL : public EDA_DRAW_PANEL_GAL
 {
diff --git a/pagelayout_editor/pl_editor.cpp b/pagelayout_editor/pl_editor.cpp
index 95ebe92890..791a9ed119 100644
--- a/pagelayout_editor/pl_editor.cpp
+++ b/pagelayout_editor/pl_editor.cpp
@@ -34,10 +34,11 @@
 #include <confirm.h>
 #include <gestfich.h>
 #include <pgm_base.h>
-#include <pl_editor_frame.h>
-#include <pl_editor_settings.h>
 #include <settings/settings_manager.h>
 
+#include "pl_editor_frame.h"
+#include "pl_editor_settings.h"
+
 
 namespace PGE {
 
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index 310151ee5e..82c86bba37 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/pagelayout_editor/pl_editor_frame.cpp
@@ -27,13 +27,8 @@
 #include <pgm_base.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
-#include <dialogs/panel_pl_editor_color_settings.h>
-#include <pl_editor_frame.h>
-#include <pl_editor_id.h>
-#include <pl_editor_settings.h>
-#include <pl_draw_panel_gal.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
-#include <properties_frame.h>
 #include <widgets/paged_dialog.h>
 #include <panel_gal_display_options.h>
 #include <panel_hotkeys_editor.h>
@@ -43,23 +38,28 @@
 #include <tool/selection.h>
 #include <tool/action_toolbar.h>
 #include <tool/editor_conditions.h>
-#include <tool/selection_conditions.h>
 #include <tool/tool_dispatcher.h>
 #include <tool/tool_manager.h>
 #include <tool/common_control.h>
 #include <tool/common_tools.h>
 #include <tool/picker_tool.h>
 #include <tool/zoom_tool.h>
-#include <tools/pl_actions.h>
-#include <tools/pl_selection_tool.h>
-#include <tools/pl_drawing_tools.h>
-#include <tools/pl_edit_tool.h>
-#include <tools/pl_point_editor.h>
-#include <invoke_pl_editor_dialog.h>
-#include <tools/pl_editor_control.h>
 #include <widgets/infobar.h>
 #include <settings/settings_manager.h>
 
+#include "dialogs/panel_pl_editor_color_settings.h"
+#include "pl_editor_frame.h"
+#include "pl_editor_id.h"
+#include "pl_editor_settings.h"
+#include "properties_frame.h"
+#include "tools/pl_actions.h"
+#include "tools/pl_selection_tool.h"
+#include "tools/pl_drawing_tools.h"
+#include "tools/pl_edit_tool.h"
+#include "tools/pl_point_editor.h"
+#include "invoke_pl_editor_dialog.h"
+#include "tools/pl_editor_control.h"
+
 BEGIN_EVENT_TABLE( PL_EDITOR_FRAME, EDA_DRAW_FRAME )
     EVT_MENU( wxID_CLOSE, PL_EDITOR_FRAME::OnExit )
     EVT_MENU( wxID_EXIT, PL_EDITOR_FRAME::OnExit )
diff --git a/pagelayout_editor/pl_editor_frame.h b/pagelayout_editor/pl_editor_frame.h
index 0e20c8ba04..ad83f4f60a 100644
--- a/pagelayout_editor/pl_editor_frame.h
+++ b/pagelayout_editor/pl_editor_frame.h
@@ -30,9 +30,10 @@
 #include <config_params.h>
 #include <eda_draw_frame.h>
 #include <base_screen.h>
-#include <pl_editor_layout.h>
-#include <pl_draw_panel_gal.h>
+#include "pl_editor_layout.h"
+#include "pl_draw_panel_gal.h"
 
+class PL_DRAW_PANEL_GAL;
 class PROPERTIES_FRAME;
 class WS_DATA_ITEM;
 
diff --git a/pagelayout_editor/pl_editor_layout.cpp b/pagelayout_editor/pl_editor_layout.cpp
index 2ed97b0cf2..1a75d467be 100644
--- a/pagelayout_editor/pl_editor_layout.cpp
+++ b/pagelayout_editor/pl_editor_layout.cpp
@@ -30,7 +30,7 @@
 #include <climits>
 
 #include <eda_rect.h>
-#include <pl_editor_layout.h>
+#include "pl_editor_layout.h"
 
 PL_EDITOR_LAYOUT::PL_EDITOR_LAYOUT()
 {
diff --git a/pagelayout_editor/pl_editor_layout.h b/pagelayout_editor/pl_editor_layout.h
index df03f6ccda..c87544fce5 100644
--- a/pagelayout_editor/pl_editor_layout.h
+++ b/pagelayout_editor/pl_editor_layout.h
@@ -28,7 +28,6 @@
 #ifndef CLASS_PL_EDITOR_LAYOUT_H
 #define CLASS_PL_EDITOR_LAYOUT_H
 
-#include <base_struct.h>
 #include <page_info.h>
 #include <title_block.h>
 #include <ws_draw_item.h>
diff --git a/pagelayout_editor/pl_editor_settings.cpp b/pagelayout_editor/pl_editor_settings.cpp
index d4ff3a75a6..01d6a1f178 100644
--- a/pagelayout_editor/pl_editor_settings.cpp
+++ b/pagelayout_editor/pl_editor_settings.cpp
@@ -21,10 +21,10 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
 
-#include <pl_editor_settings.h>
 #include <settings/parameters.h>
 #include <wx/config.h>
 
+#include "pl_editor_settings.h"
 
 ///! Update the schema version whenever a migration is required
 const int plEditorSchemaVersion = 0;
diff --git a/pagelayout_editor/pl_editor_undo_redo.cpp b/pagelayout_editor/pl_editor_undo_redo.cpp
index c9f3a32d4b..439101e199 100644
--- a/pagelayout_editor/pl_editor_undo_redo.cpp
+++ b/pagelayout_editor/pl_editor_undo_redo.cpp
@@ -24,12 +24,12 @@
  */
 
 #include <ws_data_model.h>
-#include <pl_editor_frame.h>
-#include <tool/tool_manager.h>
-#include <tools/pl_selection_tool.h>
 #include <ws_proxy_undo_item.h>
+#include <tool/tool_manager.h>
 #include <tool/actions.h>
 
+#include "pl_editor_frame.h"
+#include "tools/pl_selection_tool.h"
 
 void PL_EDITOR_FRAME::SaveCopyInUndoList()
 {
diff --git a/pagelayout_editor/properties_frame.cpp b/pagelayout_editor/properties_frame.cpp
index 39b99edcee..a89d95d037 100644
--- a/pagelayout_editor/properties_frame.cpp
+++ b/pagelayout_editor/properties_frame.cpp
@@ -23,14 +23,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <ws_draw_item.h>
-#include <ws_data_model.h>
 #include <project.h>
-#include <properties_frame.h>
-#include <tool/tool_manager.h>
-#include <tools/pl_selection_tool.h>
-#include <pl_draw_panel_gal.h>
 #include <scintilla_tricks.h>
+#include <tool/tool_manager.h>
+#include <ws_draw_item.h>
+#include <ws_data_item.h>
+#include <ws_data_model.h>
+#include <view/view.h>
+
+#include "properties_frame.h"
+#include "pl_draw_panel_gal.h"
+#include "pl_editor_frame.h"
+#include "tools/pl_selection_tool.h"
 
 PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ) :
         PANEL_PROPERTIES_BASE( aParent ),
diff --git a/pagelayout_editor/properties_frame.h b/pagelayout_editor/properties_frame.h
index 9e3dc5f826..ec618d29db 100644
--- a/pagelayout_editor/properties_frame.h
+++ b/pagelayout_editor/properties_frame.h
@@ -29,11 +29,11 @@
 #ifndef  _PROPERTIES_FRAME_H
 #define  _PROPERTIES_FRAME_H
 
-#include <pl_editor_frame.h>
-#include <dialogs/properties_frame_base.h>
-#include <scintilla_tricks.h>
+#include "dialogs/properties_frame_base.h"
 
 class WS_DATA_ITEM;
+class PL_EDITOR_FRAME;
+class SCINTILLA_TRICKS;
 
 /**
  * PROPERTIES_FRAME display properties of the current item.
diff --git a/pagelayout_editor/toolbars_pl_editor.cpp b/pagelayout_editor/toolbars_pl_editor.cpp
index a92a3624a3..06dd0ab609 100644
--- a/pagelayout_editor/toolbars_pl_editor.cpp
+++ b/pagelayout_editor/toolbars_pl_editor.cpp
@@ -21,9 +21,10 @@
 
 #include <bitmaps.h>
 #include <tool/action_toolbar.h>
-#include <tools/pl_actions.h>
-#include <pl_editor_id.h>
-#include <pl_editor_frame.h>
+
+#include "pl_editor_id.h"
+#include "pl_editor_frame.h"
+#include "tools/pl_actions.h"
 
 void PL_EDITOR_FRAME::ReCreateHToolbar()
 {
diff --git a/pagelayout_editor/tools/pl_actions.cpp b/pagelayout_editor/tools/pl_actions.cpp
index cd77de66e1..a1d8468243 100644
--- a/pagelayout_editor/tools/pl_actions.cpp
+++ b/pagelayout_editor/tools/pl_actions.cpp
@@ -24,9 +24,9 @@
 
 #include <tool/tool_action.h>
 #include <bitmaps.h>
-#include <tools/pl_actions.h>
 #include <ws_data_item.h>
 
+#include "tools/pl_actions.h"
 
 // Actions, being statically-defined, require specialized I18N handling.  We continue to
 // use the _() macro so that string harvesting by the I18N framework doesn't have to be
diff --git a/pagelayout_editor/tools/pl_drawing_tools.cpp b/pagelayout_editor/tools/pl_drawing_tools.cpp
index 0b3c2bdb9f..94ffa0828f 100644
--- a/pagelayout_editor/tools/pl_drawing_tools.cpp
+++ b/pagelayout_editor/tools/pl_drawing_tools.cpp
@@ -22,22 +22,23 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pl_editor_frame.h>
 #include <class_draw_panel_gal.h>
-#include <pl_editor_id.h>
 #include <confirm.h>
 #include <view/view_group.h>
 #include <view/view_controls.h>
 #include <view/view.h>
 #include <tool/tool_manager.h>
-#include <tools/pl_actions.h>
-#include <tools/pl_selection_tool.h>
-#include <tools/pl_drawing_tools.h>
 #include <bitmaps.h>
 #include <ws_draw_item.h>
 #include <ws_data_item.h>
-#include <invoke_pl_editor_dialog.h>
+
+#include "invoke_pl_editor_dialog.h"
+#include "pl_editor_frame.h"
+#include "pl_editor_id.h"
 #include "pl_point_editor.h"
+#include "tools/pl_actions.h"
+#include "tools/pl_selection_tool.h"
+#include "tools/pl_drawing_tools.h"
 
 PL_DRAWING_TOOLS::PL_DRAWING_TOOLS() :
         TOOL_INTERACTIVE( "plEditor.InteractiveDrawing" ),
diff --git a/pagelayout_editor/tools/pl_edit_tool.cpp b/pagelayout_editor/tools/pl_edit_tool.cpp
index dd6c575969..a72a3ec583 100644
--- a/pagelayout_editor/tools/pl_edit_tool.cpp
+++ b/pagelayout_editor/tools/pl_edit_tool.cpp
@@ -24,18 +24,21 @@
 
 #include <tool/tool_manager.h>
 #include <tool/picker_tool.h>
-#include <tools/pl_selection_tool.h>
-#include <tools/pl_actions.h>
-#include <tools/pl_edit_tool.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
 #include <ws_draw_item.h>
 #include <bitmaps.h>
 #include <confirm.h>
 #include <base_struct.h>
-#include <pl_editor_frame.h>
-#include <pl_editor_id.h>
+#include <view/view.h>
 #include <math/util.h>      // for KiROUND
 
+#include "tools/pl_selection_tool.h"
+#include "tools/pl_actions.h"
+#include "tools/pl_edit_tool.h"
+#include "pl_draw_panel_gal.h"
+#include "pl_editor_frame.h"
+#include "pl_editor_id.h"
 
 PL_EDIT_TOOL::PL_EDIT_TOOL() :
         TOOL_INTERACTIVE( "plEditor.InteractiveEdit" ),
diff --git a/pagelayout_editor/tools/pl_editor_control.cpp b/pagelayout_editor/tools/pl_editor_control.cpp
index f1f919b685..5389c98547 100644
--- a/pagelayout_editor/tools/pl_editor_control.cpp
+++ b/pagelayout_editor/tools/pl_editor_control.cpp
@@ -25,18 +25,19 @@
 #include <kiway.h>
 #include <view/view.h>
 #include <tool/tool_manager.h>
-#include <tools/pl_actions.h>
-#include <tools/pl_editor_control.h>
-#include <tools/pl_selection_tool.h>
-#include <pl_editor_frame.h>
 #include <ws_painter.h>
 #include <confirm.h>
 #include <bitmaps.h>
-#include <properties_frame.h>
-#include <pl_editor_id.h>
 #include <dialog_page_settings.h>
 #include <ws_data_model.h>
 
+#include "pl_editor_frame.h"
+#include "pl_editor_id.h"
+#include "properties_frame.h"
+#include "tools/pl_actions.h"
+#include "tools/pl_editor_control.h"
+#include "tools/pl_selection_tool.h"
+
 bool PL_EDITOR_CONTROL::Init()
 {
     m_frame = getEditFrame<PL_EDITOR_FRAME>();
diff --git a/pagelayout_editor/tools/pl_point_editor.cpp b/pagelayout_editor/tools/pl_point_editor.cpp
index a85bebe225..edd7b984ce 100644
--- a/pagelayout_editor/tools/pl_point_editor.cpp
+++ b/pagelayout_editor/tools/pl_point_editor.cpp
@@ -25,11 +25,8 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include "pl_point_editor.h"
 #include <tool/tool_manager.h>
 #include <tool/actions.h>
-#include <tools/pl_actions.h>
-#include <tools/pl_selection_tool.h>
 #include <view/view_controls.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <geometry/seg.h>
@@ -37,11 +34,14 @@ using namespace std::placeholders;
 
 #include <bitmaps.h>
 #include <status_popup.h>
-#include <pl_editor_frame.h>
 #include <ws_draw_item.h>
 #include <widgets/progress_reporter.h>
-#include <pl_editor_id.h>
 
+#include "pl_editor_frame.h"
+#include "pl_editor_id.h"
+#include "pl_point_editor.h"
+#include "tools/pl_actions.h"
+#include "tools/pl_selection_tool.h"
 
 // Few constants to avoid using bare numbers for point indices
 enum RECTANGLE_POINTS
diff --git a/pagelayout_editor/tools/pl_selection.cpp b/pagelayout_editor/tools/pl_selection.cpp
index 3e6b407234..35199f49fa 100644
--- a/pagelayout_editor/tools/pl_selection.cpp
+++ b/pagelayout_editor/tools/pl_selection.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <tools/pl_selection.h>
+#include "tools/pl_selection.h"
 
 
 EDA_ITEM* PL_SELECTION::GetTopLeftItem( bool onlyModules ) const
diff --git a/pagelayout_editor/tools/pl_selection_tool.cpp b/pagelayout_editor/tools/pl_selection_tool.cpp
index 18c50d28ff..9363c629bd 100644
--- a/pagelayout_editor/tools/pl_selection_tool.cpp
+++ b/pagelayout_editor/tools/pl_selection_tool.cpp
@@ -27,17 +27,19 @@
 #include <view/view.h>
 #include <view/view_controls.h>
 #include <preview_items/selection_area.h>
-#include <pl_editor_frame.h>
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
 #include <tool/selection.h>
-#include <tools/pl_actions.h>
+#include <ws_data_item.h>
 #include <ws_data_model.h>
 #include <ws_draw_item.h>
 #include <collector.h>
-#include "pl_selection_tool.h"
 #include <math/util.h>      // for KiROUND
 
+#include "pl_editor_frame.h"
+#include "pl_selection_tool.h"
+#include "tools/pl_actions.h"
+
 /**
  * The maximum number of items in the clarify selection context menu.  The current
  * setting of 40 is arbitrary.
diff --git a/pagelayout_editor/tools/pl_selection_tool.h b/pagelayout_editor/tools/pl_selection_tool.h
index bdc0205fd8..1c969b626d 100644
--- a/pagelayout_editor/tools/pl_selection_tool.h
+++ b/pagelayout_editor/tools/pl_selection_tool.h
@@ -27,7 +27,7 @@
 
 #include <tool/tool_interactive.h>
 #include <tool/tool_menu.h>
-#include <tools/pl_selection.h>
+#include "tools/pl_selection.h"
 
 class PL_EDITOR_FRAME;
 class SCH_ITEM;