diff --git a/gerbview/am_param.cpp b/gerbview/am_param.cpp
index 0cd356e5d9..7e83b20512 100644
--- a/gerbview/am_param.cpp
+++ b/gerbview/am_param.cpp
@@ -29,7 +29,7 @@
 
 #include <am_param.h>
 #include <am_primitive.h>
-//#include <macros.h>
+#include <macros.h>
 
 #include <wx/debug.h>
 
diff --git a/gerbview/am_primitive.h b/gerbview/am_primitive.h
index b746dde40b..a6242875db 100644
--- a/gerbview/am_primitive.h
+++ b/gerbview/am_primitive.h
@@ -33,7 +33,6 @@
 #include <vector>
 #include <set>
 
-#include <eda_item.h>
 #include <am_param.h>
 #include <eda_rect.h>
 
diff --git a/gerbview/dcode.cpp b/gerbview/dcode.cpp
index 2617a3cc58..05d935c53f 100644
--- a/gerbview/dcode.cpp
+++ b/gerbview/dcode.cpp
@@ -29,6 +29,7 @@
  */
 
 #include <trigo.h>
+#include <eda_rect.h>
 #include <gerbview_frame.h>
 #include <gerber_file_image.h>
 #include <convert_to_biu.h>
diff --git a/gerbview/dcode.h b/gerbview/dcode.h
index d788fb0018..dabf827fde 100644
--- a/gerbview/dcode.h
+++ b/gerbview/dcode.h
@@ -32,7 +32,6 @@
 
 #include <vector>
 
-#include <eda_item.h>
 #include <gal/color4d.h>
 #include <geometry/shape_poly_set.h>
 
@@ -40,6 +39,7 @@ using KIGFX::COLOR4D;
 
 class wxDC;
 class GERBER_DRAW_ITEM;
+class EDA_RECT;
 
 
 /**
diff --git a/gerbview/gerbview_id.h b/gerbview/gerbview_id.h
index 784a9b1959..66f5085ec5 100644
--- a/gerbview/gerbview_id.h
+++ b/gerbview/gerbview_id.h
@@ -26,7 +26,6 @@
 #define __GERBVIEW_ID_H__
 
 #include <id.h>
-#include <pgm_base.h>
 
 /**
  * Please add IDs that are unique to the gerber file viewer (GerbView) here and not in