diff --git a/rtengine/bilateral2.h b/rtengine/bilateral2.h
index 75fafc3ba..f4b1a80e9 100644
--- a/rtengine/bilateral2.h
+++ b/rtengine/bilateral2.h
@@ -23,7 +23,6 @@
 #include <cstring>
 #include <cstdio>
 
-#include "rtengine.h"
 #include "rt_math.h"
 #include "mytime.h"
 
diff --git a/rtengine/cfa_linedn_RT.cc b/rtengine/cfa_linedn_RT.cc
index 5f6e46f8f..3aef79133 100644
--- a/rtengine/cfa_linedn_RT.cc
+++ b/rtengine/cfa_linedn_RT.cc
@@ -24,7 +24,6 @@
 
 #include <cmath>
 
-#include "rtengine.h"
 #include "rawimagesource.h"
 #include "rt_math.h"
 
diff --git a/rtengine/ciecam02.cc b/rtengine/ciecam02.cc
index dc71fee85..3219884ad 100644
--- a/rtengine/ciecam02.cc
+++ b/rtengine/ciecam02.cc
@@ -17,7 +17,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "ciecam02.h"
-#include "rtengine.h"
+#include "rt_math.h"
 #include "curves.h"
 #include <math.h>
 #include "sleef.c"
diff --git a/rtengine/colortemp.cc b/rtengine/colortemp.cc
index 3ddbdc28a..927d8423d 100644
--- a/rtengine/colortemp.cc
+++ b/rtengine/colortemp.cc
@@ -16,8 +16,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
+
+#include <glibmm/ustring.h>
+
 #include "colortemp.h"
-#include "rtengine.h"
+#include "iccmatrices.h"
+#include "rt_math.h"
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/rtengine/imagedata.h b/rtengine/imagedata.h
index ee8a3fc3c..66c4285b9 100644
--- a/rtengine/imagedata.h
+++ b/rtengine/imagedata.h
@@ -23,9 +23,9 @@
 #include <memory>
 #include <string>
 #include <glibmm/ustring.h>
+#include "imageio.h"
 #include "../rtexif/rtexif.h"
 #include <libiptcdata/iptc-data.h>
-#include "rtengine.h"
 
 namespace rtengine
 {