diff --git a/rtengine/PF_correct_RT.cc b/rtengine/PF_correct_RT.cc
index 7df042663..98c399bff 100644
--- a/rtengine/PF_correct_RT.cc
+++ b/rtengine/PF_correct_RT.cc
@@ -29,6 +29,7 @@
 
 #include "gauss.h"
 #include "improcfun.h"
+#include "cieimage.h"
 #include "sleef.c"
 #include "../rtgui/myflatcurve.h"
 #include "rt_math.h"
diff --git a/rtengine/cieimage.cc b/rtengine/cieimage.cc
index be122febf..f19808df7 100644
--- a/rtengine/cieimage.cc
+++ b/rtengine/cieimage.cc
@@ -1,5 +1,7 @@
 #include "cieimage.h"
-#include <memory.h>
+
+#include <new>
+#include <cstring>
 namespace rtengine
 {
 
@@ -10,7 +12,6 @@ CieImage::CieImage (int w, int h) : fromImage(false), W(w), H(h)
     M_p = new float*[H];
     C_p = new float*[H];
     sh_p = new float*[H];
-    //  ch_p = new float*[H];
     h_p = new float*[H];
 
     // Initialize the pointers to zero
@@ -98,9 +99,6 @@ CieImage::CieImage (int w, int h) : fromImage(false), W(w), H(h)
 
         ++c;
 
-        //  for (int i=0; i<H; i++)
-        //      ch_p[i] = data[c] + i*W;
-        //  ++c;
         for (int i = 0; i < H; i++) {
             h_p[i] = data[c] + i * W;
         }
diff --git a/rtengine/cieimage.h b/rtengine/cieimage.h
index 660d40e78..fea675cd4 100644
--- a/rtengine/cieimage.h
+++ b/rtengine/cieimage.h
@@ -16,10 +16,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CIEIMAGE_H_
-#define _CIEIMAGE_H_
+#pragma once
 
-#include "image16.h"
 #include "noncopyable.h"
 
 namespace rtengine
@@ -39,7 +37,6 @@ public:
     float** M_p;
     float** C_p;
     float** sh_p;
-//  float** ch_p;
     float** h_p;
 
     CieImage (int w, int h);
@@ -50,4 +47,3 @@ public:
 };
 
 }
-#endif
diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc
index 61b96b3a3..41e052b3e 100644
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -17,6 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
+
+#include "cieimage.h"
 #include "curves.h"
 #include "dcrop.h"
 #include "mytime.h"
diff --git a/rtengine/dirpyr_equalizer.cc b/rtengine/dirpyr_equalizer.cc
index e822d8492..79f85a944 100644
--- a/rtengine/dirpyr_equalizer.cc
+++ b/rtengine/dirpyr_equalizer.cc
@@ -20,6 +20,8 @@
 
 #include <cstddef>
 #include <cmath>
+
+#include "cieimage.h"
 #include "improcfun.h"
 #include "array2D.h"
 #include "rt_math.h"
diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 8b9e49124..5633f77fa 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -17,6 +17,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "improccoordinator.h"
+#include "cieimage.h"
 #include "curves.h"
 #include "mytime.h"
 #include "refreshmap.h"
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 5acf4e15d..56eaeaa55 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -24,6 +24,7 @@
 #endif
 
 #include "alignedbuffer.h"
+#include "cieimage.h"
 #include "rtengine.h"
 #include "improcfun.h"
 #include "curves.h"
diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h
index 9b8d0f63f..41e4704b9 100644
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -26,7 +26,6 @@
 #include "coord2d.h"
 #include "color.h"
 #include "labimage.h"
-#include "cieimage.h"
 #include "LUT.h"
 #include "lcp.h"
 #include "dcp.h"
@@ -36,7 +35,7 @@
 
 namespace rtengine
 {
-
+class CieImage;
 class wavelet_decomposition;
 
 namespace procparams
diff --git a/rtengine/ipsharpen.cc b/rtengine/ipsharpen.cc
index 0b1332ec9..0ba94a7c4 100644
--- a/rtengine/ipsharpen.cc
+++ b/rtengine/ipsharpen.cc
@@ -18,6 +18,7 @@
  */
 
 #include "improcfun.h"
+#include "cieimage.h"
 #include "gauss.h"
 #include "bilateral2.h"
 #include "jaggedarray.h"
diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 25f50980d..704721e3f 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -16,6 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
+#include "cieimage.h"
 #include "rtengine.h"
 #include "rtthumbnail.h"
 #include "../rtgui/options.h"
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index 6dbb0e649..5a43e0a21 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -16,6 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
+#include "cieimage.h"
 #include "rtengine.h"
 #include "colortemp.h"
 #include "imagesource.h"