diff --git a/rtengine/guidedfilter.cc b/rtengine/guidedfilter.cc
index ad3beec51..f83560cfc 100644
--- a/rtengine/guidedfilter.cc
+++ b/rtengine/guidedfilter.cc
@@ -29,6 +29,7 @@
  * available at https://arxiv.org/abs/1505.00996
 */
 
+#include "array2D.h"
 #include "boxblur.h"
 #include "guidedfilter.h"
 #include "imagefloat.h"
diff --git a/rtengine/imagesource.h b/rtengine/imagesource.h
index e0c26aa9f..2ef2554bc 100644
--- a/rtengine/imagesource.h
+++ b/rtengine/imagesource.h
@@ -25,7 +25,6 @@
 
 #include "coord2d.h"
 #include "imagedata.h"
-#include "LUT.h"
 #include "rtengine.h"
 
 template<typename T>
diff --git a/rtengine/ipdehaze.cc b/rtengine/ipdehaze.cc
index 28a0f2d57..38e35c612 100644
--- a/rtengine/ipdehaze.cc
+++ b/rtengine/ipdehaze.cc
@@ -32,6 +32,7 @@
 #include <iostream>
 #include <vector>
 
+#include "array2D.h"
 #include "color.h"
 #include "guidedfilter.h"
 #include "iccstore.h"
diff --git a/rtengine/rescale.h b/rtengine/rescale.h
index 70974aa48..2138cd8e8 100644
--- a/rtengine/rescale.h
+++ b/rtengine/rescale.h
@@ -20,9 +20,12 @@
 
 #pragma once
 
-#include "array2D.h"
 #include "rt_math.h"
 
+template<typename T>
+class array2D;
+
+
 namespace rtengine
 {