diff --git a/gerbview/gerbview_draw_panel_gal.cpp b/gerbview/gerbview_draw_panel_gal.cpp
index 66c3b3a1da..848dc21646 100644
--- a/gerbview/gerbview_draw_panel_gal.cpp
+++ b/gerbview/gerbview_draw_panel_gal.cpp
@@ -26,6 +26,7 @@
 
 #include <gerbview_frame.h>
 #include <gal/graphics_abstraction_layer.h>
+#include <pgm_base.h>
 #include <settings/settings_manager.h>
 
 #include <gerber_file_image.h>
diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h
index ea03811c89..66a8aae4a6 100644
--- a/gerbview/gerbview_frame.h
+++ b/gerbview/gerbview_frame.h
@@ -23,7 +23,6 @@
 #define  WX_GERBER_STRUCT_H
 
 #include <filehistory.h>
-#include <pgm_base.h>
 #include <config_params.h>
 #include <eda_draw_frame.h>
 #include <layers_id_colors_and_visibility.h>
diff --git a/gerbview/tools/gerbview_control.cpp b/gerbview/tools/gerbview_control.cpp
index 6c60abf756..0fd669bc9c 100644
--- a/gerbview/tools/gerbview_control.cpp
+++ b/gerbview/tools/gerbview_control.cpp
@@ -29,6 +29,7 @@
 #include <excellon_image.h>
 #include <menus_helpers.h>
 #include <tool/tool_manager.h>
+#include <project.h>
 #include <view/view.h>
 #include <wildcards_and_files_ext.h>
 #include <wx/filedlg.h>
diff --git a/gerbview/tools/gerbview_inspection_tool.cpp b/gerbview/tools/gerbview_inspection_tool.cpp
index dcb5b34aef..71754609ec 100644
--- a/gerbview/tools/gerbview_inspection_tool.cpp
+++ b/gerbview/tools/gerbview_inspection_tool.cpp
@@ -29,6 +29,7 @@
 #include "gerbview_inspection_tool.h"
 #include "gerbview_actions.h"
 #include <painter.h>
+#include <pgm_base.h>
 #include <preview_items/ruler_item.h>
 #include <preview_items/selection_area.h>
 #include <tool/tool_event.h>