diff --git a/common/board_printout.cpp b/common/board_printout.cpp
index 697373e934..603a2649eb 100644
--- a/common/board_printout.cpp
+++ b/common/board_printout.cpp
@@ -28,7 +28,7 @@
 
 #include <view/view.h>
 #include <gal/gal_print.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <pcbplot.h>
 #include <settings/app_settings.h>
 
diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index e7701e0d1b..a5b8fb7838 100644
--- a/common/draw_panel_gal.cpp
+++ b/common/draw_panel_gal.cpp
@@ -35,7 +35,7 @@
 #include <class_draw_panel_gal.h>
 #include <view/view.h>
 #include <view/wx_view_controls.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <base_screen.h>
 #include <gal/cursors.h>
 #include <gal/graphics_abstraction_layer.h>
diff --git a/common/gal/CMakeLists.txt b/common/gal/CMakeLists.txt
index 0c29473053..8e0f9ecec9 100644
--- a/common/gal/CMakeLists.txt
+++ b/common/gal/CMakeLists.txt
@@ -4,7 +4,7 @@ set( GAL_SRCS
     ../callback_gal.cpp
     ../gl_context_mgr.cpp
     ../newstroke_font.cpp
-    ../painter.cpp
+    painter.cpp
     color4d.cpp
     cursors.cpp
     dpi_scaling.cpp
diff --git a/common/painter.cpp b/common/gal/painter.cpp
similarity index 98%
rename from common/painter.cpp
rename to common/gal/painter.cpp
index 84f3ce30ba..36ce750d68 100644
--- a/common/painter.cpp
+++ b/common/gal/painter.cpp
@@ -24,7 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <painter.h>
+#include <gal/painter.h>
 #include <gal/graphics_abstraction_layer.h>
 
 using namespace KIGFX;
diff --git a/common/preview_items/polygon_item.cpp b/common/preview_items/polygon_item.cpp
index a38c7b7130..a7560a3c15 100644
--- a/common/preview_items/polygon_item.cpp
+++ b/common/preview_items/polygon_item.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <preview_items/polygon_item.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <view/view.h>
 
 using namespace KIGFX::PREVIEW;
diff --git a/common/preview_items/preview_utils.cpp b/common/preview_items/preview_utils.cpp
index 649d39f500..71ceca5548 100644
--- a/common/preview_items/preview_utils.cpp
+++ b/common/preview_items/preview_utils.cpp
@@ -20,7 +20,7 @@
 #include <preview_items/preview_utils.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <base_units.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <view/view.h>
 #include <gal/hidpi_gl_canvas.h>
 
diff --git a/common/preview_items/ruler_item.cpp b/common/preview_items/ruler_item.cpp
index 936f52cca7..faeb78cdd6 100644
--- a/common/preview_items/ruler_item.cpp
+++ b/common/preview_items/ruler_item.cpp
@@ -25,7 +25,7 @@
 #include <preview_items/preview_utils.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <layer_ids.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <view/view.h>
 #include <trigo.h>
 
diff --git a/common/preview_items/selection_area.cpp b/common/preview_items/selection_area.cpp
index ce9f9db328..1fe368f419 100644
--- a/common/preview_items/selection_area.cpp
+++ b/common/preview_items/selection_area.cpp
@@ -25,7 +25,7 @@
 #include <preview_items/selection_area.h>
 
 #include <gal/graphics_abstraction_layer.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <view/view.h>
 
 using namespace KIGFX::PREVIEW;
diff --git a/common/tool/common_tools.cpp b/common/tool/common_tools.cpp
index 794785a25c..0c82821c87 100644
--- a/common/tool/common_tools.cpp
+++ b/common/tool/common_tools.cpp
@@ -25,7 +25,7 @@
 
 #include <base_screen.h>
 #include <base_units.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <bitmaps.h>
 #include <class_draw_panel_gal.h>
 #include <dialogs/dialog_configure_paths.h>
diff --git a/common/tool/edit_points.cpp b/common/tool/edit_points.cpp
index e75ebf58c9..b1d0803337 100644
--- a/common/tool/edit_points.cpp
+++ b/common/tool/edit_points.cpp
@@ -25,7 +25,7 @@
 
 #include <gal/graphics_abstraction_layer.h>
 #include <gal/color4d.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <math/util.h>      // for KiROUND
 #include "tool/edit_points.h"
 
diff --git a/common/tool/editor_conditions.cpp b/common/tool/editor_conditions.cpp
index 9b7064afc6..20fe63d73b 100644
--- a/common/tool/editor_conditions.cpp
+++ b/common/tool/editor_conditions.cpp
@@ -24,7 +24,7 @@
 
 
 #include <view/view.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <class_draw_panel_gal.h>
 #include <eda_base_frame.h>
 #include <eda_draw_frame.h>
diff --git a/common/view/view.cpp b/common/view/view.cpp
index 6c7d992cb1..70baf96fb3 100644
--- a/common/view/view.cpp
+++ b/common/view/view.cpp
@@ -38,7 +38,7 @@
 
 #include <gal/definitions.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <painter.h>
+#include <gal/painter.h>
 
 #include <profile.h>
 
diff --git a/common/view/view_group.cpp b/common/view/view_group.cpp
index c47ede0e07..204fe42258 100644
--- a/common/view/view_group.cpp
+++ b/common/view/view_group.cpp
@@ -36,7 +36,7 @@
 #include <view/view_group.h>
 #include <view/view.h>
 #include <view/view_item.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <layer_ids.h>
 
diff --git a/common/view/view_overlay.cpp b/common/view/view_overlay.cpp
index 49ae125e49..e3fb530d1d 100644
--- a/common/view/view_overlay.cpp
+++ b/common/view/view_overlay.cpp
@@ -28,7 +28,7 @@
 #include <view/view_item.h>
 #include <view/view_overlay.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <painter.h>
+#include <gal/painter.h>
 
 #include <layer_ids.h>
 #include <geometry/seg.h>
diff --git a/eeschema/sch_painter.h b/eeschema/sch_painter.h
index 1a3896ea25..97fbaf6093 100644
--- a/eeschema/sch_painter.h
+++ b/eeschema/sch_painter.h
@@ -29,7 +29,7 @@
 
 #include <sch_symbol.h>
 
-#include <painter.h>
+#include <gal/painter.h>
 
 
 class LIB_PIN;
diff --git a/gerbview/gerbview_painter.h b/gerbview/gerbview_painter.h
index 20efa041c2..51facc76c2 100644
--- a/gerbview/gerbview_painter.h
+++ b/gerbview/gerbview_painter.h
@@ -22,7 +22,7 @@
 #define __GERBVIEW_PAINTER_H
 
 #include <layer_ids.h>
-#include <painter.h>
+#include <gal/painter.h>
 
 #include <dcode.h>
 #include <gbr_display_options.h>
diff --git a/gerbview/tools/gerbview_inspection_tool.cpp b/gerbview/tools/gerbview_inspection_tool.cpp
index 0be34a4d22..0bc141b939 100644
--- a/gerbview/tools/gerbview_inspection_tool.cpp
+++ b/gerbview/tools/gerbview_inspection_tool.cpp
@@ -28,7 +28,7 @@
 #include <gerbview_id.h>
 #include "gerbview_inspection_tool.h"
 #include "gerbview_actions.h"
-#include <painter.h>
+#include <gal/painter.h>
 #include <pgm_base.h>
 #include <preview_items/ruler_item.h>
 #include <preview_items/selection_area.h>
diff --git a/gerbview/tools/gerbview_selection_tool.cpp b/gerbview/tools/gerbview_selection_tool.cpp
index 0c079d9c4c..c2ec56ef1d 100644
--- a/gerbview/tools/gerbview_selection_tool.cpp
+++ b/gerbview/tools/gerbview_selection_tool.cpp
@@ -29,7 +29,7 @@ using namespace std::placeholders;
 #include <string_utils.h>
 #include <view/view.h>
 #include <view/view_group.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
 #include "gerbview_selection_tool.h"
diff --git a/include/drawing_sheet/ds_painter.h b/include/drawing_sheet/ds_painter.h
index b554831aef..c2d9193cd9 100644
--- a/include/drawing_sheet/ds_painter.h
+++ b/include/drawing_sheet/ds_painter.h
@@ -27,7 +27,7 @@
 #define DS_PAINTER_H
 
 #include <gal/color4d.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <page_info.h>
 #include <drawing_sheet/ds_draw_item.h>
 
diff --git a/include/painter.h b/include/gal/painter.h
similarity index 100%
rename from include/painter.h
rename to include/gal/painter.h
diff --git a/include/preview_items/draw_context.h b/include/preview_items/draw_context.h
index 28d0c15090..1dbb277816 100644
--- a/include/preview_items/draw_context.h
+++ b/include/preview_items/draw_context.h
@@ -24,7 +24,7 @@
 #ifndef PREVIEW_PREVIEW_DRAW_CONTEXT__H_
 #define PREVIEW_PREVIEW_DRAW_CONTEXT__H_
 
-#include <painter.h>
+#include <gal/painter.h>
 #include <math/vector2d.h>
 
 namespace KIGFX
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index 7fda7802b2..3b93c955e7 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/pagelayout_editor/pl_editor_frame.cpp
@@ -32,7 +32,7 @@
 #include <panel_hotkeys_editor.h>
 #include <confirm.h>
 #include <kiplatform/app.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <wildcards_and_files_ext.h>
 #include <tool/selection.h>
 #include <tool/action_toolbar.h>
diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index 6960dd0781..7ff6509522 100644
--- a/pcbnew/cross-probing.cpp
+++ b/pcbnew/cross-probing.cpp
@@ -45,7 +45,7 @@
 #include <string_utils.h>
 #include <netlist_reader/pcb_netlist.h>
 #include <netlist_reader/board_netlist_updater.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
 #include <render_settings.h>
diff --git a/pcbnew/pcb_painter.h b/pcbnew/pcb_painter.h
index c785f2d804..fcee512654 100644
--- a/pcbnew/pcb_painter.h
+++ b/pcbnew/pcb_painter.h
@@ -29,7 +29,7 @@
 #define PCB_PAINTER_H
 
 #include <frame_type.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <pcb_display_options.h>
 #include <math/vector2d.h>
 #include <memory>
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index ab08aa0173..7becf9cd69 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -49,7 +49,7 @@ using namespace std::placeholders;
 #include <confirm.h>
 #include <bitmaps.h>
 #include <string_utils.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <tool/action_menu.h>
 #include <tool/tool_manager.h>
 #include <tool/tool_menu.h>
diff --git a/pcbnew/tools/drawing_stackup_table_tool.cpp b/pcbnew/tools/drawing_stackup_table_tool.cpp
index 5efc0dc25b..314a5da79d 100644
--- a/pcbnew/tools/drawing_stackup_table_tool.cpp
+++ b/pcbnew/tools/drawing_stackup_table_tool.cpp
@@ -29,7 +29,7 @@
 #include <tool/tool_manager.h>
 #include <board_commit.h>
 #include <scoped_set_reset.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <tools/zone_filler_tool.h>
 #include <board_design_settings.h>
 #include <footprint.h>
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 00633510fe..0ef2137bdb 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -58,7 +58,7 @@
 #include <confirm.h>
 #include <footprint.h>
 #include <macros.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <pcb_edit_frame.h>
 #include <pcb_group.h>
 #include <pcb_bitmap.h>
diff --git a/pcbnew/tools/pcb_grid_helper.cpp b/pcbnew/tools/pcb_grid_helper.cpp
index f6889c63b9..2914339bc3 100644
--- a/pcbnew/tools/pcb_grid_helper.cpp
+++ b/pcbnew/tools/pcb_grid_helper.cpp
@@ -42,7 +42,7 @@
 #include <geometry/shape_simple.h>
 #include <macros.h>
 #include <math/util.h> // for KiROUND
-#include <painter.h>
+#include <gal/painter.h>
 #include <pcbnew_settings.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_tool_base.h>
diff --git a/pcbnew/tools/pcb_selection.cpp b/pcbnew/tools/pcb_selection.cpp
index 73c7132cf6..37758810a9 100644
--- a/pcbnew/tools/pcb_selection.cpp
+++ b/pcbnew/tools/pcb_selection.cpp
@@ -35,7 +35,7 @@ using namespace std::placeholders;
 #include <class_draw_panel_gal.h>
 #include <view/view_controls.h>
 #include <view/view_group.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <bitmaps.h>
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp
index 562370bff4..99f9c41002 100644
--- a/pcbnew/tools/pcb_selection_tool.cpp
+++ b/pcbnew/tools/pcb_selection_tool.cpp
@@ -51,7 +51,7 @@ using namespace std::placeholders;
 #include <class_draw_panel_gal.h>
 #include <view/view_controls.h>
 #include <preview_items/selection_area.h>
-#include <painter.h>
+#include <gal/painter.h>
 #include <router/router_tool.h>
 #include <pcbnew_settings.h>
 #include <tool/tool_event.h>