diff --git a/rtengine/alpha.h b/rtengine/alpha.h
index 1fe2a7a7c..314dac642 100644
--- a/rtengine/alpha.h
+++ b/rtengine/alpha.h
@@ -19,7 +19,7 @@
 #ifndef _ALPHA_H_
 #define _ALPHA_H_
 
-#include <gtkmm.h>
+#include <cairomm/cairomm.h>
 #include <assert.h>
 
 #define CHECK_BOUNDS 0
diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc
index 8ddaa5f75..a6a1f1f50 100644
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -18,6 +18,9 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <glibmm/ustring.h>
+#include <glibmm/timer.h>
+
 #include "cieimage.h"
 #include "color.h"
 #include "curves.h"
diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc
index 2f443522c..e44243fd3 100644
--- a/rtengine/iccstore.cc
+++ b/rtengine/iccstore.cc
@@ -17,6 +17,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include <cstring>
+#include <map>
 
 #include <glibmm/ustring.h>
 #include <glibmm/fileutils.h>
diff --git a/rtengine/init.cc b/rtengine/init.cc
index 4ec3f0ec5..0c1bd4f6b 100644
--- a/rtengine/init.cc
+++ b/rtengine/init.cc
@@ -17,7 +17,8 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include <fftw3.h>
-#include "../rtgui/profilestorecombobox.h"
+#include <glibmm/miscutils.h>
+#include <glibmm/ustring.h>
 #include "color.h"
 #include "rtengine.h"
 #include "iccstore.h"
diff --git a/rtengine/profilestore.cc b/rtengine/profilestore.cc
index f83ddd385..5cc039187 100644
--- a/rtengine/profilestore.cc
+++ b/rtengine/profilestore.cc
@@ -17,6 +17,9 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <algorithm>
+#include <map>
+
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
diff --git a/rtengine/profilestore.h b/rtengine/profilestore.h
index e8e48c17f..d65c01751 100644
--- a/rtengine/profilestore.h
+++ b/rtengine/profilestore.h
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include <list>
 #include <map>
 #include <vector>
 
diff --git a/rtgui/editcallbacks.h b/rtgui/editcallbacks.h
index 134ea6477..61d392de5 100644
--- a/rtgui/editcallbacks.h
+++ b/rtgui/editcallbacks.h
@@ -18,6 +18,8 @@
  */
 #pragma once
 
+#include <vector>
+
 #include "editid.h"
 #include "cursormanager.h"
 #include "../rtengine/coord.h"
diff --git a/rtgui/options.cc b/rtgui/options.cc
index d6c3f7d25..e89fcd647 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -19,7 +19,11 @@
 #include "options.h"
 #include <cstdio>
 #include <glib/gstdio.h>
+#include <glibmm/date.h>
+#include <glibmm/fileutils.h>
 #include <glibmm/keyfile.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/regex.h>
 #include <iostream>
 #include <sstream>
 #include "multilangmgr.h"